From 0425f0564ce5f40d8871fd293a895aee9034650a Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sun, 22 Nov 2015 13:35:57 +0100
Subject: [PATCH] Remove audio/audio_monitor.h

---
 audio/audio_driver.c  |  1 -
 audio/audio_driver.h  | 53 +++++++++++++++++++++++++------------------
 audio/audio_monitor.h | 39 -------------------------------
 driver.c              |  1 -
 4 files changed, 31 insertions(+), 63 deletions(-)
 delete mode 100644 audio/audio_monitor.h

diff --git a/audio/audio_driver.c b/audio/audio_driver.c
index 42137d04e7..8f80c537e6 100644
--- a/audio/audio_driver.c
+++ b/audio/audio_driver.c
@@ -16,7 +16,6 @@
 
 #include <string.h>
 
-#include "audio_monitor.h"
 #include "audio_driver.h"
 #include "audio_utils.h"
 #include "audio_thread_wrapper.h"
diff --git a/audio/audio_driver.h b/audio/audio_driver.h
index b9cf548f51..3396f45801 100644
--- a/audio/audio_driver.h
+++ b/audio/audio_driver.h
@@ -72,28 +72,6 @@ typedef struct audio_driver
    size_t (*buffer_size)(void *data);
 } audio_driver_t;
 
-extern audio_driver_t audio_rsound;
-extern audio_driver_t audio_oss;
-extern audio_driver_t audio_alsa;
-extern audio_driver_t audio_alsathread;
-extern audio_driver_t audio_roar;
-extern audio_driver_t audio_openal;
-extern audio_driver_t audio_opensl;
-extern audio_driver_t audio_jack;
-extern audio_driver_t audio_sdl;
-extern audio_driver_t audio_xa;
-extern audio_driver_t audio_pulse;
-extern audio_driver_t audio_dsound;
-extern audio_driver_t audio_coreaudio;
-extern audio_driver_t audio_xenon360;
-extern audio_driver_t audio_ps3;
-extern audio_driver_t audio_gx;
-extern audio_driver_t audio_psp;
-extern audio_driver_t audio_ctr_csnd;
-extern audio_driver_t audio_ctr_dsp;
-extern audio_driver_t audio_rwebaudio;
-extern audio_driver_t audio_null;
-
 /**
  * audio_driver_find_handle:
  * @index              : index of driver to get handle to.
@@ -176,6 +154,37 @@ void audio_driver_callback(void);
 
 void audio_driver_callback_set_state(bool state);
 
+void audio_monitor_adjust_system_rates(void);
+
+/**
+ * audio_monitor_set_refresh_rate:
+ *
+ * Sets audio monitor refresh rate to new value.
+ **/
+void audio_monitor_set_refresh_rate(void);
+
+extern audio_driver_t audio_rsound;
+extern audio_driver_t audio_oss;
+extern audio_driver_t audio_alsa;
+extern audio_driver_t audio_alsathread;
+extern audio_driver_t audio_roar;
+extern audio_driver_t audio_openal;
+extern audio_driver_t audio_opensl;
+extern audio_driver_t audio_jack;
+extern audio_driver_t audio_sdl;
+extern audio_driver_t audio_xa;
+extern audio_driver_t audio_pulse;
+extern audio_driver_t audio_dsound;
+extern audio_driver_t audio_coreaudio;
+extern audio_driver_t audio_xenon360;
+extern audio_driver_t audio_ps3;
+extern audio_driver_t audio_gx;
+extern audio_driver_t audio_psp;
+extern audio_driver_t audio_ctr_csnd;
+extern audio_driver_t audio_ctr_dsp;
+extern audio_driver_t audio_rwebaudio;
+extern audio_driver_t audio_null;
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/audio/audio_monitor.h b/audio/audio_monitor.h
deleted file mode 100644
index 0ea41fcf54..0000000000
--- a/audio/audio_monitor.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- *  Copyright (C) 2011-2015 - Daniel De Matteis
- * 
- *  RetroArch is free software: you can redistribute it and/or modify it under the terms
- *  of the GNU General Public License as published by the Free Software Found-
- *  ation, either version 3 of the License, or (at your option) any later version.
- *
- *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- *  PURPOSE.  See the GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along with RetroArch.
- *  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __AUDIO_MONITOR_H
-#define __AUDIO_MONITOR_H
-
-#include <boolean.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void audio_monitor_adjust_system_rates(void);
-
-/**
- * audio_monitor_set_refresh_rate:
- *
- * Sets audio monitor refresh rate to new value.
- **/
-void audio_monitor_set_refresh_rate(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/driver.c b/driver.c
index 512cd84a33..9ade2522e0 100644
--- a/driver.c
+++ b/driver.c
@@ -18,7 +18,6 @@
 
 #include "general.h"
 #include "msg_hash.h"
-#include "audio/audio_monitor.h"
 
 #include "msg_hash.h"