From bbc6a5cee4dc604133934428f78b6f002e3a0f0b Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Mon, 12 Jan 2015 22:28:59 +0100
Subject: [PATCH] Move rsound.c to audio/drivers

---
 audio/{ => drivers}/rsound.c | 2 +-
 audio/{ => drivers}/rsound.h | 0
 audio/librsound.c            | 4 ++--
 griffin/griffin.c            | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename audio/{ => drivers}/rsound.c (99%)
 rename audio/{ => drivers}/rsound.h (100%)

diff --git a/audio/rsound.c b/audio/drivers/rsound.c
similarity index 99%
rename from audio/rsound.c
rename to audio/drivers/rsound.c
index 9b49e9f67f..f3fcd4bb86 100644
--- a/audio/rsound.c
+++ b/audio/drivers/rsound.c
@@ -14,7 +14,7 @@
  */
 
 
-#include "../driver.h"
+#include "../audio_driver.h"
 #include <stdlib.h>
 #include "rsound.h"
 #include <queues/fifo_buffer.h>
diff --git a/audio/rsound.h b/audio/drivers/rsound.h
similarity index 100%
rename from audio/rsound.h
rename to audio/drivers/rsound.h
diff --git a/audio/librsound.c b/audio/librsound.c
index ba352b7af5..68830fb9a2 100644
--- a/audio/librsound.c
+++ b/audio/librsound.c
@@ -29,14 +29,14 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "rsound.h"
+#include "drivers/rsound.h"
 
 #if defined(__CELLOS_LV2__)
 #include <cell/sysmodule.h>
 #include <sys/timer.h>
 #include <sys/sys_time.h>
 
-// network headers
+/* Network headers */
 #include <netex/net.h>
 #include <netex/errno.h>
 #define NETWORK_COMPAT_HEADERS 1
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 626e4d81a9..510531eb43 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -443,7 +443,7 @@ RSOUND
 ============================================================ */
 #ifdef HAVE_RSOUND
 #include "../audio/librsound.c"
-#include "../audio/rsound.c"
+#include "../audio/drivers/rsound.c"
 #endif
 
 /*============================================================