From 41a8496b1c362ae6e3d212eea2bde6f90ed357db Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sun, 8 May 2016 15:53:12 +0200
Subject: [PATCH] Start converting functions

---
 audio/audio_driver.c | 54 +++++++++++++++++++++++++-------------------
 audio/audio_driver.h |  9 +++++---
 driver.c             |  2 +-
 3 files changed, 38 insertions(+), 27 deletions(-)

diff --git a/audio/audio_driver.c b/audio/audio_driver.c
index ba596b7833..80cd8a8314 100644
--- a/audio/audio_driver.c
+++ b/audio/audio_driver.c
@@ -288,7 +288,7 @@ static bool uninit_audio(void)
       return false;
    }
 
-   audio_driver_ctl(RARCH_AUDIO_CTL_RESAMPLER_DEINIT, NULL);
+   audio_driver_deinit_resampler();
 
    if (audio_driver_data.data)
       free(audio_driver_data.data);
@@ -783,33 +783,41 @@ static bool find_audio_driver(void)
    return true;
 }
 
+void audio_driver_deinit_resampler(void)
+{
+   rarch_resampler_freep(&audio_driver_resampler,
+         &audio_driver_resampler_data);
+}
+
+bool audio_driver_free_devices_list(void)
+{
+   if (!current_audio || !current_audio->device_list_free
+         || !audio_driver_context_audio_data)
+      return false;
+   current_audio->device_list_free(audio_driver_context_audio_data, 
+         audio_driver_devices_list);
+   audio_driver_devices_list = NULL;
+   return true;
+}
+
+bool audio_driver_new_devices_list(void)
+{
+   if (!current_audio || !current_audio->device_list_new
+         || !audio_driver_context_audio_data)
+      return false;
+   audio_driver_devices_list = (struct string_list*)
+      current_audio->device_list_new(audio_driver_context_audio_data);
+   if (!audio_driver_devices_list)
+      return false;
+   return true;
+}
+
 bool audio_driver_ctl(enum rarch_audio_ctl_state state, void *data)
 {
    settings_t        *settings                            = config_get_ptr();
 
    switch (state)
    {
-      case RARCH_AUDIO_CTL_RESAMPLER_DEINIT:
-         rarch_resampler_freep(&audio_driver_resampler,
-               &audio_driver_resampler_data);
-         break;
-      case RARCH_AUDIO_CTL_DEVICES_LIST_FREE:
-         if (!current_audio || !current_audio->device_list_free
-               || !audio_driver_context_audio_data)
-            return false;
-         current_audio->device_list_free(audio_driver_context_audio_data, 
-               audio_driver_devices_list);
-         audio_driver_devices_list = NULL;
-         break;
-      case RARCH_AUDIO_CTL_DEVICES_LIST_NEW:
-         if (!current_audio || !current_audio->device_list_new
-               || !audio_driver_context_audio_data)
-            return false;
-         audio_driver_devices_list = (struct string_list*)
-            current_audio->device_list_new(audio_driver_context_audio_data);
-         if (!audio_driver_devices_list)
-            return false;
-         break;
       case RARCH_AUDIO_CTL_DEVICES_LIST_GET:
          {
             struct string_list**ptr = (struct string_list**)data;
@@ -843,7 +851,7 @@ bool audio_driver_ctl(enum rarch_audio_ctl_state state, void *data)
          audio_driver_context_audio_data = NULL;
          break;
       case RARCH_AUDIO_CTL_DEINIT:
-         audio_driver_ctl(RARCH_AUDIO_CTL_DEVICES_LIST_FREE, NULL);
+         audio_driver_free_devices_list();
          if (!uninit_audio())
             return false;
          break;
diff --git a/audio/audio_driver.h b/audio/audio_driver.h
index 38ac06352f..90fc35c4b7 100644
--- a/audio/audio_driver.h
+++ b/audio/audio_driver.h
@@ -63,11 +63,8 @@ enum rarch_audio_ctl_state
    RARCH_AUDIO_CTL_SET_ACTIVE,
    RARCH_AUDIO_CTL_UNSET_ACTIVE,
    RARCH_AUDIO_CTL_IS_ACTIVE,
-   RARCH_AUDIO_CTL_RESAMPLER_DEINIT,
    RARCH_AUDIO_CTL_RESAMPLER_INIT,
    RARCH_AUDIO_CTL_RESAMPLER_PROCESS,
-   RARCH_AUDIO_CTL_DEVICES_LIST_NEW,
-   RARCH_AUDIO_CTL_DEVICES_LIST_FREE,
    RARCH_AUDIO_CTL_DEVICES_LIST_GET
 };
 
@@ -125,6 +122,12 @@ typedef struct audio_driver
 
 bool audio_driver_ctl(enum rarch_audio_ctl_state state, void *data);
 
+void audio_driver_deinit_resampler(void);
+
+bool audio_driver_free_devices_list(void);
+
+bool audio_driver_new_devices_list(void);
+
 /**
  * audio_driver_find_handle:
  * @index              : index of driver to get handle to.
diff --git a/driver.c b/driver.c
index 6a4f3c94af..cd9c5ff426 100644
--- a/driver.c
+++ b/driver.c
@@ -339,7 +339,7 @@ static void init_drivers(int flags)
    if (flags & DRIVER_AUDIO)
    {
       audio_driver_ctl(RARCH_AUDIO_CTL_INIT, NULL);
-      audio_driver_ctl(RARCH_AUDIO_CTL_DEVICES_LIST_NEW, NULL);
+      audio_driver_new_devices_list();
    }
 
    /* Only initialize camera driver if we're ever going to use it. */