thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
8705 commits 1 branch 12 tags 205 MiB
Commit graph

699 commits

Author SHA1 Message Date
mazmazz
0e8ec47727 Mixer I_StopSong: StopFadingSong and var_cleanup call fix 2018-09-18 12:51:42 -04:00
mazmazz
320cb89af9 Merge branch 'music-sdlmixerx' into musicplus-sdlmixerx 2018-09-18 12:46:46 -04:00
mazmazz
633c20debb Define cv_midiplayer/soundfontpath/timiditypath in s_sound.c when NOMIXER=1 2018-09-18 12:41:49 -04:00
mazmazz
85c6715188 musicplus-libopenmpt 2.2 -> 2.1 backport 2018-09-18 12:31:47 -04:00
mazmazz
32c48af258 MusicPlus Core (positioning and fading) 2.2 -> 2.1 backport 2018-09-18 10:22:17 -04:00
mazmazz
d21467eeaa Improve MIDI console parameters 
* Allow multiple SF2 for midisoundfont
* Correctly branch when toggling midiplayer or midisoundfont
 2018-09-16 16:02:26 -04:00
mazmazz
e58cfe9ced Improve MIDI console parameters 
* Allow multiple SF2 for midisoundfont
* Correctly branch when toggling midiplayer or midisoundfont
 2018-09-16 11:51:39 -04:00
mazmazz
707d649d67 Merge branch 'musicplus-core' into musicplus-sdlmixerx 2018-09-15 01:17:33 -04:00
mazmazz
a8c4912810 Mixer: Add missing tag declarations in I_LoadSong 2018-09-15 01:14:24 -04:00
mazmazz
b2e3352c5a Merge branch 'music-cleanup' into musicplus-core 2018-09-15 00:46:02 -04:00
mazmazz
134387b249 Merge branch 'music-cleanup' into music-sdlmixerx 2018-09-15 00:36:16 -04:00
mazmazz
76e3b7a7cd Mixer: HAVE_LIBGME ifdef in I_LoadSong 2018-09-15 00:35:24 -04:00
mazmazz
fab6316954 Mixer: HAVE_LIBGME ifdef in I_LoadSong 2018-09-15 00:34:55 -04:00
mazmazz
7bb2accb40 Merge branch 'music-cleanup' into music-sdlmixerx 2018-09-15 00:28:38 -04:00
mazmazz
b6894de26a Fix Windows buildbot for MP3_MAD/MODPLUG define (the header we use is 2.0.2) 
(cherry picked from commit 89a26f28bd)
 2018-09-14 17:48:12 -04:00
mazmazz
89a26f28bd Fix Windows buildbot for MP3_MAD/MODPLUG define (the header we use is 2.0.2) 2018-09-14 17:47:04 -04:00
mazmazz
ead04aeeeb Mixer: Better MODPLUG/MP3_MAD defines 
(cherry picked from commit 5b724e18b5268b0492b3f8b8980aadd2dd41e235)
 2018-09-14 17:27:31 -04:00
mazmazz
aac7857d16 Mixer: Better MODPLUG/MP3_MAD defines 2018-09-14 17:27:00 -04:00
mazmazz
c4305c5963 Fix compile errors on buildbots 
* Check SDL Mixer 2.0.3 for MUS_MODPLUG_UNUSED, MUS_MP3_MAD_UNUSED
* Mixed D+C in I_LoadSong

(cherry picked from commit a2dd03bff6)
 2018-09-14 17:09:21 -04:00
mazmazz
a2dd03bff6 Fix compile errors on buildbots 
* Check SDL Mixer 2.0.3 for MUS_MODPLUG_UNUSED, MUS_MP3_MAD_UNUSED
* Mixed D+C in I_LoadSong
 2018-09-14 17:07:13 -04:00
mazmazz
00987dd7e5 Don't call I_StartupSound in SFX toggle 
* Mixer: make I_StartupSound return early if already set up
* Restartaudio: Add StopSFX call

(cherry picked from commit c64d52c1f9)
 2018-09-14 16:43:48 -04:00
mazmazz
c64d52c1f9 Don't call I_StartupSound in SFX toggle 
* Mixer: make I_StartupSound return early if already set up
* Restartaudio: Add StopSFX call
 2018-09-14 16:39:10 -04:00
mazmazz
21e1b72f5b Rip out SDL Mixer code from sdl_sound.c because superfluous 
* 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 74c6ae9661)
 2018-09-14 14:53:56 -04:00
mazmazz
74c6ae9661 Rip out SDL Mixer code from sdl_sound.c because superfluous 
* 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
 2018-09-14 14:52:24 -04:00
mazmazz
cacb12392b I_InitMusic SDL2: Don't unload GME indiscriminately 
(cherry picked from commit f2ca028bbf)
 2018-09-14 13:57:24 -04:00
mazmazz
dc20a41c25 Separate StopMusic and UnloadMusic 
(cherry picked from commit db37bfc921)
 2018-09-14 13:57:20 -04:00
