summaryrefslogtreecommitdiffstats
path: root/tools/gui
diff options
context:
space:
mode:
authorMatthias Vogelgesang <matthias.vogelgesang@gmail.com>2013-03-20 10:03:52 +0100
committerMatthias Vogelgesang <matthias.vogelgesang@gmail.com>2013-03-20 10:03:52 +0100
commitff7f3216fe76e0a4598bdf737671a5e25a780ded (patch)
tree611970247e33c4af6b1a2a6345bb39b3cb05295e /tools/gui
parent71acacfd31e36fcb314d0d75306d26f9518e1d6a (diff)
downloaduca-ff7f3216fe76e0a4598bdf737671a5e25a780ded.tar.gz
uca-ff7f3216fe76e0a4598bdf737671a5e25a780ded.tar.bz2
uca-ff7f3216fe76e0a4598bdf737671a5e25a780ded.tar.xz
uca-ff7f3216fe76e0a4598bdf737671a5e25a780ded.zip
uca_camera_grab takes a gpointer and returns bool
Diffstat (limited to 'tools/gui')
-rw-r--r--tools/gui/control.c6
1 files changed, 3 insertions, 3 deletions
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++);