diff options
| author | Matthias Vogelgesang <matthias.vogelgesang@kit.edu> | 2015-04-10 17:16:24 +0200 |
|---|---|---|
| committer | Matthias Vogelgesang <matthias.vogelgesang@kit.edu> | 2015-04-10 17:16:24 +0200 |
| commit | 1a6c81766aacba4bebd358f3b24a941cd32c1f94 (patch) | |
| tree | 0568a059ca964ee79dad414eeecb31f94ccab3bc /plugins/ufo | |
| parent | 7bf17ba4d76b07680a19c1a44fe9c0be5b736dd8 (diff) | |
| download | libuca-1a6c81766aacba4bebd358f3b24a941cd32c1f94.tar.gz libuca-1a6c81766aacba4bebd358f3b24a941cd32c1f94.tar.bz2 libuca-1a6c81766aacba4bebd358f3b24a941cd32c1f94.tar.xz libuca-1a6c81766aacba4bebd358f3b24a941cd32c1f94.zip | |
ufo: set timeouts to 0 and infinite appropriately
Infinite prevents premature interruption with external triggers, 0 will not wait
more than necessary to remove stale frames.
Diffstat (limited to 'plugins/ufo')
| -rw-r--r-- | plugins/ufo/uca-ufo-camera.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/plugins/ufo/uca-ufo-camera.c b/plugins/ufo/uca-ufo-camera.c index cc876c7..1de4010 100644 --- a/plugins/ufo/uca-ufo-camera.c +++ b/plugins/ufo/uca-ufo-camera.c @@ -113,7 +113,6 @@ struct _UcaUfoCameraPrivate { GHashTable *property_table; /* maps from prop_id to RegisterInfo* */ GThread *async_thread; pcilib_t *handle; - pcilib_timeout_t timeout; guint n_bits; guint height; enum { @@ -315,8 +314,6 @@ uca_ufo_camera_start_recording (UcaCamera *camera, GError **error) set_control_bit (priv, 14, trigger_source == UCA_CAMERA_TRIGGER_SOURCE_AUTO || trigger_source == UCA_CAMERA_TRIGGER_SOURCE_EXTERNAL); - priv->timeout = ((pcilib_timeout_t) (exposure_time * 1000 + 100.0) * 1000); - if (transfer_async) priv->async_thread = g_thread_create ((GThreadFunc) stream_async, camera, TRUE, error); @@ -355,7 +352,7 @@ uca_ufo_camera_stop_recording (UcaCamera *camera, GError **error) } /* read stale frames ... */ - while (!pcilib_get_next_event (priv->handle, priv->timeout, &event_id, sizeof (pcilib_event_info_t), &event_info)) + while (!pcilib_get_next_event (priv->handle, 0, &event_id, sizeof (pcilib_event_info_t), &event_info)) ; err = pcilib_stop (priv->handle, PCILIB_EVENT_FLAGS_DEFAULT); @@ -385,7 +382,7 @@ uca_ufo_camera_grab(UcaCamera *camera, gpointer data, GError **error) const gsize size = SENSOR_WIDTH * priv->height * sizeof(guint16); - err = pcilib_get_next_event (priv->handle, priv->timeout, &event_id, sizeof(pcilib_event_info_t), &event_info); + err = pcilib_get_next_event (priv->handle, PCILIB_TIMEOUT_INFINITE, &event_id, sizeof(pcilib_event_info_t), &event_info); PCILIB_SET_ERROR_RETURN_FALSE (err, UCA_UFO_CAMERA_ERROR_NEXT_EVENT); gpointer src = pcilib_get_data (priv->handle, event_id, PCILIB_EVENT_DATA, (size_t *) &err); |