mazmazz
f2ca028bbf I_InitMusic SDL2: Don't unload GME indiscriminately 2018-09-14 13:36:01 -04:00
mazmazz
db37bfc921 Separate StopMusic and UnloadMusic 2018-09-14 12:47:33 -04:00
mazmazz
af2496de9e Compile fixes 2018-09-14 10:58:41 -04:00
mazmazz
6a6a7a60c7 I_SongPlaying detect GME properly 
(cherry picked from commit e88d1477616ca66472ecb50d371e37dc79c77c0f)
 2018-09-14 10:49:44 -04:00
mazmazz
4fd0638220 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

(cherry picked from commit eae5d3333f5001512c82f22f2b1433a955b3a6c3)
 2018-09-14 10:49:44 -04:00
mazmazz
245bc9a66f Volume fixes 
# Conflicts:
#	src/sdl/mixer_sound.c

(cherry picked from commit d39b7011c5b12e5b7abe3e493971e003469a1f3d)
 2018-09-14 10:49:44 -04:00
mazmazz
900fdbee99 A word 
(cherry picked from commit fb6f8c8a0752c229f5b7369729437c8fecb54d45)
 2018-09-14 10:49:44 -04:00
mazmazz
d288dd2b5c GME fix: play song in I_PlaySong, not I_LoadSong 
(cherry picked from commit 5f21bf230d9716b7cc5b52e4bf3591ebe01e9f3a)
 2018-09-14 10:45:39 -04:00
mazmazz
223160ffbd Refactor I_MusicType MusicPlaying and MusicPaused other targets 
(cherry picked from commit 9e6eebeb8d6b4119d87e9678bb6b0687e3dc5217)
 2018-09-14 10:45:39 -04:00
mazmazz
37a2f1d2b7 Refactor I_MusicType MusicPlaying and MusicPaused -> I_SongType ... 
(cherry picked from commit 4b82de9e540d6dc0651bbe8db8e5e15cba39f650)
 2018-09-14 10:45:38 -04:00
mazmazz
03c5f5635d Refactoring and reordering other targets 
(cherry picked from commit cf065e106f68fb8af3b0568eba188c8235b1656e)
 2018-09-14 10:43:46 -04:00
mazmazz
74d6302f09 Minor refactoring and reordering 
* I_GetMusicType() -> I_MusicType()
* Wrap MIDI volume hack in #ifdef _WIN32

(cherry picked from commit a7d51bf81030c228937a8e759f8f43b85817fce6)
 2018-09-14 10:42:27 -04:00
mazmazz
dcf0dd70fd nodigimusic nomusic nosound refactor other targets 
(cherry picked from commit 86f151db654beb14e8d6893cdff2adaa965e8e4b)
 2018-09-14 10:35:56 -04:00
mazmazz
bcc99d705d I_MusicPlaying, I_MusicPaused other targets 
(cherry picked from commit d5ec38815968e267aceb59a48a6cb6d3292c0b69)
 2018-09-14 10:28:35 -04:00
mazmazz
f41ad3073d 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

(cherry picked from commit f5f0b5e76c2fd405c8cc895dde653c5ed2652622)
 2018-09-14 10:28:29 -04:00
mazmazz
a8ce3d3002 Consolidate I_SetDigMusicVolume and I_SetMIDIMusicVolume other targets 
(cherry picked from commit 9fb9386f84b3739fe765a78bcb9683eb7e98bc36)
 2018-09-14 10:23:47 -04:00
mazmazz
1ca6ac1c67 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

(cherry picked from commit 701cc5a7dd1dfead87a42ec7558c9fa6a1deb193)
 2018-09-14 10:23:37 -04:00
mazmazz
32ab93a012 Added I_GetMusicType and removed midimode variable: other targets 
(cherry picked from commit 14b393ab16736bb44dab6fd4a90b7bdd8ff782e0)
 2018-09-14 09:55:45 -04:00
mazmazz
ff91315cbc Added I_GetMusicType and removed midimode variable 
* Revised S_PlayMusic arguments
* Now music plays again!

(cherry picked from commit 55f3803e4b9f8104c90cc6c769d54121e5bac0b8)
 2018-09-14 09:42:29 -04:00
mazmazz
5a4e6cf924 Loose ends other targets 
(cherry picked from commit 9a5fc5f66a31baf713c6f32f7a696b933da6907b)
 2018-09-14 09:41:08 -04:00
mazmazz
e24ea0cb4d Block song position changes on GME because unstable 2018-09-13 13:27:42 -04:00
mazmazz
1c24b9ac8e Merge branch 'musicplus-core' into musicplus-sdlmixerx 2018-09-11 11:26:12 -04:00
mazmazz
1bb41a00bc Don't decrement fade timer if song is paused 2018-09-11 11:20:46 -04:00
mazmazz
2b4d7d1ad4 Change to percentage calc from interval decrement for volume fade 2018-09-11 11:17:30 -04:00