diff options
| author | Matthias Vogelgesang <matthias.vogelgesang@gmail.com> | 2012-12-03 17:24:31 +0100 |
|---|---|---|
| committer | Matthias Vogelgesang <matthias.vogelgesang@gmail.com> | 2012-12-03 17:24:31 +0100 |
| commit | 628f7b42fd4bfa417b0a0a19f959a241df459f42 (patch) | |
| tree | 3ffa75968f6d72d62e521a30ed92b980f9ec96f1 | |
| parent | 01aefc6af42c78d3028859770c760fed0057e746 (diff) | |
| download | uca-628f7b42fd4bfa417b0a0a19f959a241df459f42.tar.gz uca-628f7b42fd4bfa417b0a0a19f959a241df459f42.tar.bz2 uca-628f7b42fd4bfa417b0a0a19f959a241df459f42.tar.xz uca-628f7b42fd4bfa417b0a0a19f959a241df459f42.zip | |
Reduce timeout to fix block problems
| -rw-r--r-- | plugins/pco/uca-pco-camera.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/plugins/pco/uca-pco-camera.c b/plugins/pco/uca-pco-camera.c index bb7bd5a..16e333b 100644 --- a/plugins/pco/uca-pco-camera.c +++ b/plugins/pco/uca-pco-camera.c @@ -392,7 +392,7 @@ check_pco_property_error (guint err, guint property_id) } static void -uca_pco_camera_start_recording(UcaCamera *camera, GError **error) +uca_pco_camera_start_recording (UcaCamera *camera, GError **error) { g_return_if_fail(UCA_IS_PCO_CAMERA(camera)); guint err = PCO_NOERROR; @@ -491,11 +491,10 @@ uca_pco_camera_start_recording(UcaCamera *camera, GError **error) } static void -uca_pco_camera_stop_recording(UcaCamera *camera, GError **error) +uca_pco_camera_stop_recording (UcaCamera *camera, GError **error) { g_return_if_fail(UCA_IS_PCO_CAMERA(camera)); UcaPcoCameraPrivate *priv = UCA_PCO_CAMERA_GET_PRIVATE(camera); - guint err = pco_stop_recording(priv->pco); HANDLE_PCO_ERROR(err); @@ -564,7 +563,7 @@ uca_pco_camera_trigger(UcaCamera *camera, GError **error) static void uca_pco_camera_grab(UcaCamera *camera, gpointer *data, GError **error) { - static const gint MAX_TIMEOUT = G_MAXINT; + static const gint MAX_TIMEOUT = 5; g_return_if_fail(UCA_IS_PCO_CAMERA(camera)); UcaPcoCameraPrivate *priv = UCA_PCO_CAMERA_GET_PRIVATE(camera); |