Added deinitialize hook.

libsdl-org · Oct 3, 2006 · a42a3b2 · a42a3b2
1 parent 2149666
commit a42a3b2
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/src/audio/SDL_audio.c b/src/audio/SDL_audio.c
@@ -442,6 +442,7 @@ SDL_AudioInit(const char *driver_name)
         current_audio.impl.LockAudio = SDL_LockAudio_Default;
         current_audio.impl.UnlockAudio = SDL_UnlockAudio_Default;
     }
+
     return (0);
 }
 
@@ -851,9 +852,9 @@ SDL_AudioQuit(void)
     for (i = 0; i < SDL_arraysize(open_devices); i++) {
         SDL_CloseAudioDevice(i);
     }
-    /* Free the driver data */
 
-/* !!! FIXME!    current_audio.free(&current_audio); */
+    /* Free the driver data */
+    current_audio.Deinitialize();
     SDL_memset(&current_audio, '\0', sizeof (current_audio));
     SDL_memset(open_devices, '\0', sizeof (open_devices));
 }

diff --git a/src/audio/SDL_sysaudio.h b/src/audio/SDL_sysaudio.h
@@ -43,6 +43,7 @@ typedef struct SDL_AudioDriverImpl
     void (*CloseAudio) (_THIS);
     void (*LockAudio) (_THIS);
     void (*UnlockAudio) (_THIS);
+    void (*Deinitialize) (void);
 } SDL_AudioDriverImpl;
 
 typedef struct SDL_AudioDriver

diff --git a/src/audio/macosx/SDL_coreaudio.c b/src/audio/macosx/SDL_coreaudio.c
@@ -179,6 +179,7 @@ static void COREAUDIO_WaitAudio(_THIS);
 static void COREAUDIO_PlayAudio(_THIS);
 static Uint8 *COREAUDIO_GetAudioBuf(_THIS);
 static void COREAUDIO_CloseAudio(_THIS);
+static void COREAUDIO_Deinitialize(void);
 
 /* Audio driver bootstrap functions */
 
@@ -201,6 +202,7 @@ COREAUDIO_Init(SDL_AudioDriverImpl *impl)
     impl->PlayAudio = COREAUDIO_PlayAudio;
     impl->GetAudioBuf = COREAUDIO_GetAudioBuf;
     impl->CloseAudio = COREAUDIO_CloseAudio;
+    impl->Deinitialize = COREAUDIO_Deinitialize;
 
     return 1;
 }
@@ -210,6 +212,15 @@ AudioBootStrap COREAUDIO_bootstrap = {
     COREAUDIO_Available, COREAUDIO_Init
 };
 
+
+static void
+COREAUDIO_Deinitialize(void)
+{
+    free_device_list(0, &outputDevices, &outputDeviceCount);
+    free_device_list(1, &inputDevices, &inputDeviceCount);
+}
+
+
 /* The CoreAudio callback */
 static OSStatus
 outputCallback(void *inRefCon,