diff options
| author | Matthias Vogelgesang <matthias.vogelgesang@kit.edu> | 2011-06-07 15:47:31 +0200 |
|---|---|---|
| committer | Matthias Vogelgesang <matthias.vogelgesang@kit.edu> | 2011-06-07 15:47:31 +0200 |
| commit | 73238ffc40b4abf5e453ee071f2730a6f60c789a (patch) | |
| tree | dde4cb4f081520cbe972f052ef12995029e6bb20 /src/uca-cam.h | |
| parent | bf83e234755ea390c92f05c4b701cf8ee57c2526 (diff) | |
| download | uca-73238ffc40b4abf5e453ee071f2730a6f60c789a.tar.gz uca-73238ffc40b4abf5e453ee071f2730a6f60c789a.tar.bz2 uca-73238ffc40b4abf5e453ee071f2730a6f60c789a.tar.xz uca-73238ffc40b4abf5e453ee071f2730a6f60c789a.zip | |
Fix wrong merge
Diffstat (limited to 'src/uca-cam.h')
| -rw-r--r-- | src/uca-cam.h | 9 |
1 files changed, 0 insertions, 9 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 ---------------------------------------------------- */ |