Handle KeyboardInterrupt in the main program, not in the Player class

[vidi-player.git] / vidi / Player.py

diff --git a/vidi/Player.py b/vidi/Player.py
index 26a9832..15a4d07 100755 (executable)
--- a/vidi/Player.py
+++ b/vidi/Player.py
@@ -30,6 +30,10 @@ GObject.threads_init()
 class Player(object):
     def __init__(self, pipeline):
         self.pipeline = pipeline
+        bus = self.pipeline.get_bus()
+        bus.add_signal_watch()
+        bus.connect("message", self.bus_message_cb)
+
         self.mainloop = GObject.MainLoop()
 
     @staticmethod
@@ -37,25 +41,14 @@ class Player(object):
         pipeline = Gst.parse_launch(pipeline_string)
         return Player(pipeline)
 
-    def quit(self):
+    def stop(self):
         self.mainloop.quit()
         self.pipeline.set_state(Gst.State.NULL)
 
     def bus_message_cb(self, unused_bus, message):
         if message.type == Gst.MessageType.EOS:
-            self.quit()
+            self.stop()
 
     def play(self):
-        bus = self.pipeline.get_bus()
-        bus.add_signal_watch()
-        bus.connect("message", self.bus_message_cb)
-
         self.pipeline.set_state(Gst.State.PLAYING)
-
-        try:
-            self.mainloop.run()
-        except KeyboardInterrupt:
-            self.quit()
-            return 1
-
-        return 0
+        self.mainloop.run()