gst-trick-mode.py: fix seeking with a negative rate

[experiments/gstreamer.git] / python / gst-trick-mode.py

diff --git a/python/gst-trick-mode.py b/python/gst-trick-mode.py
index 45e7af2..cc0e7a6 100755 (executable)
--- a/python/gst-trick-mode.py
+++ b/python/gst-trick-mode.py
@@ -25,12 +25,26 @@ class Player:
 
         bus = self._player.get_bus()
         bus.add_signal_watch()
+        bus.connect('message::eos', self.on_eos)
+        bus.connect('message::error', self.on_error)
         bus.connect('message::state-changed', self.on_state_changed)
 
     def run(self):
         self._player.set_state(Gst.State.PLAYING)
-        loop = GObject.MainLoop()
-        loop.run()
+        self.loop = GObject.MainLoop()
+        self.loop.run()
+
+    def quit(self):
+        self._player.set_state(Gst.State.NULL)
+        self.loop.quit()
+
+    def on_eos(self, bus, msg):
+        self.quit()
+
+    def on_error(self, bus, msg):
+        (err, debug) = msg.parse_error()
+        print "Error: %s" % err, debug
+        self.quit()
 
     def on_state_changed(self, bus, msg):
         if msg.src != self._player:
@@ -44,24 +58,14 @@ class Player:
 
     def set_rate(self, rate):
         self._rate = rate
-        try:
-            position, fmt = self._player.query_position(Gst.Format.TIME)
-        except:
-            position = 0
+        position = self._player.query_position(Gst.Format.TIME)[1]
 
         # Create the seek event
-        if rate > 0:
-            seek_event = Gst.Event.new_seek(rate,
-                    Gst.Format.TIME,
-                    Gst.SeekFlags.FLUSH | Gst.SeekFlags.ACCURATE,
-                    Gst.SeekType.SET, position,
-                    Gst.SeekType.NONE, 0)
-        else:
-            seek_event = Gst.Event.new_seek(rate,
-                    Gst.Format.TIME,
-                    Gst.SeekFlags.FLUSH | Gst.SeekFlags.ACCURATE,
-                    Gst.SeekType.SET, 0,
-                    Gst.SeekType.SET, position)
+        seek_event = Gst.Event.new_seek(rate,
+                                        Gst.Format.TIME,
+                                        Gst.SeekFlags.FLUSH | Gst.SeekFlags.ACCURATE,
+                                        Gst.SeekType.SET, position,
+                                        Gst.SeekType.SET, -1)
 
         if seek_event:
             self._player.send_event(seek_event)