Rename LockAudio,UnlockAudio to LockDevice,UnlockDevice. Also some small fixes
--- a/src/audio/mint/SDL_mintaudio_dma8.c Fri Jul 13 22:55:54 2007 +0000
+++ b/src/audio/mint/SDL_mintaudio_dma8.c Fri Jul 13 23:58:22 2007 +0000
@@ -113,8 +113,8 @@
}
DEBUG_PRINT((DEBUG_NAME "closeaudio: buffers freed\n"));
- SDL_free(this->buffer);
- this->buffer = NULL;
+ SDL_free(this->hidden);
+ this->hidden = NULL;
}
}
@@ -332,8 +332,8 @@
/* Set the function pointers */
impl->OpenDevice = MINTDMA8_OpenDevice;
impl->CloseDevice = MINTDMA8_CloseDevice;
- impl->LockAudio = MINTDMA8_LockAudio;
- impl->UnlockAudio = MINTDMA8_UnlockAudio;
+ impl->LockDevice = MINTDMA8_LockDevice;
+ impl->UnlockDevice = MINTDMA8_UnlockDevice;
impl->OnlyHasDefaultOutputDevice = 1;
impl->ProvidesOwnCallbackThread = 1;
impl->SkipMixerLock = 1;
--- a/src/audio/mint/SDL_mintaudio_gsxb.c Fri Jul 13 22:55:54 2007 +0000
+++ b/src/audio/mint/SDL_mintaudio_gsxb.c Fri Jul 13 23:58:22 2007 +0000
@@ -427,8 +427,8 @@
/* Set the function pointers */
impl->OpenDevice = MINTGSXB_OpenDevice;
impl->CloseDevice = MINTGSXB_CloseDevice;
- impl->LockAudio = MINTGSXB_LockAudio;
- impl->UnlockAudio = MINTGSXB_UnlockAudio;
+ impl->LockDevice = MINTGSXB_LockDevice;
+ impl->UnlockDevice = MINTGSXB_UnlockDevice;
impl->OnlyHasDefaultOutputDevice = 1;
impl->ProvidesOwnCallbackThread = 1;
impl->SkipMixerLock = 1;
--- a/src/audio/mint/SDL_mintaudio_it.S Fri Jul 13 22:55:54 2007 +0000
+++ b/src/audio/mint/SDL_mintaudio_it.S Fri Jul 13 23:58:22 2007 +0000
@@ -78,7 +78,7 @@
/* Check if we are not already running */
tstw _SDL_MintAudio_mutex
- bnes SDL_MintAudio_XbiosEnd
+ bne SDL_MintAudio_XbiosEnd
notw _SDL_MintAudio_mutex
/* Swap buffers */
@@ -152,7 +152,7 @@
/* Check if we are not already running */
tstw _SDL_MintAudio_mutex
- bnes SDL_MintAudio_Dma8End
+ bne SDL_MintAudio_Dma8End
notw _SDL_MintAudio_mutex
/* Swap buffers */
--- a/src/audio/mint/SDL_mintaudio_mcsn.c Fri Jul 13 22:55:54 2007 +0000
+++ b/src/audio/mint/SDL_mintaudio_mcsn.c Fri Jul 13 23:58:22 2007 +0000
@@ -384,8 +384,8 @@
/* Set the function pointers */
impl->OpenDevice = MINTMCSN_OpenDevice;
impl->CloseDevice = MINTMCSN_CloseDevice;
- impl->LockAudio = MINTMCSN_LockAudio;
- impl->UnlockAudio = MINTMCSN_UnlockAudio;
+ impl->LockDevice = MINTMCSN_LockDevice;
+ impl->UnlockDevice = MINTMCSN_UnlockDevice;
impl->OnlyHasDefaultOutputDevice = 1;
impl->ProvidesOwnCallbackThread = 1;
impl->SkipMixerLock = 1;
--- a/src/audio/mint/SDL_mintaudio_stfa.c Fri Jul 13 22:55:54 2007 +0000
+++ b/src/audio/mint/SDL_mintaudio_stfa.c Fri Jul 13 23:58:22 2007 +0000
@@ -239,8 +239,8 @@
SDL_MintAudio_audiobuf[0] =
Atari_SysMalloc(this->spec.size * 2, MX_STRAM);
if (SDL_MintAudio_audiobuf[0] == NULL) {
- SDL_OutOfMemory()
- SDL_free(this->hidden);
+ SDL_OutOfMemory();
+ SDL_free(this->hidden);
this->hidden = NULL;
return 0;
}
@@ -291,8 +291,8 @@
/* Set the function pointers */
impl->OpenDevice = MINTSTFA_OpenDevice;
impl->CloseDevice = MINTSTFA_CloseDevice;
- impl->LockAudio = MINTSTFA_LockAudio;
- impl->UnlockAudio = MINTSTFA_UnlockAudio;
+ impl->LockDevice = MINTSTFA_LockDevice;
+ impl->UnlockDevice = MINTSTFA_UnlockDevice;
impl->OnlyHasDefaultOutputDevice = 1;
impl->ProvidesOwnCallbackThread = 1;
impl->SkipMixerLock = 1;
--- a/src/audio/mint/SDL_mintaudio_xbios.c Fri Jul 13 22:55:54 2007 +0000
+++ b/src/audio/mint/SDL_mintaudio_xbios.c Fri Jul 13 23:58:22 2007 +0000
@@ -484,8 +484,8 @@
/* Set the function pointers */
impl->OpenDevice = MINTXBIOS_OpenDevice;
impl->CloseDevice = MINTXBIOS_CloseDevice;
- impl->LockAudio = MINTXBIOS_LockAudio;
- impl->UnlockAudio = MINTXBIOS_UnlockAudio;
+ impl->LockDevice = MINTXBIOS_LockDevice;
+ impl->UnlockDevice = MINTXBIOS_UnlockDevice;
impl->OnlyHasDefaultOutputDevice = 1;
impl->ProvidesOwnCallbackThread = 1;
impl->SkipMixerLock = 1;