diff options
| author | Matthias Vogelgesang <matthias.vogelgesang@kit.edu> | 2015-03-31 12:02:11 +0200 |
|---|---|---|
| committer | Matthias Vogelgesang <matthias.vogelgesang@kit.edu> | 2015-03-31 12:02:11 +0200 |
| commit | 1217923dbc0b907410642f611fdb5b13236cf850 (patch) | |
| tree | 351ed1f7305b77a479e87c6f214416a81937aaea /src/uca-camera.h | |
| parent | 67f433437efdfd7fa7a087603f38663574ea9146 (diff) | |
| download | uca-1217923dbc0b907410642f611fdb5b13236cf850.tar.gz uca-1217923dbc0b907410642f611fdb5b13236cf850.tar.bz2 uca-1217923dbc0b907410642f611fdb5b13236cf850.tar.xz uca-1217923dbc0b907410642f611fdb5b13236cf850.zip | |
Switch to trigger source/type semantics
This change makes the naming more consistent but will break client and plugin
code. The main idea is to specify a trigger source (AUTO being a virtual source)
which denotes how causes a trigger and a trigger type which denotes when
triggering happens (edge or level).
Diffstat (limited to 'src/uca-camera.h')
| -rw-r--r-- | src/uca-camera.h | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/uca-camera.h b/src/uca-camera.h index 0b6270c..97d3e6e 100644 --- a/src/uca-camera.h +++ b/src/uca-camera.h @@ -48,10 +48,15 @@ typedef enum { } UcaCameraError; typedef enum { - UCA_CAMERA_TRIGGER_AUTO, - UCA_CAMERA_TRIGGER_SOFTWARE, - UCA_CAMERA_TRIGGER_EXTERNAL -} UcaCameraTrigger; + UCA_CAMERA_TRIGGER_SOURCE_AUTO, + UCA_CAMERA_TRIGGER_SOURCE_SOFTWARE, + UCA_CAMERA_TRIGGER_SOURCE_EXTERNAL +} UcaCameraTriggerSource; + +typedef enum { + UCA_CAMERA_TRIGGER_TYPE_EDGE, + UCA_CAMERA_TRIGGER_TYPE_LEVEL +} UcaCameraTriggerType; typedef enum { UCA_UNIT_NA = 0, @@ -78,7 +83,8 @@ enum { PROP_SENSOR_HORIZONTAL_BINNINGS, PROP_SENSOR_VERTICAL_BINNING, PROP_SENSOR_VERTICAL_BINNINGS, - PROP_TRIGGER_MODE, + PROP_TRIGGER_SOURCE, + PROP_TRIGGER_TYPE, PROP_EXPOSURE_TIME, PROP_FRAMES_PER_SECOND, PROP_ROI_X, |