From 73238ffc40b4abf5e453ee071f2730a6f60c789a Mon Sep 17 00:00:00 2001 From: Matthias Vogelgesang Date: Tue, 7 Jun 2011 15:47:31 +0200 Subject: Fix wrong merge --- src/uca-cam.h | 9 --------- src/uca.h | 9 --------- 2 files changed, 18 deletions(-) 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 9ca21db..b6466b5 100644 --- a/src/uca.h +++ b/src/uca.h @@ -225,15 +225,6 @@ union uca_value { char *string; }; -/** - * 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 */ -}; - /** * Grab callback. -- cgit v1.2.3