wingo - in flumotion/trunk: . flumotion/component/consumers/disker

[commits at core.fluendo.com]

Author: wingo
Date: Mon Nov  7 19:40:57 2005
New Revision: 2437

Modified:
   flumotion/trunk/ChangeLog
   flumotion/trunk/flumotion/component/consumers/disker/disker.py
Log:
2005-11-07  Andy Wingo  <wingo at pobox.com>

	* flumotion/component/consumers/disker/disker.py: Make it work
	with 0.9.



Modified: flumotion/trunk/ChangeLog
==============================================================================
--- flumotion/trunk/ChangeLog	(original)
+++ flumotion/trunk/ChangeLog	Mon Nov  7 19:40:57 2005
@@ -5,6 +5,9 @@
 
 2005-11-07  Andy Wingo  <wingo at pobox.com>
 
+	* flumotion/component/consumers/disker/disker.py: Make it work
+	with 0.9.
+
 	* flumotion/common/boot.py.in (init_gst): Fix version check.
 	(init_gst): Move the pygst_dir up to the front.
 

Modified: flumotion/trunk/flumotion/component/consumers/disker/disker.py
==============================================================================
--- flumotion/trunk/flumotion/component/consumers/disker/disker.py	(original)
+++ flumotion/trunk/flumotion/component/consumers/disker/disker.py	Mon Nov  7 19:40:57 2005
@@ -144,7 +144,7 @@
         sink.emit('add', self.file_fd.fileno())
         self.emit('filename-changed', self.location)
     
-    def _notify_caps_cb(self, element, pad, param):
+    def _notify_caps_cb(self, pad, param):
         caps = pad.get_negotiated_caps()
         if caps == None:
             return
@@ -163,15 +163,18 @@
         if new:
             reactor.callLater(0, self.change_filename)
 
-    def _feeder_state_change_cb(self, element, old, state):
-        # FIXME: add more states
-        if state == gst.STATE_PLAYING:
-            self.setMood(moods.happy)
             
     def link_setup(self, eaters, feeders):
         sink = self.get_element('fdsink')
-        sink.connect('state-change', self._feeder_state_change_cb)
-        sink.connect('deep-notify::caps', self._notify_caps_cb)
+        sink.get_pad('sink').connect('notify::caps', self._notify_caps_cb)
+
+        import gst
+        if gst.gst_version < (0, 9):
+            sink.connect('state-change', self._feeder_state_change_cb)
+            def _feeder_state_change_cb(self, element, old, state):
+                # FIXME: add more states
+                if state == gst.STATE_PLAYING:
+                    self.setMood(moods.happy)
 
 compat.type_register(Disker)