summaryrefslogtreecommitdiffstats
path: root/src/cameras
diff options
context:
space:
mode:
authorMatthias Vogelgesang <matthias.vogelgesang@ipe.fzk.de>2011-03-21 12:37:12 +0100
committerMatthias Vogelgesang <matthias.vogelgesang@ipe.fzk.de>2011-03-21 12:37:12 +0100
commit195ead4d9aa4f1ed244558d49cee348a5ae6e939 (patch)
treece8cb54595b89b8cc9adb683b453d0e0999454f0 /src/cameras
parentef5dfb7febd8881158e493451a27a2500ced14cb (diff)
downloaduca-195ead4d9aa4f1ed244558d49cee348a5ae6e939.tar.gz
uca-195ead4d9aa4f1ed244558d49cee348a5ae6e939.tar.bz2
uca-195ead4d9aa4f1ed244558d49cee348a5ae6e939.tar.xz
uca-195ead4d9aa4f1ed244558d49cee348a5ae6e939.zip
Fix grabber allocation and callback registration for me4 and pf
Diffstat (limited to 'src/cameras')
-rw-r--r--src/cameras/pf.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/cameras/pf.c b/src/cameras/pf.c
index 5ae35ab..a653b99 100644
--- a/src/cameras/pf.c
+++ b/src/cameras/pf.c
@@ -168,7 +168,7 @@ uint32_t uca_pf_start_recording(struct uca_camera *cam)
uint32_t uca_pf_stop_recording(struct uca_camera *cam)
{
- return UCA_NO_ERROR;
+ return cam->grabber->stop_acquire(cam->grabber);
}
uint32_t uca_pf_grab(struct uca_camera *cam, char *buffer, void *metadata)
@@ -219,6 +219,7 @@ uint32_t uca_pf_init(struct uca_camera **cam, struct uca_grabber *grabber)
uca->start_recording = &uca_pf_start_recording;
uca->stop_recording = &uca_pf_stop_recording;
uca->grab = &uca_pf_grab;
+ uca->register_callback = &uca_pf_register_callback;
/* Prepare frame grabber for recording */
int val = UCA_CL_8BIT_FULL_8;