From 66259dee17bccd798e4a0fcc70c0d65dfef7a6a2 Mon Sep 17 00:00:00 2001 From: Gregory Hainaut Date: Fri, 30 Oct 2015 17:12:40 +0100 Subject: [PATCH] spu2x-sdl: always use 16 bit formats 32 bits range is too big and requires to maximize the volume. --- plugins/spu2-x/src/SndOut_SDL.cpp | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/plugins/spu2-x/src/SndOut_SDL.cpp b/plugins/spu2-x/src/SndOut_SDL.cpp index 72b2f49819..c73b2ae1e6 100644 --- a/plugins/spu2-x/src/SndOut_SDL.cpp +++ b/plugins/spu2-x/src/SndOut_SDL.cpp @@ -27,11 +27,7 @@ * build wx without sdl support, though) and onepad at the time of writing this. */ #include #include -#if SDL_MAJOR_VERSION >= 2 -typedef StereoOut32 StereoOut_SDL; -#else typedef StereoOut16 StereoOut_SDL; -#endif namespace { /* Since spu2 only ever outputs stereo, we don't worry about emitting surround sound @@ -42,12 +38,7 @@ namespace { * sample count and SDL may provide otherwise. Pulseaudio will cut this value in half if * PA_STREAM_ADJUST_LATENCY is set in the backened, for example. */ const Uint16 desiredSamples = 1024; - const Uint16 format = -#if SDL_MAJOR_VERSION >= 2 - AUDIO_S32SYS; -#else - AUDIO_S16SYS; -#endif + const Uint16 format = AUDIO_S16SYS; Uint16 samples = desiredSamples;