diff --git a/src/s_sound.c b/src/s_sound.c index 7aaf23f32..61fdce38c 100644 --- a/src/s_sound.c +++ b/src/s_sound.c @@ -2056,8 +2056,7 @@ void S_ChangeMusicEx(const char *mmusic, UINT16 mflags, boolean looping, UINT32 } } -void -S_ChangeMusicSpecial (const char *mmusic) +void S_ChangeMusicSpecial (const char *mmusic) { if (cv_resetspecialmusic.value) S_ChangeMusic(mmusic, MUSIC_FORCERESET, true); @@ -2144,14 +2143,12 @@ void S_SetMusicVolume(INT32 digvolume, INT32 seqvolume) } } -void -S_SetRestoreMusicFadeInCvar (consvar_t *cv) +void S_SetRestoreMusicFadeInCvar (consvar_t *cv) { music_refade_cv = cv; } -int -S_GetRestoreMusicFadeIn (void) +int S_GetRestoreMusicFadeIn (void) { if (music_refade_cv && cv_fading.value) return music_refade_cv->value; @@ -2159,15 +2156,13 @@ S_GetRestoreMusicFadeIn (void) return 0; } -void -S_SetMusicUsage (int type) +void S_SetMusicUsage (int type) { music_usage = type; I_UpdateSongLagConditions(); } -int -S_MusicUsage (void) +int S_MusicUsage (void) { return music_usage; } @@ -2380,14 +2375,14 @@ static void GameSounds_OnChange(void) if (M_CheckParm("-nosound") || M_CheckParm("-noaudio")) return; - if (sound_disabled) + if (sound_disabled && !cv_gamesounds.value) { sound_disabled = false; I_StartupSound(); // will return early if initialised S_InitSfxChannels(cv_soundvolume.value); S_StartSound(NULL, sfx_strpst); } - else + else if (!sound_disabled && cv_gamesounds.value) { sound_disabled = true; S_StopSounds(); @@ -2408,14 +2403,14 @@ static void SoundPrecache_OnChange(void) } } -void GameDigiMusic_OnChange(void) +static void GameDigiMusic_OnChange(void) { if (M_CheckParm("-nomusic") || M_CheckParm("-noaudio")) return; else if (M_CheckParm("-nodigmusic")) return; - if (digital_disabled) + if (digital_disabled && !cv_gamedigimusic.value) { digital_disabled = false; I_StartupSound(); // will return early if initialised @@ -2426,7 +2421,7 @@ void GameDigiMusic_OnChange(void) else S_ChangeMusicInternal("titles", looptitle); } - else + else if (!digital_disabled && cv_gamedigimusic.value) { digital_disabled = true; if (S_MusicType() != MU_MID) @@ -2453,21 +2448,21 @@ void GameDigiMusic_OnChange(void) #ifdef HAVE_OPENMPT -void ModFilter_OnChange(void) +static void ModFilter_OnChange(void) { if (openmpt_mhandle) openmpt_module_set_render_param(openmpt_mhandle, OPENMPT_MODULE_RENDER_INTERPOLATIONFILTER_LENGTH, cv_modfilter.value); } -void StereoSep_OnChange(void) +static void StereoSep_OnChange(void) { if (openmpt_mhandle) openmpt_module_set_render_param(openmpt_mhandle, OPENMPT_MODULE_RENDER_STEREOSEPARATION_PERCENT, cv_stereosep.value); } -void AmigaFilter_OnChange(void) +static void AmigaFilter_OnChange(void) { if (openmpt_mhandle) #if OPENMPT_API_VERSION_MAJOR < 1 && OPENMPT_API_VERSION_MINOR > 4 @@ -2479,7 +2474,7 @@ void AmigaFilter_OnChange(void) #if OPENMPT_API_VERSION_MAJOR < 1 && OPENMPT_API_VERSION_MINOR > 4 -void AmigaType_OnChange(void) +static void AmigaType_OnChange(void) { if (openmpt_mhandle) openmpt_module_ctl_set_text(openmpt_mhandle, "render.resampler.emulate_amiga_type", cv_amigatype.string); @@ -2490,21 +2485,21 @@ void AmigaType_OnChange(void) #endif #endif -void BufferSize_OnChange(void) +static void BufferSize_OnChange(void) { if (sound_started) COM_ImmedExecute("restartaudio"); } #ifndef NO_MIDI -void GameMIDIMusic_OnChange(void) +static void GameMIDIMusic_OnChange(void) { if (M_CheckParm("-nomusic") || M_CheckParm("-noaudio")) return; else if (M_CheckParm("-nomidimusic")) return; - if (midi_disabled) + if (midi_disabled && !cv_gamemidimusic.value) { midi_disabled = false; I_InitMusic(); @@ -2513,7 +2508,7 @@ void GameMIDIMusic_OnChange(void) else S_ChangeMusicInternal("titles", looptitle); } - else + else if (midi_disabled && !cv_gamemidimusic.value) { midi_disabled = true; if (S_MusicType() == MU_MID)