pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Re-added MacOS X audio locking

Browse source 
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%40349
This commit is contained in:
Sam Lantinga 2002-04-13 23:31:07 +00:00
parent 5b4fdd0de0
commit 3629d251f2
1 changed files with 17 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/audio/macrom/SDL_romaudio.c
View file

@ -91,6 +91,10 @@ static SDL_AudioDevice *Audio_CreateDevice(int devindex)
this->UnlockAudio = Mac_UnlockAudio; this->UnlockAudio = Mac_UnlockAudio;
this->free = Audio_DeleteDevice; this->free = Audio_DeleteDevice;
#ifdef MACOSX /* MacOS X uses threaded audio, so normal thread code is okay */
this->LockAudio = NULL;
this->UnlockAudio = NULL;
#endif
return this; return this;
} }
@ -100,7 +104,7 @@ AudioBootStrap SNDMGR_bootstrap = {
}; };
#if defined(TARGET_API_MAC_CARBON) || defined(USE_RYANS_SOUNDCODE) #if defined(TARGET_API_MAC_CARBON) || defined(USE_RYANS_SOUNDCODE)
/* FIXME: Does this work correctly on MacOS X as well? */ /* This works correctly on MacOS X */
#pragma options align=power #pragma options align=power
@ -115,19 +119,23 @@ static volatile Uint32 fill_me = 0;
static void mix_buffer(SDL_AudioDevice *audio, UInt8 *buffer) static void mix_buffer(SDL_AudioDevice *audio, UInt8 *buffer)
{ {
if ( ! audio->paused ) { if ( ! audio->paused ) {
#ifdef MACOSX
SDL_mutexP(audio->mixer_lock);
#endif
if ( audio->convert.needed ) { if ( audio->convert.needed ) {
audio->spec.callback(audio->spec.userdata, audio->spec.callback(audio->spec.userdata,
(Uint8 *)audio->convert.buf,audio->convert.len); (Uint8 *)audio->convert.buf,audio->convert.len);
SDL_ConvertAudio(&audio->convert); SDL_ConvertAudio(&audio->convert);
#if 0
if ( audio->convert.len_cvt != audio->spec.size ) { if ( audio->convert.len_cvt != audio->spec.size ) {
/* Uh oh... probably crashes here; */ /* Uh oh... probably crashes here */;
} }
#endif
memcpy(buffer, audio->convert.buf, audio->convert.len_cvt); memcpy(buffer, audio->convert.buf, audio->convert.len_cvt);
} else { } else {
audio->spec.callback(audio->spec.userdata, buffer, audio->spec.size); audio->spec.callback(audio->spec.userdata, buffer, audio->spec.size);
} }
#ifdef MACOSX
SDL_mutexV(audio->mixer_lock);
#endif
} }
DecrementAtomic((SInt32 *) &need_to_mix); DecrementAtomic((SInt32 *) &need_to_mix);