diff options
| author | Matthias Vogelgesang <matthias.vogelgesang@kit.edu> | 2012-03-05 18:12:15 +0100 |
|---|---|---|
| committer | Matthias Vogelgesang <matthias.vogelgesang@kit.edu> | 2012-03-05 18:12:15 +0100 |
| commit | 67f9f44a2b42314617368705805e8e3c6c00256e (patch) | |
| tree | 599f1b0e31eb7dec26d41e2165af5265fa245a3d | |
| parent | ce4475a53441f6f9a79db85fd4bfe82cba046f23 (diff) | |
| download | uca-67f9f44a2b42314617368705805e8e3c6c00256e.tar.gz uca-67f9f44a2b42314617368705805e8e3c6c00256e.tar.bz2 uca-67f9f44a2b42314617368705805e8e3c6c00256e.tar.xz uca-67f9f44a2b42314617368705805e8e3c6c00256e.zip | |
Build mock camera by default and fix warning
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/uca-camera.h | 2 |
2 files changed, 3 insertions, 1 deletions
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, |