adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix a type warning in sdl sound driver that could actually become a problem

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3648 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
avolkov
2011-07-16 16:26:57 +00:00
parent 9568dc0ef6
commit f692ecf001
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/libs/sound/mixer/sdl/audiodrv_sdl.c
+8 -1
View File
@@ -90,6 +90,8 @@ static const audio_Driver mixSDL_Driver =
}; };
static void audioCallback (void *userdata, Uint8 *stream, int len);
/* /*
* Initialization * Initialization
*/ */
@@ -143,7 +145,7 @@ mixSDL_Init (audio_Driver *driver, sint32 flags)
desired.format = AUDIO_S16SYS; desired.format = AUDIO_S16SYS;
desired.channels = 2; desired.channels = 2;
desired.callback = mixer_MixChannels; desired.callback = audioCallback;
log_add (log_Info, "Opening SDL audio device."); log_add (log_Info, "Opening SDL audio device.");
if (SDL_OpenAudio (&desired, &obtained) < 0) if (SDL_OpenAudio (&desired, &obtained) < 0)
@@ -247,6 +249,11 @@ mixSDL_Uninit (void)
SDL_QuitSubSystem (SDL_INIT_AUDIO); SDL_QuitSubSystem (SDL_INIT_AUDIO);
} }
static void
audioCallback (void *userdata, Uint8 *stream, int len)
{
mixer_MixChannels (userdata, stream, len);
}
/* /*
* General * General