stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-01-20 08:20:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'music-sdlmixerx' into musicplus-sdlmixerx

Browse source
This commit is contained in:
mazmazz 2018-08-27 08:40:36 -04:00
commit 9244a13721
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/d_netcmd.c
View file

@ -688,6 +688,9 @@ void D_RegisterClientCommands(void)
COM_AddCommand("tunes", Command_Tunes_f);
COM_AddCommand("restartaudio", Command_RestartAudio_f);
CV_RegisterVar(&cv_resetmusic);
CV_RegisterVar(&cv_midiplayer);
CV_RegisterVar(&cv_midisoundfontpath);
CV_RegisterVar(&cv_miditimiditypath);
// FIXME: not to be here.. but needs be done for config loading
CV_RegisterVar(&cv_globalgamma);

3
src/sdl/mixer_sound.c
View file

@ -178,9 +178,6 @@ void I_StartupSound(void)
Mix_Init(MIX_INIT_FLAC|MIX_INIT_MOD|MIX_INIT_MP3|MIX_INIT_OGG);
#endif
#if HAVE_MIXERX
CV_RegisterVar(&cv_midiplayer);
CV_RegisterVar(&cv_midisoundfontpath);
CV_RegisterVar(&cv_miditimiditypath);
Mix_SetMidiPlayer(cv_midiplayer.value);
Mix_SetSoundFonts(cv_midisoundfontpath.string);
Mix_Timidity_addToPathList(cv_miditimiditypath.string);