summaryrefslogtreecommitdiffstats
path: root/src/uca.h
diff options
context:
space:
mode:
authorMatthias Vogelgesang <matthias.vogelgesang@ipe.fzk.de>2011-03-07 17:28:07 +0100
committerMatthias Vogelgesang <matthias.vogelgesang@ipe.fzk.de>2011-03-07 17:28:07 +0100
commit923dab046564bdfcd7267281b99462f6d866d311 (patch)
tree84ae5326b05d0ca069aafc7ebc231e24d9a19a4a /src/uca.h
parent1b9734e1c19a7d3149013005502349eb2b9cd402 (diff)
downloaduca-923dab046564bdfcd7267281b99462f6d866d311.tar.gz
uca-923dab046564bdfcd7267281b99462f6d866d311.tar.bz2
uca-923dab046564bdfcd7267281b99462f6d866d311.tar.xz
uca-923dab046564bdfcd7267281b99462f6d866d311.zip
Add property listing
Diffstat (limited to 'src/uca.h')
-rw-r--r--src/uca.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/uca.h b/src/uca.h
index 9c17b86..5fa8c39 100644
--- a/src/uca.h
+++ b/src/uca.h
@@ -93,6 +93,7 @@ enum uca_property_ids {
#define UCA_CORRECT_HOTPIXEL 0x02
#define UCA_CORRECT_GAIN 0x04
+
/**
* \brief Describe a property used by cameras and frame grabbers
*/
@@ -100,13 +101,14 @@ struct uca_property_t {
const char *name;
enum uca_unit {
- uca_pixel,
+ uca_pixel = 0,
uca_bits,
uca_ns,
uca_us,
uca_ms,
uca_s,
uca_rows,
+ uca_fps,
uca_na
} unit;
@@ -117,10 +119,12 @@ struct uca_property_t {
} type;
};
+extern const char *uca_unit_map[]; /**< maps unit numbers to corresponding strings */
+
enum uca_errors {
UCA_NO_ERROR = 0,
UCA_ERR_GRABBER_NOT_FOUND,
- UCA_ERR_CAM_NOT_FOUND, /**< camera probing or initialization failed */
+ UCA_ERR_CAM_NOT_FOUND, /**< camera probing or initialization failed */
UCA_ERR_PROP_INVALID, /**< the requested property is not supported by the camera */
UCA_ERR_PROP_GENERAL, /**< error occured reading/writing the property */
UCA_ERR_PROP_VALUE_OUT_OF_RANGE, /**< error occured writing the property */