From 2e5f27ad54579c618c2140cb17f70496786004e4 Mon Sep 17 00:00:00 2001
From: Patrice Mandin <patmandin@gmail.com>
Date: Fri, 13 Jul 2007 23:58:22 +0000
Subject: [PATCH] Rename LockAudio,UnlockAudio to LockDevice,UnlockDevice. Also
 some small fixes

---
 src/audio/mint/SDL_mintaudio_dma8.c  | 8 ++++----
 src/audio/mint/SDL_mintaudio_gsxb.c  | 4 ++--
 src/audio/mint/SDL_mintaudio_it.S    | 4 ++--
 src/audio/mint/SDL_mintaudio_mcsn.c  | 4 ++--
 src/audio/mint/SDL_mintaudio_stfa.c  | 8 ++++----
 src/audio/mint/SDL_mintaudio_xbios.c | 4 ++--
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/audio/mint/SDL_mintaudio_dma8.c b/src/audio/mint/SDL_mintaudio_dma8.c
index 4b4e8ef38..bc1f37238 100644
--- a/src/audio/mint/SDL_mintaudio_dma8.c
+++ b/src/audio/mint/SDL_mintaudio_dma8.c
@@ -113,8 +113,8 @@ MINTDMA8_CloseDevice(_THIS)
         }
 
         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 @@ MINTDMA8_Init(SDL_AudioDriverImpl * impl)
     /* 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;
diff --git a/src/audio/mint/SDL_mintaudio_gsxb.c b/src/audio/mint/SDL_mintaudio_gsxb.c
index 75374e716..8206bff5f 100644
--- a/src/audio/mint/SDL_mintaudio_gsxb.c
+++ b/src/audio/mint/SDL_mintaudio_gsxb.c
@@ -427,8 +427,8 @@ MINTGSXB_Init(SDL_AudioDriverImpl * impl)
     /* 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;
diff --git a/src/audio/mint/SDL_mintaudio_it.S b/src/audio/mint/SDL_mintaudio_it.S
index a73c19e3c..c751a5912 100644
--- a/src/audio/mint/SDL_mintaudio_it.S
+++ b/src/audio/mint/SDL_mintaudio_it.S
@@ -78,7 +78,7 @@ _SDL_MintAudio_XbiosInterrupt:
 
 	/* 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 @@ _SDL_MintAudio_Dma8Interrupt:
 
 	/* 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 */
diff --git a/src/audio/mint/SDL_mintaudio_mcsn.c b/src/audio/mint/SDL_mintaudio_mcsn.c
index 76bc281a6..ef7aa1751 100644
--- a/src/audio/mint/SDL_mintaudio_mcsn.c
+++ b/src/audio/mint/SDL_mintaudio_mcsn.c
@@ -384,8 +384,8 @@ MINTMCSN_Init(SDL_AudioDriverImpl * impl)
     /* 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;
diff --git a/src/audio/mint/SDL_mintaudio_stfa.c b/src/audio/mint/SDL_mintaudio_stfa.c
index e5c60a036..9b7534f40 100644
--- a/src/audio/mint/SDL_mintaudio_stfa.c
+++ b/src/audio/mint/SDL_mintaudio_stfa.c
@@ -239,8 +239,8 @@ MINTSTFA_OpenDevice(_THIS, const char *devname, int iscapture)
     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 @@ MINTSTFA_Init(SDL_AudioDriverImpl * impl)
     /* 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;
diff --git a/src/audio/mint/SDL_mintaudio_xbios.c b/src/audio/mint/SDL_mintaudio_xbios.c
index d2c75749e..8d5e2438f 100644
--- a/src/audio/mint/SDL_mintaudio_xbios.c
+++ b/src/audio/mint/SDL_mintaudio_xbios.c
@@ -484,8 +484,8 @@ MINTXBIOS_Init(SDL_AudioDriverImpl * impl)
     /* 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;