diff options
| author | Matthias Vogelgesang <matthias.vogelgesang@gmail.com> | 2013-03-20 10:03:52 +0100 |
|---|---|---|
| committer | Matthias Vogelgesang <matthias.vogelgesang@gmail.com> | 2013-03-20 10:03:52 +0100 |
| commit | ff7f3216fe76e0a4598bdf737671a5e25a780ded (patch) | |
| tree | 611970247e33c4af6b1a2a6345bb39b3cb05295e /tools | |
| parent | 71acacfd31e36fcb314d0d75306d26f9518e1d6a (diff) | |
| download | libuca-ff7f3216fe76e0a4598bdf737671a5e25a780ded.tar.gz libuca-ff7f3216fe76e0a4598bdf737671a5e25a780ded.tar.bz2 libuca-ff7f3216fe76e0a4598bdf737671a5e25a780ded.tar.xz libuca-ff7f3216fe76e0a4598bdf737671a5e25a780ded.zip | |
uca_camera_grab takes a gpointer and returns bool
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/benchmark.c | 2 | ||||
| -rw-r--r-- | tools/grab.c | 2 | ||||
| -rw-r--r-- | tools/gui/control.c | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/tools/benchmark.c b/tools/benchmark.c index 170a96c..f262a06 100644 --- a/tools/benchmark.c +++ b/tools/benchmark.c @@ -100,7 +100,7 @@ grab_frames_sync (UcaCamera *camera, gpointer buffer, guint n_frames) uca_camera_start_recording (camera, &error); for (guint i = 0; i < n_frames; i++) { - uca_camera_grab(camera, &buffer, &error); + uca_camera_grab(camera, buffer, &error); if (error != NULL) { g_warning ("Error grabbing frame %02i/%i: `%s'", i, n_frames, error->message); diff --git a/tools/grab.c b/tools/grab.c index b020279..e8e91be 100644 --- a/tools/grab.c +++ b/tools/grab.c @@ -127,7 +127,7 @@ int main(int argc, char *argv[]) while (counter < 5) { g_print(" grab frame ... "); g_timer_start(timer); - uca_camera_grab(camera, &buffer, &error); + uca_camera_grab(camera, buffer, &error); if (error != NULL) { g_print("\nError: %s\n", error->message); diff --git a/tools/gui/control.c b/tools/gui/control.c index 192859c..b17040f 100644 --- a/tools/gui/control.c +++ b/tools/gui/control.c @@ -161,7 +161,7 @@ preview_frames (void *args) gpointer buffer; buffer = ring_buffer_get_current_pointer (data->buffer); - uca_camera_grab (data->camera, &buffer, &error); + uca_camera_grab (data->camera, buffer, &error); if (error == NULL) { convert_grayscale_to_rgb (data, buffer); @@ -191,7 +191,7 @@ record_frames (gpointer args) while (data->state == RECORDING) { buffer = ring_buffer_get_current_pointer (data->buffer); - uca_camera_grab (data->camera, &buffer, NULL); + uca_camera_grab (data->camera, buffer, NULL); if (error == NULL) { ring_buffer_proceed (data->buffer); @@ -345,7 +345,7 @@ download_frames (ThreadData *data) while (error == NULL) { buffer = ring_buffer_get_current_pointer (data->buffer); - uca_camera_grab (data->camera, &buffer, &error); + uca_camera_grab (data->camera, buffer, &error); ring_buffer_proceed (data->buffer); gdk_threads_enter (); gtk_adjustment_set_value (data->download_adjustment, current_frame++); |