mazmazz
2289a3bd79
I_FadeSongFromLevel -> I_FadeSongFromVolume refactor
...
* S_MusicName->GetMusicName refactor
* S_ChangeMusicWithFade->ChangeMusicAdvanced refactor
2018-08-21 08:53:51 -04:00
mazmazz
506db1e303
Interface name refactor: Music -> Song other targets
2018-08-21 06:22:42 -04:00
mazmazz
a1b1391e24
Interface name refactor: Music -> Song
...
* Music refers to the music system, song refers to the entity being played.
* s_sound doesn't follow this, everything is music
2018-08-21 06:22:35 -04:00
Monster Iestyn
dcf843e485
Merge branch 'defaultsoundvol' into 'master'
...
Change default sound volume
See merge request STJr/SRB2!238
2018-08-20 09:41:04 -04:00
mazmazz
17e2c3f5be
Debug messages
2018-08-20 08:47:41 -04:00
mazmazz
18daf255ee
Rename I_QueueDigSongPostFade to I_QueueDigSong
2018-08-20 01:16:52 -04:00
mazmazz
9539c597dd
Midimode safeties for song queueing/fading
2018-08-20 01:14:29 -04:00
mazmazz
6d8e3c2ac1
Lua comment
2018-08-20 01:14:16 -04:00
mazmazz
6b028049e0
Music lump existence minor fixes
2018-08-20 01:14:01 -04:00
mazmazz
60c9e5ab37
Lua player argument fixes, GetMusicLength and FadeMusic
2018-08-20 00:21:35 -04:00
mazmazz
9eeed6338f
Allow queueing music at end of song, not just fading
2018-08-20 00:12:23 -04:00
mazmazz
e51f9ecf90
* Allow S_ChangeMusic to queue the same track for fading
...
* StopDigSong upon running queue so that GME works for queueing
2018-08-19 23:20:40 -04:00
mazmazz
fb0d1b45ac
I_FadeOutStopMusic, I_FadeInStartDigSong, S_ChangeMusic lua
2018-08-19 22:06:09 -04:00
mazmazz
9410676737
I_FadeOutStopMusic, I_FadeInStartDigSong other targets
2018-08-19 22:05:55 -04:00
mazmazz
2cf49f9361
I_FadeOutStopMusic, I_FadeInStartDigSong, S_ChangeMusicWithFade implementation
...
* First attempt, a little messy but works fine
2018-08-19 22:05:42 -04:00
mazmazz
87b6fc613b
I_FadeMusicFromLevel/I_FadeMusic change for other targets
2018-08-19 17:02:27 -04:00
mazmazz
b844a908a1
Make S_FadeMusicFromLevel accept mandatory source_volume
...
* Make S_FadeMusic a legitimate function to grab current internal volume
2018-08-19 17:02:13 -04:00
mazmazz
3d8c4585d4
Checkpoint
2018-08-19 16:25:12 -04:00
mazmazz
9b50eec56a
S_FadeMusic[FromLevel] and S_StopFadingMusic Lua
...
* Fixed some arg position weirdness with other music lua funcs
2018-08-19 16:20:14 -04:00
mazmazz
5117bdebfe
S_FadeMusic[FromLevel] and S_StopFadingMusic other targets
2018-08-19 16:19:55 -04:00
mazmazz
918976bdcc
S_FadeMusic[FromLevel] and S_StopFadingMusic implementation
2018-08-19 16:19:48 -04:00
mazmazz
000847654e
I_SetInternalMusicVolume lua
2018-08-19 09:39:32 -04:00
mazmazz
7d03c19409
I_SetInternalMusicVolume other targets
2018-08-19 09:39:11 -04:00
mazmazz
d5dfde240d
I_SetInternalMusicVolume implementation
2018-08-19 09:38:57 -04:00
mazmazz
51228b328c
Framework for internal_volume; more fade code
2018-08-19 09:16:52 -04:00
mazmazz
69153194fe
Merge branch 'musicplus-core' into musicplus-fade-sdltimer
2018-08-19 08:35:56 -04:00
mazmazz
6ea002b1b5
Enable midi_volume, it actually works
2018-08-19 08:34:03 -04:00
mazmazz
47495e72b5
Fade checkpoint
2018-08-19 08:32:12 -04:00
mazmazz
c4ea18b2bb
Add LIBGME ifdefs
2018-08-19 06:43:57 -04:00
mazmazz
a38664e109
Minor cleanup
2018-08-18 23:26:58 -04:00
mazmazz
3bd3e51313
Merge branch 'musicplus-core' into musicplus-fade-sdltimer
...
# Conflicts:
# src/sdl/mixer_sound.c
2018-08-18 23:12:58 -04:00
mazmazz
3e7d7cfcae
Fixed loop point counter bug
2018-08-18 21:29:18 -04:00
mazmazz
5487fd5be0
Fix S_SetMusicLoopPoint wrong method; trigger only on is_looping
2018-08-18 20:54:56 -04:00
mazmazz
5f564f7798
Consolidate variable cleanup in mixer_sound
...
* Fix I_SetSongTrack MOD tracking returns the expected result
* Make music_loop hook stop digital song properly if not looping
2018-08-18 20:44:32 -04:00
mazmazz
78b041800e
Loop point modulo by length
2018-08-18 20:29:19 -04:00
mazmazz
c18372dd06
I_GetMusicLoopPoint and I_SetMusicLoopPoint for Lua
...
* Fix S_GetMusicLength for player compatibility
2018-08-18 20:20:18 -04:00
mazmazz
dc2c530d42
I_GetMusicLoopPoint and I_SetMusicLoopPoint for other targets
2018-08-18 20:19:54 -04:00
mazmazz
fdd1af62a8
I_GetMusicLoopPoint and I_SetMusicLoopPoint implementation
...
* Stub pause for MIDI
* Fix MP3 tag wide char search
* Reset songpaused bool where appropriate
2018-08-18 20:19:44 -04:00
mazmazz
137291d50b
Lua merge fixes
2018-08-18 18:57:53 -04:00
mazmazz
8b6c24c6fa
Remove I_MIDIPlaying from Lua
2018-08-18 17:46:14 -04:00
mazmazz
57c8cf25af
Remove I_MIDIPlaying from other targets
2018-08-18 17:46:06 -04:00
mazmazz
d7720a8556
Remove I_MIDIPlaying
2018-08-18 17:45:57 -04:00
mazmazz
58b204809f
Lua for MusicType
2018-08-18 17:18:22 -04:00
mazmazz
d88b923959
Other interfaces for I_MusicType
2018-08-18 17:18:13 -04:00
mazmazz
bd1eece7bc
S_MusicType implementation; MOD support for Get/SetMusicPosition and MusicLength
...
* Misc MOD fixes
2018-08-18 17:17:53 -04:00
mazmazz
3c2f7038d0
Added GME for GetMusicLength, SetMusicPosition, GetMusicPosition
...
* Misc fixes
2018-08-18 16:21:28 -04:00
mazmazz
f4a574aba2
Support wide chars when searching for music tags (MP3)
2018-08-18 15:26:31 -04:00
mazmazz
76c4f5dd5c
Lua for I_GetMusicLength
2018-08-18 14:18:58 -04:00
mazmazz
6b35857ed1
I_GetMusicLength declarations for other interfaces
2018-08-18 14:18:49 -04:00
mazmazz
c6035f5956
I_GetMusicLength implementation
2018-08-18 14:18:29 -04:00
mazmazz
34872bc146
Merge branch 'musicplus-core' into musicplus-fade-sdltimer
2018-08-18 09:34:49 -04:00
mazmazz
7833612c9e
HAVE_LUA_MUSICPLUS for testing
2018-08-18 09:33:37 -04:00
Monster Iestyn
b63290211a
Merge branch 'master' into next
2018-08-16 22:04:00 +01:00
Monster Iestyn
a4cfa9e82a
Merge branch 'lua-sector-names-fix' into 'next'
...
Lua sector names fix
See merge request STJr/SRB2!263
2018-08-16 16:57:41 -04:00
Monster Iestyn
364339e1ce
Merge branch 'sdl_mixer_fixes' into 'master'
...
SDL Mixer fixes
Closes #31
See merge request STJr/SRB2!260
2018-08-16 16:57:14 -04:00
mazmazz
8452ec5c7c
Checkpoint: Basic functions
2018-08-15 12:07:08 -04:00
mazmazz
d93ca34859
Hide MusicPlus lua behind an #ifdef HAVE_LUA_MUSICPLUS
...
# Conflicts:
# src/lua_hook.h
# src/lua_hooklib.c
# src/p_user.c
2018-08-15 03:37:11 -04:00
mazmazz
0254f4f368
Fix merge errors
2018-08-15 02:42:50 -04:00
mazmazz
878ea36559
Lua: Make P_RestoreMusic follow the non-local player nil output convention
2018-08-15 02:29:26 -04:00
mazmazz
8fe4c369bf
Lua: Fix music functions not returning proper values
...
# Conflicts:
# src/lua_baselib.c
2018-08-15 02:29:04 -04:00
mazmazz
6bde90f887
Lua: Make S_SpeedMusic and S_ChangeMusic return nil for invalid players
2018-08-15 02:23:18 -04:00
mazmazz
c71719ac6b
Music lua: Return nil for invalid players and non-nil for valid players
...
# Conflicts:
# src/lua_baselib.c
2018-08-15 02:22:52 -04:00
mazmazz
9dbc807528
Make S_StopMusic return nil for invalid player, true otherwise
2018-08-15 02:21:18 -04:00
mazmazz
8d0044c5f1
Lua S_GetMusicPosition: Remove erroneous position input line
...
# Conflicts:
# src/lua_baselib.c
2018-08-15 02:20:56 -04:00
mazmazz
3fb4559480
Lua: Make S_GetMusicPosition and S_SetMusicPosition return nil when non-local player is passed
2018-08-15 02:19:12 -04:00
mazmazz
9a5800d2bb
Lua: Added player_t input to S_DigitalPlaying, S_MidiPlaying, S_MusicPlaying, S_MusicPaused, S_MusicName
2018-08-15 02:19:06 -04:00
mazmazz
95e4d0d423
Add player parameter to S_GetMusicPosition lua
...
# Conflicts:
# src/lua_baselib.c
2018-08-15 02:18:46 -04:00
mazmazz
e0ab8c1ed0
Fix #6 #7 SDL looping and counter bugs when looping=false
...
# Conflicts:
# src/sdl12/mixer_sound.c
2018-08-15 02:15:05 -04:00
mazmazz
11c6148d4b
SDL: Fix looping bug when looping=false; reset bytes counter when non-looping
...
# Conflicts:
# src/sdl12/mixer_sound.c
2018-08-15 02:11:17 -04:00
mazmazz
a9776f7b25
Undoing malloc for S_MusicName, pass music_name instead.
...
I don't think there's a reason for copying to a new var.
2018-08-15 02:11:01 -04:00
mazmazz
44c7410a41
Add S_DigitalPlaying
2018-08-15 02:10:53 -04:00
mazmazz
47423a69ed
Refactor to SetMusicPosition, GetMusicPosition
...
# Conflicts:
# src/lua_baselib.c
# src/nds/i_sound.c
# src/sdl12/mixer_sound.c
# src/sdl12/sdl_sound.c
# src/win32ce/win_snd.c
2018-08-15 02:10:46 -04:00
mazmazz
0ea40321ca
S_MusicName copy music_name to new buffer (is this ok?)
2018-08-15 02:07:51 -04:00
mazmazz
34ea90600a
Support mflags and looping in MusicChange hook
...
# Conflicts:
# src/lua_hook.h
2018-08-15 02:07:33 -04:00
mazmazz
d14eedd700
Implemented MusicChange lua hook
...
# Conflicts:
# src/lua_hook.h
# src/lua_hooklib.c
2018-08-15 02:06:43 -04:00
mazmazz
79531b9683
Another loop fix to resolve music_bytes not resetting on non-looppoint tracks
...
# Conflicts:
# src/sdl12/mixer_sound.c
2018-08-15 02:03:04 -04:00
mazmazz
2e9dba352a
SDL mixer: Fix no looping bug when changing song position
...
# Conflicts:
# src/sdl12/mixer_sound.c
2018-08-15 02:02:33 -04:00
mazmazz
662c366830
S_MusicName, S_MusicExists, S_PauseMusic lua, S_ResumeMusic lua
...
# Conflicts:
# src/lua_baselib.c
2018-08-15 02:01:34 -04:00
mazmazz
eb52a14433
Implement I_MIDIPlaying, I_MusicPlaying, I_MusicPaused in other targets
...
# Conflicts:
# src/nds/i_sound.c
# src/sdl12/sdl_sound.c
# src/win32ce/win_snd.c
2018-08-15 01:59:01 -04:00
mazmazz
d39f804662
Use Mix_PausedMusic instead of our own music_paused flag in SDL2/SDL1.2 I_MusicPaused
...
# Conflicts:
# src/sdl12/mixer_sound.c
2018-08-15 01:55:49 -04:00
mazmazz
2483c11cc4
Implement I_MusicPaused in SDL2, SDL1.2, and FMOD; console and lua commands
...
# Conflicts:
# src/sdl12/mixer_sound.c
2018-08-15 01:55:03 -04:00
mazmazz
e4a6cb87d1
Fix SDL music counter pause issue
2018-08-15 01:54:17 -04:00
mazmazz
29904a21b2
Remove MUSICPOS command, can be done in lua
2018-08-15 01:53:59 -04:00
mazmazz
297a8d537a
Add S_MidiPlaying and S_MusicPlaying via I_MIDIPlaying and I_MusicPlaying
...
# Conflicts:
# src/sdl12/mixer_sound.c
2018-08-15 01:53:45 -04:00
mazmazz
25880643d4
MUSICPOS console command
2018-08-15 01:52:35 -04:00
mazmazz
a8d379a6da
Lua PositionMusic switch to UINT32
2018-08-15 01:52:20 -04:00
mazmazz
eab4d6b989
Lua PositionMusic/GetPositionMusic and console TUNES position
2018-08-15 01:50:19 -04:00
mazmazz
c6f63d9e9b
Lua funcs MidiPlaying/MusicPlaying
2018-08-15 01:44:11 -04:00
mazmazz
d47d18998b
Add S_MidiPlaying and S_MusicPlaying via I_MIDIPlaying and I_MusicPlaying
...
# Conflicts:
# src/sdl12/mixer_sound.c
2018-08-15 01:43:51 -04:00
mazmazz
2cf364ab8b
Fix SDL music position getting; dummy out position methods for MIDI
...
# Conflicts:
# src/sdl/mixer_sound.c
# src/sdl12/mixer_sound.c
2018-08-15 01:42:15 -04:00
mazmazz
aed388976c
SDL fix for I_SetSongPosition
...
# Conflicts:
# src/sdl12/mixer_sound.c
2018-08-15 01:40:54 -04:00
mazmazz
8981ef2cdc
Change get/set music position to UINT32 parameter, milliseconds
...
# Conflicts:
# src/d_netcmd.c
# src/lua_baselib.c
# src/nds/i_sound.c
# src/sdl12/mixer_sound.c
# src/sdl12/sdl_sound.c
# src/win32ce/win_snd.c
2018-08-15 01:40:20 -04:00
mazmazz
a4f7b17389
Initial attempt for get/set song position
...
* Declared I_SetSongPosition, I_GetSongPosition
* Implemented S_PositionMusic and S_GetPositionMusic
* Exposed in console TUNES and lua
* Implemented set position in SDL, SDL12, WIN32
* Implemented get position in WIN32
# Conflicts:
# src/nds/i_sound.c
# src/sdl12/mixer_sound.c
# src/sdl12/sdl_sound.c
# src/win32ce/win_snd.c
2018-08-15 01:38:06 -04:00
Nev3r
f19b7bfacf
Merge branch 'horizon-line-hom-fix' into 'master'
...
Horizon line HOM fix
See merge request STJr/SRB2Internal!152
2018-08-12 03:48:20 -04:00
Steel Titanium
d9c7334dea
Fix white being treated as transparent.
2018-08-10 19:02:03 -04:00
Alam Ed Arias
3479310546
SDL: update IMG_xpm.c
2018-08-10 17:09:11 -04:00
Monster Iestyn
30e4d2cd51
Merge branch 'polyobj-sky-plane-crash-fix' into 'master'
...
Polyobject sky plane crash fix
See merge request STJr/SRB2Internal!146
2018-08-10 15:40:43 -04:00
Monster Iestyn
a5510cab5d
Merge branch 'master' into polyobj-sky-plane-crash-fix
2018-08-10 20:06:12 +01:00
Monster Iestyn
d7830dfff4
Merge branch 'master' into horizon-line-hom-fix
2018-08-10 20:04:39 +01:00
Monster Iestyn
55fd60b29b
Merge branch 'master' into leveltitle-tinkering
...
# Conflicts:
# src/hu_stuff.h
2018-08-10 20:03:59 +01:00