From bbc279b61484fb073a6d0ab6cc368f26ded5f4d3 Mon Sep 17 00:00:00 2001
From: Matthias Vogelgesang <matthias.vogelgesang@kit.edu>
Date: Fri, 27 May 2011 15:04:07 +0200
Subject: Move cam_state to main include file

---
 src/CMakeLists.txt |  2 +-
 src/uca-cam.h      |  9 ---------
 src/uca.h          | 10 ++++++++++
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a3e9329..1a22c1e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -131,7 +131,7 @@ set(VERSION     ${UCA_VERSION_STRING})
 
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/uca.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/uca.pc" @ONLY IMMEDIATE)
 
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/uca.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/uca.pc DESTINATION lib/pkgconfig)
 
 
 set(CPACK_PACKAGE_DESCRIPTION "Unified Camera Access library")
diff --git a/src/uca-cam.h b/src/uca-cam.h
index a194054..8b6fc0d 100644
--- a/src/uca-cam.h
+++ b/src/uca-cam.h
@@ -19,15 +19,6 @@ extern "C" {
 
 enum uca_property_ids;
 
-/**
- * Describes the current state of the camera.
- */
-enum uca_cam_state {
-    UCA_CAM_CONFIGURABLE,   /**< Camera can be configured and is not recording */
-    UCA_CAM_ARMED,          /**< Camera is ready for recording */
-    UCA_CAM_RECORDING,      /**< Camera is currently recording */
-};
-
 /*
  * --- non-virtual methods ----------------------------------------------------
  */
diff --git a/src/uca.h b/src/uca.h
index 4cd5991..bcab72f 100644
--- a/src/uca.h
+++ b/src/uca.h
@@ -186,6 +186,16 @@ enum uca_access_rights {
     uca_readwrite = 0x01 | 0x02     /**< property can be read and written */
 };
 
+/**
+ * Describes the current state of the camera.
+ */
+enum uca_cam_state {
+    UCA_CAM_CONFIGURABLE,   /**< Camera can be configured and is not recording */
+    UCA_CAM_ARMED,          /**< Camera is ready for recording */
+    UCA_CAM_RECORDING,      /**< Camera is currently recording */
+};
+
+
 /**
  * A uca_property_t describes a vendor-independent property used by cameras and
  * frame grabbers. It basically consists of a human-readable name, a physical
-- 
cgit v1.2.3