diff --git a/src/i_flmusic.c b/src/i_flmusic.c index 4414cb48..de0032cb 100644 --- a/src/i_flmusic.c +++ b/src/i_flmusic.c @@ -203,7 +203,7 @@ static boolean I_FL_InitMusic(int device) settings = new_fluid_settings(); - fluid_settings_setnum(settings, "synth.sample-rate", snd_samplerate); + fluid_settings_setnum(settings, "synth.sample-rate", SND_SAMPLERATE); fluid_settings_setint(settings, "synth.chorus.active", mus_chorus); fluid_settings_setint(settings, "synth.reverb.active", mus_reverb); diff --git a/src/i_oalmusic.c b/src/i_oalmusic.c index d2d4134d..b84bb433 100644 --- a/src/i_oalmusic.c +++ b/src/i_oalmusic.c @@ -293,7 +293,7 @@ void I_OAL_HookMusic(callback_func_t callback_func) callback = callback_func; player.format = AL_FORMAT_STEREO16; - player.freq = snd_samplerate; + player.freq = SND_SAMPLERATE; I_OAL_SetGain(1.0f); StartPlayer(); diff --git a/src/i_oplmusic.c b/src/i_oplmusic.c index 3d23e048..45485139 100644 --- a/src/i_oplmusic.c +++ b/src/i_oplmusic.c @@ -1721,7 +1721,7 @@ static boolean OPL_InitMusic(void) char *dmxoption; opl_init_result_t chip_type; - OPL_SetSampleRate(snd_samplerate); + OPL_SetSampleRate(SND_SAMPLERATE); chip_type = OPL_Init(opl_io_port); if (chip_type == OPL_INIT_NONE) diff --git a/src/i_sound.c b/src/i_sound.c index c453164e..b29ab59b 100644 --- a/src/i_sound.c +++ b/src/i_sound.c @@ -58,9 +58,6 @@ static music_module_t *active_module = NULL; // these routines think that sound has been initialized when it hasn't static boolean snd_init = false; -// haleyjd 10/28/05: updated for Julian's music code, need full quality now -int snd_samplerate; - static ALuint *openal_sources; typedef struct { diff --git a/src/i_sound.h b/src/i_sound.h index 26280378..a334c900 100644 --- a/src/i_sound.h +++ b/src/i_sound.h @@ -35,7 +35,7 @@ #define NORM_SEP 128 #define S_STEREO_SWING (96<