diff options
| author | Matthias Vogelgesang <matthias.vogelgesang@kit.edu> | 2015-03-27 15:23:36 +0100 |
|---|---|---|
| committer | Matthias Vogelgesang <matthias.vogelgesang@kit.edu> | 2015-03-27 15:23:36 +0100 |
| commit | 648f44b3c7cf7e752c913cedde536ecad6cf2091 (patch) | |
| tree | e69202a9c64bfe4a18074e590063d49756d82631 | |
| parent | 378770200967f6e5b10152c9b094b835b4216c92 (diff) | |
| download | uca-648f44b3c7cf7e752c913cedde536ecad6cf2091.tar.gz uca-648f44b3c7cf7e752c913cedde536ecad6cf2091.tar.bz2 uca-648f44b3c7cf7e752c913cedde536ecad6cf2091.tar.xz uca-648f44b3c7cf7e752c913cedde536ecad6cf2091.zip | |
ufo: Unconditionally set the streaming bit
That way we will reset the bit on first run if trigger mode is not AUTO.
| -rw-r--r-- | plugins/ufo/uca-ufo-camera.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/plugins/ufo/uca-ufo-camera.c b/plugins/ufo/uca-ufo-camera.c index e92e184..da47a96 100644 --- a/plugins/ufo/uca-ufo-camera.c +++ b/plugins/ufo/uca-ufo-camera.c @@ -342,9 +342,7 @@ uca_ufo_camera_start_recording(UcaCamera *camera, GError **error) err = pcilib_start(priv->handle, PCILIB_EVENT_DATA, PCILIB_EVENT_FLAGS_DEFAULT); PCILIB_SET_ERROR(err, UCA_UFO_CAMERA_ERROR_START_RECORDING); - - if (trigger == UCA_CAMERA_TRIGGER_AUTO) - set_streaming (priv, TRUE); + set_streaming (priv, trigger == UCA_CAMERA_TRIGGER_AUTO); priv->timeout = (pcilib_timeout_t) (total_readout_time (UCA_UFO_CAMERA (camera)) * 1000 * 1000); @@ -372,9 +370,7 @@ uca_ufo_camera_stop_recording(UcaCamera *camera, GError **error) int err = pcilib_stop (priv->handle, PCILIB_EVENT_FLAGS_DEFAULT); PCILIB_SET_ERROR(err, UCA_UFO_CAMERA_ERROR_STOP_RECORDING); - - if (trigger == UCA_CAMERA_TRIGGER_AUTO) - set_streaming (priv, FALSE); + set_streaming (priv, trigger != UCA_CAMERA_TRIGGER_AUTO); } static void |