Move V4L2 grabber code to separate library

poljvd · poljvd · commit f3003eb0142a · 2014-02-07T21:11:50.000+01:00
diff --git a/include/grabber/DispmanxWrapper.h b/include/grabber/DispmanxWrapper.h
diff --git a/include/grabber/V4L2Grabber.h b/include/grabber/V4L2Grabber.h
diff --git a/libsrc/CMakeLists.txt b/libsrc/CMakeLists.txt
@@ -12,7 +12,4 @@ add_subdirectory(leddevice)
 add_subdirectory(utils)
 add_subdirectory(xbmcvideochecker)
 add_subdirectory(effectengine)
-
-if (ENABLE_DISPMANX)
-	add_subdirectory(dispmanx-grabber)
-endif (ENABLE_DISPMANX)
+add_subdirectory(grabber)
diff --git a/libsrc/grabber/CMakeLists.txt b/libsrc/grabber/CMakeLists.txt
@@ -0,0 +1,8 @@
+
+if (ENABLE_DISPMANX)
+	add_subdirectory(dispmanx)
+endif (ENABLE_DISPMANX)
+
+if (ENABLE_V4L2)
+	add_subdirectory(v4l2)
+endif (ENABLE_V4L2)
diff --git a/libsrc/grabber/dispmanx/CMakeLists.txt b/libsrc/grabber/dispmanx/CMakeLists.txt
@@ -4,8 +4,8 @@ find_package(BCM REQUIRED)
 include_directories(${BCM_INCLUDE_DIRS})
 
 # Define the current source locations
-SET(CURRENT_HEADER_DIR ${CMAKE_SOURCE_DIR}/include/dispmanx-grabber)
-SET(CURRENT_SOURCE_DIR ${CMAKE_SOURCE_DIR}/libsrc/dispmanx-grabber)
+SET(CURRENT_HEADER_DIR ${CMAKE_SOURCE_DIR}/include/grabber)
+SET(CURRENT_SOURCE_DIR ${CMAKE_SOURCE_DIR}/libsrc/grabber/dispmanx)
 
 # Group the headers that go through the MOC compiler
 SET(DispmanxGrabberQT_HEADERS
diff --git a/libsrc/grabber/dispmanx/DispmanxFrameGrabber.cpp b/libsrc/grabber/dispmanx/DispmanxFrameGrabber.cpp
diff --git a/libsrc/grabber/dispmanx/DispmanxFrameGrabber.h b/libsrc/grabber/dispmanx/DispmanxFrameGrabber.h
diff --git a/libsrc/grabber/dispmanx/DispmanxWrapper.cpp b/libsrc/grabber/dispmanx/DispmanxWrapper.cpp
@@ -7,8 +7,8 @@
 #include <hyperion/ImageProcessorFactory.h>
 #include <hyperion/ImageProcessor.h>
 
-// Local-dispmanx includes
-#include <dispmanx-grabber/DispmanxWrapper.h>
+// Dispmanx grabber includes
+#include <grabber/DispmanxWrapper.h>
 #include "DispmanxFrameGrabber.h"
 
 
diff --git a/libsrc/grabber/v4l2/CMakeLists.txt b/libsrc/grabber/v4l2/CMakeLists.txt
@@ -0,0 +1,19 @@
+# Define the current source locations
+SET(CURRENT_HEADER_DIR ${CMAKE_SOURCE_DIR}/include/grabber)
+SET(CURRENT_SOURCE_DIR ${CMAKE_SOURCE_DIR}/libsrc/grabber/v4l2)
+
+SET(V4L2_HEADERS
+		${CURRENT_HEADER_DIR}/V4L2Grabber.h
+)
+
+SET(V4L2_SOURCES
+		${CURRENT_SOURCE_DIR}/V4L2Grabber.cpp
+)
+
+add_library(v4l2-grabber
+		${V4L2_HEADERS}
+		${V4L2_SOURCES}
+)
+
+target_link_libraries(v4l2-grabber
+	hyperion-utils)
diff --git a/libsrc/grabber/v4l2/V4L2Grabber.cpp b/libsrc/grabber/v4l2/V4L2Grabber.cpp
@@ -14,7 +14,7 @@
 #include <sys/ioctl.h>
 #include <linux/videodev2.h>
 
-#include "V4L2Grabber.h"
+#include "grabber/V4L2Grabber.h"
 
 #define CLEAR(x) memset(&(x), 0, sizeof(x))
 
diff --git a/src/hyperion-v4l2/CMakeLists.txt b/src/hyperion-v4l2/CMakeLists.txt
@@ -15,15 +15,13 @@ include_directories(
 )
 
 set(Hyperion_V4L2_HEADERS
-	V4L2Grabber.h
 	ProtoConnection.h
 	ImageHandler.h
 	VideoStandardParameter.h
 )
 
 set(Hyperion_V4L2_SOURCES
 	hyperion-v4l2.cpp
-	V4L2Grabber.cpp
 	ProtoConnection.cpp
 	ImageHandler.cpp
 )
@@ -44,6 +42,7 @@ add_executable(hyperion-v4l2
 )
 
 target_link_libraries(hyperion-v4l2
+	v4l2-grabber
 	getoptPlusPlus
 	blackborder
 	hyperion-utils
diff --git a/src/hyperion-v4l2/hyperion-v4l2.cpp b/src/hyperion-v4l2/hyperion-v4l2.cpp
@@ -12,8 +12,10 @@
 // blackborder includes
 #include <blackborder/BlackBorderProcessor.h>
 
+// grabber includes
+#include "grabber/V4L2Grabber.h"
+
 // hyperion-v4l2 includes
-#include "V4L2Grabber.h"
 #include "ProtoConnection.h"
 #include "VideoStandardParameter.h"
 #include "ImageHandler.h"
diff --git a/src/hyperiond/hyperiond.cpp b/src/hyperiond/hyperiond.cpp
@@ -19,7 +19,7 @@
 
 #ifdef ENABLE_DISPMANX
 // Dispmanx grabber includes
-#include <dispmanx-grabber/DispmanxWrapper.h>
+#include <grabber/DispmanxWrapper.h>
 #endif
 
 // XBMC Video checker includes
diff --git a/test/dispmanx2png/dispmanx2png.cpp b/test/dispmanx2png/dispmanx2png.cpp
@@ -10,7 +10,7 @@
 #include <getoptPlusPlus/getoptpp.h>
 
 // Dispmanx grabber includes
-#include <dispmanx-grabber/DispmanxFrameGrabber.h>
+#include <grabber/dispmanx/DispmanxFrameGrabber.h>
 
 using namespace vlofgren;
 
