Patched to compile.

libsdl-org · Oct 28, 2006 · fb85a39 · fb85a39
1 parent 30d675e
commit fb85a39
Showing 1 changed file with 20 additions and 22 deletions.
diff --git a/src/audio/macrom/SDL_romaudio.c b/src/audio/macrom/SDL_romaudio.c
@@ -158,6 +158,26 @@ callBackProc(SndChannel * chan, SndCommand * cmd_passed)
     }
 }
 
+static void
+SNDMGR_CloseDevice(_THIS)
+{
+    running = 0;
+
+    if (this->hidden != NULL) {
+        if (this->hidden->channel) {
+            SndDisposeChannel(this->hidden->channel, true);
+            this->hidden->channel = NULL;
+        }
+
+        SDL_free(buffer[0]);
+        SDL_free(buffer[1]);
+        buffer[0] = buffer[1] = NULL;
+
+        SDL_free(this->hidden);
+        this->hidden = NULL;
+    }
+}
+
 static int
 SNDMGR_OpenDevice(_THIS, const char *devname, int iscapture)
 {
@@ -271,28 +291,6 @@ SNDMGR_OpenDevice(_THIS, const char *devname, int iscapture)
     return 1;
 }
 
-static void
-SNDMGR_CloseDevice(_THIS)
-{
-    int i;
-
-    running = 0;
-
-    if (this->hidden->channel) {
-        SndDisposeChannel(this->hidden->channel, true);
-        this->hidden->channel = NULL;
-    }
-
-    for (i = 0; i < 2; ++i) {
-        if (buffer[i]) {
-            SDL_free(buffer[i]);
-            buffer[i] = NULL;
-        }
-    }
-    SDL_free(this->hidden);
-    this->hidden = NULL;
-}
-
 static int
 SNDMGR_Init(SDL_AudioDriverImpl *impl)
 {