- Sep 15, 2018
-
-
Marco Z authored
-
- Sep 14, 2018
-
-
Marco Z authored
-
Marco Z authored
* Mixer code has been in mixer_sound.c; this file is not invoked unless compiling with NOMIXER=1 * Remove everything under #ifdef HAVE_MIXER because this is never triggered * Comment out #ifdef HAVE_LIBGME because we don't support playing music anyway (but theoretically, it could have worked separately from Mixer) * Stub new music calls (cherry picked from commit 76be77b9)
-
Marco Z authored
-
Marco Z authored
-
Marco Z authored
- Aug 26, 2018
-
-
Marco Z authored
-
- Aug 24, 2018
-
-
Marco Z authored
-
Marco Z authored
* Stop-gap for now. Ideally the logic would be in the respective places. # Conflicts: # src/sdl/mixer_sound.c
-
Marco Z authored
# Conflicts: # src/sdl/mixer_sound.c
-
Marco Z authored
-
Marco Z authored
Merge branch 'music-cleanup' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into music-cleanup
-
Marco Z authored
-
Marco Z authored
-
Marco Z authored
-
- Aug 23, 2018
-
-
Marco Z authored
-
Marco Z authored
* I_GetMusicType() -> I_MusicType() * Wrap MIDI volume hack in #ifdef _WIN32
-
Marco Z authored
* S_MusicInfo method to retrieve name, flags, and looping
-
Marco Z authored
-
Marco Z authored
-
Marco Z authored
-
Marco Z authored
-
Marco Z authored
* 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
-
Marco Z authored
-
Marco Z authored
* 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
-
Marco Z authored
-
Marco Z authored
* Revised S_PlayMusic arguments * Now music plays again!
-
Marco Z authored
-
Marco Z authored
* Pause/ResumeSong remove handle argument * LoadSong declare char *data argument * Variable weirdness
-
Marco Z authored
-
Marco Z authored
* 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
-