From 983005dfbc3b07093145c0b964063e334b928d48 Mon Sep 17 00:00:00 2001
From: Matthias Vogelgesang <matthias.vogelgesang@kit.edu>
Date: Thu, 18 Oct 2012 12:44:40 +0200
Subject: Fix download of in-camera frames

---
 src/uca-camera.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
 src/uca-camera.h |  3 +++
 2 files changed, 47 insertions(+)

(limited to 'src')

diff --git a/src/uca-camera.c b/src/uca-camera.c
index 9210a05..053dcca 100644
--- a/src/uca-camera.c
+++ b/src/uca-camera.c
@@ -542,6 +542,50 @@ uca_camera_start_readout (UcaCamera *camera, GError **error)
     g_static_mutex_unlock (&mutex);
 }
 
+/**
+ * uca_camera_stop_readout:
+ * @camera: A #UcaCamera object
+ * @error: Location to store a #UcaCameraError error or %NULL
+ *
+ * Stop reading out frames.
+ *
+ * Since: 1.1
+ */
+void
+uca_camera_stop_readout (UcaCamera *camera, GError **error)
+{
+    UcaCameraClass *klass;
+    static GStaticMutex mutex = G_STATIC_MUTEX_INIT;
+
+    g_return_if_fail (UCA_IS_CAMERA(camera));
+
+    klass = UCA_CAMERA_GET_CLASS(camera);
+
+    g_return_if_fail (klass != NULL);
+    g_return_if_fail (klass->start_readout != NULL);
+
+    g_static_mutex_lock (&mutex);
+
+    if (camera->priv->is_recording) {
+        g_set_error (error, UCA_CAMERA_ERROR, UCA_CAMERA_ERROR_RECORDING,
+                     "Camera is still recording");
+    }
+    else {
+        GError *tmp_error = NULL;
+
+        (*klass->stop_readout) (camera, &tmp_error);
+
+        if (tmp_error == NULL) {
+            camera->priv->is_readout = FALSE;
+            g_object_notify (G_OBJECT (camera), "is-readout");
+        }
+        else
+            g_propagate_error (error, tmp_error);
+    }
+
+    g_static_mutex_unlock (&mutex);
+}
+
 /**
  * uca_camera_set_grab_func:
  * @camera: A #UcaCamera object
diff --git a/src/uca-camera.h b/src/uca-camera.h
index ef3bf14..78edd95 100644
--- a/src/uca-camera.h
+++ b/src/uca-camera.h
@@ -126,6 +126,7 @@ struct _UcaCameraClass {
     void (*start_recording) (UcaCamera *camera, GError **error);
     void (*stop_recording)  (UcaCamera *camera, GError **error);
     void (*start_readout)   (UcaCamera *camera, GError **error);
+    void (*stop_readout)    (UcaCamera *camera, GError **error);
     void (*trigger)         (UcaCamera *camera, GError **error);
     void (*grab)            (UcaCamera *camera, gpointer *data, GError **error);
 
@@ -141,6 +142,8 @@ void        uca_camera_stop_recording   (UcaCamera          *camera,
                                          GError            **error);
 void        uca_camera_start_readout    (UcaCamera          *camera,
                                          GError            **error);
+void        uca_camera_stop_readout     (UcaCamera          *camera,
+                                         GError            **error);
 void        uca_camera_trigger          (UcaCamera          *camera,
                                          GError            **error);
 void        uca_camera_grab             (UcaCamera          *camera,
-- 
cgit v1.2.3