summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMatthias Vogelgesang <matthias.vogelgesang@kit.edu>2011-05-12 14:55:14 +0200
committerMatthias Vogelgesang <matthias.vogelgesang@kit.edu>2011-05-12 14:55:14 +0200
commit50d25aa6d552e41509ad1be75e3d222abd49c900 (patch)
treed19a5d8c9c8d3bae47ea99365e870c34db4b6a7f /src
parentb0a0f5c0aabb534bbd00267dcc70a44927d7b707 (diff)
downloadlibuca-50d25aa6d552e41509ad1be75e3d222abd49c900.tar.gz
libuca-50d25aa6d552e41509ad1be75e3d222abd49c900.tar.bz2
libuca-50d25aa6d552e41509ad1be75e3d222abd49c900.tar.xz
libuca-50d25aa6d552e41509ad1be75e3d222abd49c900.zip
Add binning and "fix" that damn 64-bit format thing in grab-async.c
Diffstat (limited to 'src')
-rw-r--r--src/uca.c2
-rw-r--r--src/uca.h2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/uca.c b/src/uca.c
index 18f2786..94aeca0 100644
--- a/src/uca.c
+++ b/src/uca.c
@@ -58,6 +58,8 @@ static struct uca_property property_map[UCA_PROP_LAST+1] = {
{ "Image.Offset.y", uca_pixel, uca_uint32t, uca_readwrite },
{ "Image.Offset.y.Min", uca_pixel, uca_uint32t, uca_read },
{ "Image.Offset.y.Max", uca_pixel, uca_uint32t, uca_read },
+ { "Image.Binning.x", uca_pixel, uca_uint32t, uca_readwrite },
+ { "Image.Binning.y", uca_pixel, uca_uint32t, uca_readwrite },
{ "Image.Bitdepth", uca_bits, uca_uint32t, uca_read},
{ "Time.Exposure", uca_us, uca_uint32t, uca_readwrite },
{ "Time.Exposure.Min", uca_us, uca_uint32t, uca_read },
diff --git a/src/uca.h b/src/uca.h
index 3f98898..4cd5991 100644
--- a/src/uca.h
+++ b/src/uca.h
@@ -81,6 +81,8 @@ enum uca_property_ids {
UCA_PROP_Y_OFFSET,
UCA_PROP_Y_OFFSET_MIN,
UCA_PROP_Y_OFFSET_MAX,
+ UCA_PROP_BINNING_X,
+ UCA_PROP_BINNING_Y,
UCA_PROP_BITDEPTH,
UCA_PROP_EXPOSURE,
UCA_PROP_EXPOSURE_MIN,