summaryrefslogtreecommitdiffstats
path: root/src/uca.h
diff options
context:
space:
mode:
authorMatthias Vogelgesang <matthias.vogelgesang@kit.edu>2011-06-07 15:47:31 +0200
committerMatthias Vogelgesang <matthias.vogelgesang@kit.edu>2011-06-07 15:47:31 +0200
commit73238ffc40b4abf5e453ee071f2730a6f60c789a (patch)
treedde4cb4f081520cbe972f052ef12995029e6bb20 /src/uca.h
parentbf83e234755ea390c92f05c4b701cf8ee57c2526 (diff)
downloaduca-73238ffc40b4abf5e453ee071f2730a6f60c789a.tar.gz
uca-73238ffc40b4abf5e453ee071f2730a6f60c789a.tar.bz2
uca-73238ffc40b4abf5e453ee071f2730a6f60c789a.tar.xz
uca-73238ffc40b4abf5e453ee071f2730a6f60c789a.zip
Fix wrong merge
Diffstat (limited to 'src/uca.h')
-rw-r--r--src/uca.h9
1 files changed, 0 insertions, 9 deletions
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.