From b48b5a29a4b97464eee135c3fa7bc465dfdfa809 Mon Sep 17 00:00:00 2001 From: mazmazz Date: Tue, 18 Sep 2018 12:33:22 -0400 Subject: [PATCH] Move cv_modfilter from mixer_sound.c to s_sound.c for other targets --- src/s_sound.c | 5 +++++ src/sdl/mixer_sound.c | 2 -- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/s_sound.c b/src/s_sound.c index 5c3ff3ed9..5d50c3c5b 100644 --- a/src/s_sound.c +++ b/src/s_sound.c @@ -98,6 +98,11 @@ consvar_t cv_numChannels = {"snd_channels", "32", CV_SAVE|CV_CALL, CV_Unsigned, static consvar_t surround = {"surround", "Off", CV_SAVE, CV_OnOff, NULL, 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 52e0d4ddf..0a6c26825 100644 --- a/src/sdl/mixer_sound.c +++ b/src/sdl/mixer_sound.c @@ -71,8 +71,6 @@ 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 /// ------------------------