summaryrefslogtreecommitdiffstats
path: root/src/grabbers
diff options
context:
space:
mode:
authorMatthias Vogelgesang <matthias.vogelgesang@kit.edu>2011-10-21 11:25:46 +0200
committerMatthias Vogelgesang <matthias.vogelgesang@kit.edu>2011-10-21 11:25:46 +0200
commitccaf5dfc7727ea32920527a7622509b9724ae42f (patch)
tree0a94f7a4a77b75fb83582de11005ab41221eea6c /src/grabbers
parent7e1ec3056d1fdb6786c452ba6ed7e978355a98c2 (diff)
downloaduca-ccaf5dfc7727ea32920527a7622509b9724ae42f.tar.gz
uca-ccaf5dfc7727ea32920527a7622509b9724ae42f.tar.bz2
uca-ccaf5dfc7727ea32920527a7622509b9724ae42f.tar.xz
uca-ccaf5dfc7727ea32920527a7622509b9724ae42f.zip
Add: readout state
Diffstat (limited to 'src/grabbers')
-rw-r--r--src/grabbers/me4.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/grabbers/me4.c b/src/grabbers/me4.c
index 48d0756..a157206 100644
--- a/src/grabbers/me4.c
+++ b/src/grabbers/me4.c
@@ -215,8 +215,10 @@ static uint32_t uca_me4_grab(struct uca_grabber_priv *grabber, void **buffer, ui
else
last_frame = Fg_getLastPicNumberEx(me4->fg, PORT_A, me4->mem);
- if (last_frame <= 0)
+ if (last_frame <= 0) {
+ *buffer = NULL;
return UCA_ERR_GRABBER | UCA_ERR_FRAME_TRANSFER;
+ }
*frame_number = (uint64_t) last_frame;
*buffer = Fg_getImagePtrEx(me4->fg, last_frame, PORT_A, me4->mem);
@@ -274,6 +276,7 @@ uint32_t uca_me4_init(struct uca_grabber_priv **grabber)
Fg_getParameter(fg, FG_TIMEOUT, &me4->timeout, PORT_A);
+ me4->timeout = 1;
uca->user = me4;
uca->destroy = &uca_me4_destroy;
uca->set_property = &uca_me4_set_property;