From 67f9f44a2b42314617368705805e8e3c6c00256e Mon Sep 17 00:00:00 2001 From: Matthias Vogelgesang Date: Mon, 5 Mar 2012 18:12:15 +0100 Subject: Build mock camera by default and fix warning --- src/CMakeLists.txt | 2 +- src/uca-camera.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6b413dd..b825b1a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -33,7 +33,7 @@ set(uca_LIBS ${GOBJECT2_LIBRARIES}) # --- Build options ----------------------------------------------------------- -option(HAVE_MOCK_CAMERA "Camera: Dummy" OFF) +option(HAVE_MOCK_CAMERA "Camera: Dummy" ON) # --- Add sources if camera/framegrabber access sources are available --------- diff --git a/src/uca-camera.h b/src/uca-camera.h index 44770f1..a540d16 100644 --- a/src/uca-camera.h +++ b/src/uca-camera.h @@ -28,6 +28,8 @@ #define UCA_CAMERA_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), UCA_TYPE_CAMERA, UcaCameraClass)) #define UCA_CAMERA_ERROR uca_camera_error_quark() +GQuark uca_camera_error_quark(void); + typedef enum { UCA_CAMERA_ERROR_NOT_FOUND, UCA_CAMERA_ERROR_RECORDING, -- cgit v1.2.3