Synchronize shutter

2 files changed, 22 insertions, 16 deletions

diff --git a/aplay.py b/aplay.py
index 596d880..c9aa811 100644
--- a/aplay.py
+++ b/aplay.py
@@ -17,23 +17,31 @@ import gst
 import logging
 logger = logging.getLogger('record:aplay.py')
 
-def play(file):
+def play(file, done_cb=None):
     player.set_state(gst.STATE_NULL)
-    player.props.uri = 'file://' + file
-    player.set_state(gst.STATE_PLAYING)
 
-def _gstmessage_cb(bus, message):
-    if message.type == gst.MESSAGE_EOS:
+    def eos_cb(bus, message):
+        bus.disconnect_by_func(eos_cb)
         player.set_state(gst.STATE_NULL)
-    elif message.type == gst.MESSAGE_ERROR:
+        if done_cb is not None:
+            done_cb()
+
+    def error_cb(bus, message):
         err, debug = message.parse_error()
         logger.error('play_pipe: %s %s' % (err, debug))
         player.set_state(gst.STATE_NULL)
+        if done_cb is not None:
+            done_cb()
+
+    bus = player.get_bus()
+    bus.connect('message::eos', eos_cb)
+    bus.connect('message::error', error_cb)
+
+    player.props.uri = 'file://' + file
+    player.set_state(gst.STATE_PLAYING)
+
 
 player = gst.element_factory_make('playbin')
 fakesink = gst.element_factory_make('fakesink')
 player.set_property("video-sink", fakesink)
-
-bus = player.get_bus()
-bus.add_signal_watch()
-bus.connect('message', _gstmessage_cb)
+player.get_bus().add_signal_watch()
diff --git a/ui.py b/ui.py
index 6ab9373..215cc58 100644
--- a/ui.py
+++ b/ui.py
@@ -1345,13 +1345,11 @@ class UI:
 
 
     def clickShutter( self ):
-        if (not self.ca.m.RECORDING):
-            aplay.play(Constants.soundClick)
-
-        wasRec = self.ca.m.RECORDING
-        self.ca.m.doShutter()
-        if (wasRec):
+        if self.ca.m.RECORDING:
+            self.ca.m.doShutter()
             aplay.play(Constants.soundClick)
+        else:
+            aplay.play(Constants.soundClick, self.ca.m.doShutter)
 
 
     def updateVideoComponents( self ):