diff options
| author | Matthias Vogelgesang <matthias.vogelgesang@ipe.fzk.de> | 2011-03-18 10:42:11 +0100 |
|---|---|---|
| committer | Matthias Vogelgesang <matthias.vogelgesang@ipe.fzk.de> | 2011-03-18 10:42:11 +0100 |
| commit | a95fb6dad12ef73b05e79198763465f418090e99 (patch) | |
| tree | 08cc1f9d142c1352570958518dfb874aa1e841c7 /test | |
| parent | 384d9c7e478ed9b6b64b050a4251475519fc9580 (diff) | |
| download | uca-a95fb6dad12ef73b05e79198763465f418090e99.tar.gz uca-a95fb6dad12ef73b05e79198763465f418090e99.tar.bz2 uca-a95fb6dad12ef73b05e79198763465f418090e99.tar.xz uca-a95fb6dad12ef73b05e79198763465f418090e99.zip | |
Add (possible) meta data transmission and integrate callback in pco and pf
Diffstat (limited to 'test')
| -rw-r--r-- | test/control.c | 2 | ||||
| -rw-r--r-- | test/grab-async.c | 2 | ||||
| -rw-r--r-- | test/grab.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/test/control.c b/test/control.c index c220e21..dcb8c8e 100644 --- a/test/control.c +++ b/test/control.c @@ -96,7 +96,7 @@ void *grab_thread(void *args) struct uca_camera *cam = data->cam; while (data->running) { - cam->grab(cam, (char *) data->buffer); + cam->grab(cam, (char *) data->buffer, NULL); if (data->pixel_size == 1) convert_8bit_to_rgb(data->pixels, data->buffer, data->width, data->height); else if (data->pixel_size == 2) diff --git a/test/grab-async.c b/test/grab-async.c index ba3ae85..1e0a90b 100644 --- a/test/grab-async.c +++ b/test/grab-async.c @@ -5,7 +5,7 @@ #include "uca.h" #include "uca-cam.h" -void grab_callback(uint32_t image_number, void *buffer, void *user) +void grab_callback(uint32_t image_number, void *buffer, void *meta_data, void *user) { printf("got picture number %i\n", image_number); } diff --git a/test/grab.c b/test/grab.c index 446a117..3e429ed 100644 --- a/test/grab.c +++ b/test/grab.c @@ -31,7 +31,7 @@ int main(int argc, char *argv[]) uint16_t *buffer = (uint16_t *) malloc(width * height * pixel_size); cam->start_recording(cam); - cam->grab(cam, (char *) buffer); + cam->grab(cam, (char *) buffer, NULL); cam->stop_recording(cam); uca_destroy(u); |