summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Vogelgesang <matthias.vogelgesang@kit.edu>2017-01-13 12:05:29 +0100
committerMatthias Vogelgesang <matthias.vogelgesang@kit.edu>2017-01-13 12:05:29 +0100
commit908c0b3f9c1e8265cc4f12157c2d63de1fa1193f (patch)
treed13fa79ae1b6285e02dfbcf360e09dc6c549e73d
parent98ab1c3f5254d6ad9e5cbfc90c8406ddcf05e278 (diff)
downloaduca-908c0b3f9c1e8265cc4f12157c2d63de1fa1193f.tar.gz
uca-908c0b3f9c1e8265cc4f12157c2d63de1fa1193f.tar.bz2
uca-908c0b3f9c1e8265cc4f12157c2d63de1fa1193f.tar.xz
uca-908c0b3f9c1e8265cc4f12157c2d63de1fa1193f.zip
Fix #80: trigger must not block on the access_lock
This defeats the purpose of software triggers which in most cases have to happen in a thread different from the one grabbing actual frames.
-rw-r--r--src/uca-camera.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/uca-camera.c b/src/uca-camera.c
index 1c88cea..7987632 100644
--- a/src/uca-camera.c
+++ b/src/uca-camera.c
@@ -989,9 +989,7 @@ uca_camera_trigger (UcaCamera *camera, GError **error)
if (!camera->priv->is_recording)
g_set_error (error, UCA_CAMERA_ERROR, UCA_CAMERA_ERROR_NOT_RECORDING, "Camera is not recording");
else {
- g_static_mutex_lock (&access_lock);
(*klass->trigger) (camera, error);
- g_static_mutex_unlock (&access_lock);
}
g_static_mutex_unlock (&mutex);