shithub: choc

Info  •  Files  •  Log  •  Branches

Use Mix_HookMusic rather than Mix_SetPostMix for OPL emulation, to avoid
conflict with PC speaker emulation.

Subversion-branch: /branches/opl-branch
Subversion-revision: 1706

--- a/opl/opl_sdl.c

+++ b/opl/opl_sdl.c

@@ -160,8 +160,8 @@

     for (i=0; i<nsamples; ++i)

     {

-        buffer[i * 2] += mix_buffer[i] / 2;

-        buffer[i * 2 + 1] += mix_buffer[i] / 2;

+        buffer[i * 2] = mix_buffer[i];

+        buffer[i * 2 + 1] = mix_buffer[i];

     }

 }

@@ -225,7 +225,7 @@

 static void OPL_SDL_Shutdown(void)

 {

-    Mix_SetPostMix(NULL, NULL);

+    Mix_HookMusic(NULL, NULL);

     if (sdl_was_initialized)

     {

@@ -356,7 +356,7 @@

     callback_queue_mutex = SDL_CreateMutex();

     // TODO: This should be music callback? or-?

-    Mix_SetPostMix(OPL_Mix_Callback, NULL);

+    Mix_HookMusic(OPL_Mix_Callback, NULL);

     return 1;

 }