mazmazz
bf4e7d2dd6
Lua S_MusicInfo fix and FMOD GME fix: play song in I_PlaySong, not I_LoadSong
2018-08-24 13:12:14 -04:00
mazmazz
bf61dbb6e2
Checkpoint: Revised fading routines for new load/play pattern
...
* Perform fade-out/fade-in using callbacks
* Move queued music from interface to s_sound
2018-08-24 13:11:38 -04:00
mazmazz
b5ef4e04d8
Lua method reordering for Musicplus
...
* Change to S_MusicName to S_MusicInfo for API
2018-08-23 21:23:55 -04:00
mazmazz
a2d626384a
Merge branch 'music-cleanup' into musicplus-core
...
Pending rewrite of fade music changing
# Conflicts:
# src/android/i_sound.c
# src/djgppdos/i_sound.c
# src/i_sound.h
# src/s_sound.c
# src/s_sound.h
# src/sdl/mixer_sound.c
# src/sdl/sdl_sound.c
# src/win32/win_snd.c
2018-08-23 21:07:39 -04:00
mazmazz
cf065e106f
Refactoring and reordering other targets
2018-08-23 17:54:40 -04:00
mazmazz
a7d51bf810
Minor refactoring and reordering
...
* I_GetMusicType() -> I_MusicType()
* Wrap MIDI volume hack in #ifdef _WIN32
2018-08-23 17:05:37 -04:00
mazmazz
f6ec93198f
Play the opposite type music (Digital/MIDI) when toggling between them in menu
...
* S_MusicInfo method to retrieve name, flags, and looping
2018-08-23 16:46:40 -04:00
mazmazz
4aa100aa57
Toggle Digi/MIDI music in menu accurately; add S_MusicType
2018-08-23 13:09:20 -04:00
mazmazz
86f151db65
nodigimusic nomusic nosound refactor other targets
2018-08-23 12:43:38 -04:00
mazmazz
07738fb0bc
nodigimusic nomusic nosound -> digital_disabled midi_disabled sound_disabled
2018-08-23 12:42:57 -04:00
mazmazz
d5ec388159
I_MusicPlaying, I_MusicPaused other targets
2018-08-23 12:31:01 -04:00
mazmazz
f5f0b5e76c
Refactoring, music statues
...
* S_Init -> S_InitSfxChannels because it did mostly SFX anyway
* S_MusicPlaying, S_MusicPaused, S_MusicName, S_MusicExists new status methods
* I_MusicPlaying, I_MusicPaused
2018-08-23 12:30:47 -04:00
mazmazz
9fb9386f84
Consolidate I_SetDigMusicVolume and I_SetMIDIMusicVolume other targets
2018-08-23 11:54:58 -04:00
mazmazz
701cc5a7dd
Consolidate I_SetDigMusicVolume and I_SetMIDIMusicVolume into one method
...
* In s_sound, they are merged to one method as well, but there are still two separate digvolume and seqvolume variables
* Simplified Dig/MidiMusicDisabled in s_sound
* Method reordering
2018-08-23 11:54:36 -04:00
mazmazz
14b393ab16
Added I_GetMusicType and removed midimode variable: other targets
2018-08-23 10:19:04 -04:00
mazmazz
55f3803e4b
Added I_GetMusicType and removed midimode variable
...
* Revised S_PlayMusic arguments
* Now music plays again!
2018-08-23 10:18:38 -04:00
mazmazz
9a5fc5f66a
Loose ends other targets
2018-08-23 09:37:02 -04:00
mazmazz
e89eccf78e
Loose ends from previous work
...
* Pause/ResumeSong remove handle argument
* LoadSong declare char *data argument
* Variable weirdness
2018-08-23 09:36:51 -04:00
mazmazz
3ec1a122e0
Revert "Nix'd midimusicvolume other targets"
...
This reverts commit 58fbb4636f
2018-08-23 09:09:12 -04:00
mazmazz
75cbfab8c6
Playback routines other targets
2018-08-23 09:06:31 -04:00
mazmazz
7efab8b314
Revert "Nix'd midimusicvolume", don't know what I want to do with this yet
...
This reverts commit b5c3095820
2018-08-23 09:06:13 -04:00
mazmazz
e42defa299
Playback routines: Load, Play, Pause, Stop, Unload
...
* Re-purpose I_LoadSong for digital music loading
* I_StartDigSong logic split between I_LoadSong and I_PlaySong
* Pause, Stop, and Unload routines are combined from Digi and MIDI
* music_lumpnum, music_data, music_handle from s_sound.c are gone
2018-08-23 09:02:14 -04:00
mazmazz
0bc9576eb0
Revert "CHANGED MIND: Nix'd S_MIDIMusic, I_PlaySong, and I_RegisterSong"
...
This reverts commit 8b46bce155
2018-08-23 07:50:02 -04:00
mazmazz
8b46bce155
CHANGED MIND: Nix'd S_MIDIMusic, I_PlaySong, and I_RegisterSong
...
* music_lumpnum, music_data, music_handle are gone
* Relevant interfaces I_PlaySong are transferred to I_StartDigSong
2018-08-23 07:49:09 -04:00
mazmazz
58fbb4636f
Nix'd midimusicvolume other targets
2018-08-23 07:39:45 -04:00
mazmazz
b5c3095820
Nix'd midimusicvolume
2018-08-23 07:39:32 -04:00
mazmazz
76f9890328
Position fixes with looppoint
2018-08-21 11:58:38 -04:00
Monster Iestyn
87e37e21df
Merge branch 'public_next'
...
# Conflicts:
# src/sdl12/i_cdmus.c
# src/win32ce/win_cd.c
2018-08-21 15:40:54 +01:00
Monster Iestyn
2daaf637d9
Merge branch 'master' into next
2018-08-21 15:36:36 +01:00
Monster Iestyn
9d3aad9036
Merge branch 'XPMupdate' into 'master'
...
update XPM icon
See merge request STJr/SRB2!267
2018-08-21 10:31:25 -04:00
mazmazz
6fac87cab2
S_MusicPlaying safety
2018-08-21 08:56:05 -04:00
mazmazz
5db6df59b5
S_ChangeMusicWithFade fixes
...
* MusicSlot compatibility name fix
2018-08-21 08:55:53 -04:00
mazmazz
d6aa2c23aa
Lua FadeMusicFromVolume, GetMusicName refactor
2018-08-21 08:54:23 -04:00
mazmazz
f6789a6eb7
I_FadeSongFromLevel -> I_FadeSongFromVolume refactor other targets
2018-08-21 08:54:04 -04:00
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
