From 146ac46ab25b3510e34b6fdeb680d4810b48a91a Mon Sep 17 00:00:00 2001 From: Matthias Vogelgesang Date: Wed, 23 Mar 2011 14:46:09 +0100 Subject: Share common properties between camera and grabber to let the camera just call grabber->set_property once --- src/uca-grabber.h | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'src/uca-grabber.h') diff --git a/src/uca-grabber.h b/src/uca-grabber.h index 56c10e3..7b3185b 100644 --- a/src/uca-grabber.h +++ b/src/uca-grabber.h @@ -2,6 +2,7 @@ #define __UNIFIED_CAMERA_ACCESS_GRABBER_H #include +#include "uca.h" #include "uca-cam.h" /** @@ -13,15 +14,7 @@ enum uca_grabber_constants { UCA_GRABBER_INVALID = -1, /* properties */ - UCA_GRABBER_WIDTH = 0, - UCA_GRABBER_HEIGHT, - UCA_GRABBER_WIDTH_MAX, - UCA_GRABBER_WIDTH_MIN, - UCA_GRABBER_OFFSET_X, - UCA_GRABBER_OFFSET_Y, - UCA_GRABBER_EXPOSURE, - UCA_GRABBER_TIMEOUT, - UCA_GRABBER_FORMAT, + UCA_GRABBER_FORMAT = UCA_PROP_LAST + 1, UCA_GRABBER_TRIGGER_MODE, UCA_GRABBER_CAMERALINK_TYPE, -- cgit v1.2.3