From 444adb622ff9ffabce45852acffb292fa74a200c Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Mon, 12 Jan 2015 19:04:12 +0100
Subject: [PATCH] Move camera drivers to camera/drivers/

---
 Makefile.common                     | 6 +++---
 camera/{ => drivers}/android.c      | 2 +-
 camera/{ => drivers}/nullcamera.c   | 2 +-
 camera/{ => drivers}/rwebcam.c      | 4 ++--
 camera/{ => drivers}/video4linux2.c | 2 +-
 griffin/griffin.c                   | 8 ++++----
 6 files changed, 12 insertions(+), 12 deletions(-)
 rename camera/{ => drivers}/android.c (99%)
 rename camera/{ => drivers}/nullcamera.c (98%)
 rename camera/{ => drivers}/rwebcam.c (95%)
 rename camera/{ => drivers}/video4linux2.c (99%)

diff --git a/Makefile.common b/Makefile.common
index d40675febd..e792ed42bb 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -142,7 +142,7 @@ OBJ += frontend/frontend.o \
 		audio/resamplers/nearest.o \
 		audio/resamplers/cc_resampler.o \
 		location/nulllocation.o \
-		camera/nullcamera.o \
+		camera/drivers/nullcamera.o \
 		gfx/drivers/nullgfx.o \
 		audio/drivers/nullaudio.o \
 		input/drivers/nullinput.o \
@@ -177,7 +177,7 @@ ifeq ($(HAVE_EMSCRIPTEN), 1)
 OBJ += frontend/platform/platform_emscripten.o \
 		input/drivers/rwebinput_input.o \
 		audio/drivers/rwebaudio.o \
-		camera/rwebcam.o
+		camera/drivers/rwebcam.o
 endif
 
 # Audio
@@ -601,7 +601,7 @@ endif
 # Camera
 
 ifeq ($(HAVE_V4L2),1)
-   OBJ += camera/video4linux2.o
+   OBJ += camera/drivers/video4linux2.o
    DEFINES += -DHAVE_V4L2
 endif
 
diff --git a/camera/android.c b/camera/drivers/android.c
similarity index 99%
rename from camera/android.c
rename to camera/drivers/android.c
index eb2705274a..e1044bea1c 100644
--- a/camera/android.c
+++ b/camera/drivers/android.c
@@ -16,7 +16,7 @@
  */
 
 #include <glsym/glsym.h>
-#include "../driver.h"
+#include "../../driver.h"
 
 typedef struct android_camera
 {
diff --git a/camera/nullcamera.c b/camera/drivers/nullcamera.c
similarity index 98%
rename from camera/nullcamera.c
rename to camera/drivers/nullcamera.c
index 5617d97829..beacb6542a 100644
--- a/camera/nullcamera.c
+++ b/camera/drivers/nullcamera.c
@@ -13,7 +13,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../driver.h"
+#include "../../driver.h"
 
 static void *nullcamera_init(const char *device, uint64_t caps,
       unsigned width, unsigned height)
diff --git a/camera/rwebcam.c b/camera/drivers/rwebcam.c
similarity index 95%
rename from camera/rwebcam.c
rename to camera/drivers/rwebcam.c
index 0be75627a0..be2437521e 100644
--- a/camera/rwebcam.c
+++ b/camera/drivers/rwebcam.c
@@ -13,8 +13,8 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../driver.h"
-#include "../emscripten/RWebCam.h"
+#include "../../driver.h"
+#include "../../emscripten/RWebCam.h"
 
 static void *rwebcam_init(const char *device, uint64_t caps,
       unsigned width, unsigned height)
diff --git a/camera/video4linux2.c b/camera/drivers/video4linux2.c
similarity index 99%
rename from camera/video4linux2.c
rename to camera/drivers/video4linux2.c
index 3148bb1974..164cb93957 100644
--- a/camera/video4linux2.c
+++ b/camera/drivers/video4linux2.c
@@ -20,7 +20,7 @@
 #include <string.h>
 #include <assert.h>
 #include <stddef.h>
-#include "../performance.h"
+#include "../../performance.h"
 #include <retro_miscellaneous.h>
 #include <gfx/scaler/scaler.h>
 #include <stdlib.h>
diff --git a/griffin/griffin.c b/griffin/griffin.c
index bca1e95bdb..ee257c3bfc 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -418,16 +418,16 @@ AUDIO RESAMPLER
 CAMERA
 ============================================================ */
 #if defined(ANDROID)
-#include "../camera/android.c"
+#include "../camera/drivers/android.c"
 #elif defined(EMSCRIPTEN)
-#include "../camera/rwebcam.c"
+#include "../camera/drivers/rwebcam.c"
 #endif
 
 #ifdef HAVE_V4L2
-#include "../camera/video4linux2.c"
+#include "../camera/drivers/video4linux2.c"
 #endif
 
-#include "../camera/nullcamera.c"
+#include "../camera/drivers/nullcamera.c"
 
 /*============================================================
 LOCATION