From 8dd82642d3fed37246cde89fc0dfd83617d04e73 Mon Sep 17 00:00:00 2001
From: Aaron Culliney <devnull@deadc0de.org>
Date: Sun, 14 Jun 2015 15:05:44 -0700
Subject: [PATCH] Refactor : rename audio subsystem initialization and shutdown
 functions

---
 src/audio/soundcore.c |  4 ++--
 src/audio/soundcore.h | 11 +++++++++--
 src/test/testcommon.c |  2 +-
 src/timing.c          |  4 ++--
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/audio/soundcore.c b/src/audio/soundcore.c
index 02af095f..ddba51c8 100644
--- a/src/audio/soundcore.c
+++ b/src/audio/soundcore.c
@@ -239,7 +239,7 @@ static void _destroy_enumerated_sound_devices(void) {
     }
 }
 
-bool DSInit(void)
+bool audio_init(void)
 {
     if(audio_isAvailable)
     {
@@ -289,7 +289,7 @@ bool DSInit(void)
 
 //-----------------------------------------------------------------------------
 
-void DSUninit(void)
+void audio_shutdown(void)
 {
     _destroy_enumerated_sound_devices();
 
diff --git a/src/audio/soundcore.h b/src/audio/soundcore.h
index 69b683a9..c3b13a5c 100644
--- a/src/audio/soundcore.h
+++ b/src/audio/soundcore.h
@@ -99,8 +99,15 @@ void SoundCore_SetErrorInc(const int nErrorInc);
 int SoundCore_GetErrorMax(void);
 void SoundCore_SetErrorMax(const int nErrorMax);
 
-bool DSInit(void);
-void DSUninit(void);
+/*
+ * Prepare the audio subsystem, including the backend renderer.
+ */
+bool audio_init(void);
+
+/*
+ * Shutdown the audio subsystem and backend renderer.
+ */
+void audio_shutdown(void);
 
 extern bool audio_isAvailable;
 
diff --git a/src/test/testcommon.c b/src/test/testcommon.c
index e84872e6..9b6222e9 100644
--- a/src/test/testcommon.c
+++ b/src/test/testcommon.c
@@ -136,7 +136,7 @@ void test_common_init(bool do_cputhread) {
         }
     } else {
 #ifdef AUDIO_ENABLED
-        DSInit();
+        audio_init();
         speaker_init();
         MB_Initialize();
 #endif
diff --git a/src/timing.c b/src/timing.c
index e269c4e8..5e9bc780 100644
--- a/src/timing.c
+++ b/src/timing.c
@@ -189,7 +189,7 @@ void *cpu_thread(void *dummyptr) {
     assert(pthread_self() == cpu_thread_id);
 
 #ifdef AUDIO_ENABLED
-    DSInit();
+    audio_init();
     speaker_init();
     MB_Initialize();
 #endif
@@ -410,7 +410,7 @@ void *cpu_thread(void *dummyptr) {
 #ifdef AUDIO_ENABLED
     speaker_destroy();
     MB_Destroy();
-    DSUninit();
+    audio_shutdown();
 #endif
 
     return NULL;