mazmazz
58ef056d48
Fix MIDI not reloading when erroring on a player
2018-08-31 12:18:54 -04:00
mazmazz
364312cbe3
Revert "Update SDL Windows dependency to 2.0.8"
...
This reverts commit 720a1212ae
2018-08-31 12:00:33 -04:00
mazmazz
31d5735964
Revert "New SDL2 test files"
...
This reverts commit eafed06a29
2018-08-31 11:58:18 -04:00
mazmazz
af9e2365b9
Compiled fluidsynth into libraries
2018-08-31 11:23:16 -04:00
mazmazz
72eecc8899
Updated SDL Mixer X binaries
2018-08-31 02:26:21 -04:00
mazmazz
359a71c059
Move cvars to D_RegisterClientCommands for config recall
2018-08-27 08:40:24 -04:00
mazmazz
07ae007980
Remove unused methods (for now?)
2018-08-27 05:53:43 -04:00
mazmazz
9f6e913d43
Load Fluidsynth soundfont upon cvar change
2018-08-27 05:52:01 -04:00
mazmazz
878dc1af92
Lazy midi reload support on menu
2018-08-27 00:43:25 -04:00
mazmazz
535aed24bb
Advanced submenu for sound options
2018-08-26 23:58:43 -04:00
mazmazz
cc9d554dfd
Revert "Sound scroll menu attempt"
...
This reverts commit 7b11855041
2018-08-26 23:46:55 -04:00
mazmazz
7b11855041
Sound scroll menu attempt
2018-08-26 23:46:20 -04:00
mazmazz
28545822ba
Checkpoint: Add FluidSynth and Timidity support
2018-08-26 23:03:38 -04:00
mazmazz
8ee27d3297
Makefile comments
2018-08-26 23:02:57 -04:00
mazmazz
59185f4ad1
New SDL Mixer X builds with FluidSynth and Timidity
2018-08-26 23:02:29 -04:00
mazmazz
65e5794ee3
HAVE_MIXERX and NOMIXERX compile flags (win32 only)
2018-08-26 15:12:00 -04:00
mazmazz
73b4c4c5b4
Fix S_ChangeMusic newmusic -> mmusic, merge error
2018-08-26 14:22:14 -04:00
mazmazz
768ce1a46f
Make SDL Mixer X win32-exclusive
2018-08-26 14:20:41 -04:00
mazmazz
eafed06a29
New SDL2 test files
2018-08-26 14:12:11 -04:00
mazmazz
35fdcee071
Merge branch 'music-cleanup' into music-sdlmixerx
2018-08-26 14:04:54 -04:00
mazmazz
a7ae059949
Case-insensitive music_name comparison
2018-08-25 22:00:31 -04:00
mazmazz
e88d147761
I_SongPlaying detect GME properly
2018-08-24 18:03:50 -04:00
mazmazz
eae5d3333f
Stub I_UnloadSong because we already unload in I_StopMusic
...
* Stop-gap for now. Ideally the logic would be in the respective places.
# Conflicts:
# src/sdl/mixer_sound.c
2018-08-24 18:02:46 -04:00
mazmazz
d39b7011c5
Volume fixes
...
# Conflicts:
# src/sdl/mixer_sound.c
2018-08-24 18:01:57 -04:00
mazmazz
fb6f8c8a07
A word
2018-08-24 13:41:26 -04:00
mazmazz
df455fc638
Merge branch 'music-cleanup' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into music-cleanup
2018-08-24 13:36:07 -04:00
mazmazz
5f21bf230d
GME fix: play song in I_PlaySong, not I_LoadSong
2018-08-24 13:35:41 -04:00
mazmazz
9e6eebeb8d
Refactor I_MusicType MusicPlaying and MusicPaused other targets
2018-08-23 20:23:16 -04:00
mazmazz
4b82de9e54
Refactor I_MusicType MusicPlaying and MusicPaused -> I_SongType ...
2018-08-23 20:14:46 -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
