msmith - in flumotion/trunk: . flumotion/component

[flumotion-commit at lists.fluendo.com]

Author: msmith
Date: Thu Jul 12 19:06:32 2007
New Revision: 5315

Modified:
   flumotion/trunk/ChangeLog
   flumotion/trunk/flumotion/component/feedcomponent010.py
Log:
        * flumotion/component/feedcomponent010.py:
          When switching fd for fdsrc in feed component pipelines, remove the
          element from its parent rather than the toplevel pipeline.
          Fixes components that put the source elements in a bin.



Modified: flumotion/trunk/ChangeLog
==============================================================================
--- flumotion/trunk/ChangeLog	(original)
+++ flumotion/trunk/ChangeLog	Thu Jul 12 19:06:32 2007
@@ -1,3 +1,10 @@
+2007-07-12  Michael Smith <msmith at fluendo.com>
+
+	* flumotion/component/feedcomponent010.py:
+	  When switching fd for fdsrc in feed component pipelines, remove the
+	  element from its parent rather than the toplevel pipeline.
+	  Fixes components that put the source elements in a bin.
+
 2007-07-11  Michael Smith <msmith at fluendo.com>
 
 	* flumotion/component/base/http.py:

Modified: flumotion/trunk/flumotion/component/feedcomponent010.py
==============================================================================
--- flumotion/trunk/flumotion/component/feedcomponent010.py	(original)
+++ flumotion/trunk/flumotion/component/feedcomponent010.py	Thu Jul 12 19:06:32 2007
@@ -1279,14 +1279,15 @@
             # Now, we can switch FD with this mess
             sinkpad = srcpad.get_peer()
             srcpad.unlink(sinkpad)
-            self.pipeline.remove(element)
+            parent = element.get_parent()
+            parent.remove(element)
             self.log("setting to ready")
             element.set_state(gst.STATE_READY)
             self.log("setting to ready complete!!!")
             old = element.get_property('fd')
             os.close(old)
             element.set_property('fd', fd)
-            self.pipeline.add(element)
+            parent.add(element)
             srcpad.link(sinkpad)
             element.set_state(gst.STATE_PLAYING)
             # We're done; unblock the pad