diff options
| author | Suren A. Chilingaryan <csa@suren.me> | 2017-08-24 16:00:47 +0200 |
|---|---|---|
| committer | Suren A. Chilingaryan <csa@suren.me> | 2017-08-24 16:00:47 +0200 |
| commit | fda61833ea8a8e6f1b10b66e0bb27614ef0eb750 (patch) | |
| tree | 0ac1aa37bb60e885cb275257f4805ba85fde0172 /uca-ufo-camera.c | |
| parent | 71e1f2db8b87763c06211d85119a921b11095a9d (diff) | |
| parent | 0cc0ea331abc3f906606389b194166180d5ba548 (diff) | |
| download | uca-ufo-fda61833ea8a8e6f1b10b66e0bb27614ef0eb750.tar.gz uca-ufo-fda61833ea8a8e6f1b10b66e0bb27614ef0eb750.tar.bz2 uca-ufo-fda61833ea8a8e6f1b10b66e0bb27614ef0eb750.tar.xz uca-ufo-fda61833ea8a8e6f1b10b66e0bb27614ef0eb750.zip | |
Merge branch 'master' of https://github.com/ufo-kit/uca-ufo
Diffstat (limited to 'uca-ufo-camera.c')
| -rw-r--r-- | uca-ufo-camera.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/uca-ufo-camera.c b/uca-ufo-camera.c index 7470418..94d1d3c 100644 --- a/uca-ufo-camera.c +++ b/uca-ufo-camera.c @@ -206,9 +206,6 @@ update_properties (UcaUfoCameraPrivate *priv) case PCILIB_REGISTER_RW1I: flags = G_PARAM_READWRITE; break; - case PCILIB_REGISTER_INCONSISTENT: - g_warning ("%s is an inconsistent register, don't know how to handle that", reg->name); - break; } value = read_register_value (priv->handle, reg->name); @@ -369,9 +366,9 @@ uca_ufo_camera_stop_recording (UcaCamera *camera, GError **error) set_control_bit (priv, 11, FALSE); /* disable streaming */ if (priv->async_thread) { - err = pcilib_stop(priv->handle, PCILIB_EVENT_FLAG_STOP_ONLY); - PCILIB_SET_ERROR(err, UCA_UFO_CAMERA_ERROR_STOP_RECORDING); - g_thread_join(priv->async_thread); + err = pcilib_stop (priv->handle, PCILIB_EVENT_FLAG_STOP_ONLY); + PCILIB_SET_ERROR (err, UCA_UFO_CAMERA_ERROR_STOP_RECORDING); + g_thread_join (priv->async_thread); priv->async_thread = NULL; } @@ -380,7 +377,7 @@ uca_ufo_camera_stop_recording (UcaCamera *camera, GError **error) ; err = pcilib_stop (priv->handle, PCILIB_EVENT_FLAGS_DEFAULT); - PCILIB_SET_ERROR(err, UCA_UFO_CAMERA_ERROR_STOP_RECORDING); + PCILIB_SET_ERROR (err, UCA_UFO_CAMERA_ERROR_STOP_RECORDING); } static void |