diff --git a/src/s_sound.c b/src/s_sound.c index 9c0bb85fa..bbcf41bee 100644 --- a/src/s_sound.c +++ b/src/s_sound.c @@ -134,6 +134,11 @@ consvar_t cv_music_resync_threshold = {"music_resync_threshold", "0", CV_SAVE|CV consvar_t cv_music_resync_powerups_only = {"music_resync_powerups_only", "No", CV_SAVE|CV_CALL, CV_YesNo, I_UpdateSongLagConditions, 0, NULL, NULL, 0, 0, NULL}; +#ifdef HAVE_OPENMPT +static CV_PossibleValue_t interpolationfilter_cons_t[] = {{0, "Default"}, {1, "None"}, {2, "Linear"}, {4, "Cubic"}, {8, "Windowed sinc"}, {0, NULL}}; +consvar_t cv_modfilter = {"modfilter", "0", CV_SAVE, interpolationfilter_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; +#endif + #define S_MAX_VOLUME 127 // when to clip out sounds diff --git a/src/sdl/mixer_sound.c b/src/sdl/mixer_sound.c index 961abdd8a..694093672 100644 --- a/src/sdl/mixer_sound.c +++ b/src/sdl/mixer_sound.c @@ -82,12 +82,6 @@ write netcode into the sound code, OKAY? static UINT16 BUFFERSIZE = 2048; static UINT16 SAMPLERATE = 44100; -#ifdef HAVE_OPENMPT -#include "libopenmpt/libopenmpt.h" -static CV_PossibleValue_t interpolationfilter_cons_t[] = {{0, "Default"}, {1, "None"}, {2, "Linear"}, {4, "Cubic"}, {8, "Windowed sinc"}, {0, NULL}}; -consvar_t cv_modfilter = {"modfilter", "0", CV_SAVE, interpolationfilter_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; -#endif - /// ------------------------ /// Audio Declarations /// ------------------------