diff options
author | Matthias Vogelgesang <matthias.vogelgesang@kit.edu> | 2011-03-24 09:55:33 +0100 |
---|---|---|
committer | Matthias Vogelgesang <matthias.vogelgesang@kit.edu> | 2011-03-24 09:55:33 +0100 |
commit | 0e684b35d4707042bba028ce47b53d0336f662e0 (patch) | |
tree | a542c0b60b5de7b4b5ff6cf1f246183e30435208 /src/cameras | |
parent | 146ac46ab25b3510e34b6fdeb680d4810b48a91a (diff) | |
download | libuca-0e684b35d4707042bba028ce47b53d0336f662e0.tar.gz libuca-0e684b35d4707042bba028ce47b53d0336f662e0.tar.bz2 libuca-0e684b35d4707042bba028ce47b53d0336f662e0.tar.xz libuca-0e684b35d4707042bba028ce47b53d0336f662e0.zip |
Expose synchronicity property, add boolean unit and document the error code
format
Diffstat (limited to 'src/cameras')
-rw-r--r-- | src/cameras/pco.c | 2 | ||||
-rw-r--r-- | src/cameras/pf.c | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/cameras/pco.c b/src/cameras/pco.c index 4acbf17..bd8714c 100644 --- a/src/cameras/pco.c +++ b/src/cameras/pco.c @@ -252,7 +252,7 @@ uint32_t uca_pco_init(struct uca_camera **cam, struct uca_grabber *grabber) struct uca_camera *uca = uca_cam_new(); uca->user = pco; uca->grabber = grabber; - uca->grabber->asynchronous = true; + uca->grabber->synchronous = false; /* Camera found, set function pointers... */ uca->destroy = &uca_pco_destroy; diff --git a/src/cameras/pf.c b/src/cameras/pf.c index 5c35b70..86fe5e6 100644 --- a/src/cameras/pf.c +++ b/src/cameras/pf.c @@ -57,7 +57,10 @@ static uint32_t uca_pf_set_property(struct uca_camera *cam, enum uca_property_id int err = UCA_NO_ERROR; /* We try to set the property on the grabber. If it returns "invalid", we - * also try it via the PF SDK. Else, there was a more serious error. */ + * also try it via the PF SDK. Else, there was a more serious error. + * + * FIXME: This is actually not that good for cases where only the grabber + * should set a certain property and the camera itself is not able to do so. */ err = grabber->set_property(grabber, property, data); if (((err & UCA_ERR_MASK_CODE) == UCA_ERR_INVALID) || (err == UCA_NO_ERROR)) err = UCA_ERR_CAMERA | UCA_ERR_PROP; @@ -208,7 +211,7 @@ uint32_t uca_pf_init(struct uca_camera **cam, struct uca_grabber *grabber) struct uca_camera *uca = uca_cam_new(); uca->grabber = grabber; - uca->grabber->asynchronous = true; + uca->grabber->synchronous = false; /* Camera found, set function pointers... */ uca->destroy = &uca_pf_destroy; |