shithub: choc

Info  •  Files  •  Log  •  Branches

Merge branch 'sdl2-branch' of github.com:chocolate-doom/chocolate-doom into sdl2-branch

--- a/src/i_sdlsound.c

+++ b/src/i_sdlsound.c

@@ -56,8 +56,6 @@

     allocated_sound_t *prev, *next;

 };

-static boolean setpanning_workaround = false;

-

 static boolean sound_initialized = false;

 static allocated_sound_t *channels_playing[NUM_CHANNELS];

@@ -898,16 +896,6 @@

     else if ( left > 255) left = 255;

     if (right < 0) right = 0;

     else if (right > 255) right = 255;

-

-    // SDL_mixer version 1.2.8 and earlier has a bug in the Mix_SetPanning

-    // function.  A workaround is to call Mix_UnregisterAllEffects for

-    // the channel before calling it.  This is undesirable as it may lead

-    // to the channel volumes resetting briefly.

-

-    if (setpanning_workaround)

-    {

-        Mix_UnregisterAllEffects(handle);

-    }

     Mix_SetPanning(handle, left, right);

 }