From 648f44b3c7cf7e752c913cedde536ecad6cf2091 Mon Sep 17 00:00:00 2001 From: Matthias Vogelgesang Date: Fri, 27 Mar 2015 15:23:36 +0100 Subject: ufo: Unconditionally set the streaming bit That way we will reset the bit on first run if trigger mode is not AUTO. --- plugins/ufo/uca-ufo-camera.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'plugins') 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 -- cgit v1.2.3