From 7283ce17bc01792d98a232bc12e431c4aa33764f Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Mon, 12 Jan 2015 18:09:31 +0100
Subject: [PATCH] Move audio_driver.c to audio/

---
 Makefile.common                        |  2 +-
 audio_driver.c => audio/audio_driver.c | 10 +++++-----
 audio_driver.h => audio/audio_driver.h |  0
 driver.h                               |  2 +-
 griffin/griffin.c                      |  2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)
 rename audio_driver.c => audio/audio_driver.c (98%)
 rename audio_driver.h => audio/audio_driver.h (100%)

diff --git a/Makefile.common b/Makefile.common
index fc4548ca24..e285772b92 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -97,7 +97,7 @@ OBJ += frontend/frontend.o \
 		file_ops.o \
 		libretro-sdk/file/file_path.o \
 		hash.o \
-		audio_driver.o \
+		audio/audio_driver.o \
 		driver.o \
 		settings.o \
 		settings_list.o \
diff --git a/audio_driver.c b/audio/audio_driver.c
similarity index 98%
rename from audio_driver.c
rename to audio/audio_driver.c
index 30ef88cf48..86d498d3d2 100644
--- a/audio_driver.c
+++ b/audio/audio_driver.c
@@ -17,11 +17,11 @@
 #include <string.h>
 #include <string/string_list.h>
 #include "audio_driver.h"
-#include "audio/utils.h"
-#include "audio/audio_thread_wrapper.h"
-#include "driver.h"
-#include "general.h"
-#include "retroarch.h"
+#include "utils.h"
+#include "audio_thread_wrapper.h"
+#include "../driver.h"
+#include "../general.h"
+#include "../retroarch.h"
 
 static const audio_driver_t *audio_drivers[] = {
 #ifdef HAVE_ALSA
diff --git a/audio_driver.h b/audio/audio_driver.h
similarity index 100%
rename from audio_driver.h
rename to audio/audio_driver.h
diff --git a/driver.h b/driver.h
index 72a61ce679..2ecc4e551a 100644
--- a/driver.h
+++ b/driver.h
@@ -35,7 +35,7 @@
 #include "frontend/frontend_context.h"
 #include <retro_miscellaneous.h>
 
-#include "audio_driver.h"
+#include "audio/audio_driver.h"
 
 #include "menu/menu_driver.h"
 #include "menu/backend/menu_backend.h"
diff --git a/griffin/griffin.c b/griffin/griffin.c
index ff537384c5..efe84dd338 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -496,7 +496,7 @@ AUDIO
 /*============================================================
 DRIVERS
 ============================================================ */
-#include "../audio_driver.c"
+#include "../audio/audio_driver.c"
 #include "../driver.c"
 
 /*============================================================