zaheer - in flumotion/trunk: . flumotion/component/converters/overlay flumotion/component/muxers

[flumotion-commit at lists.fluendo.com]

Author: zaheer
Date: Tue Jun  5 19:32:55 2007
New Revision: 5103

Modified:
   flumotion/trunk/ChangeLog
   flumotion/trunk/flumotion/component/converters/overlay/overlay.py
   flumotion/trunk/flumotion/component/muxers/multipart.py
Log:
	* flumotion/component/converters/overlay/overlay.py
	  (Overlay.get_pipeline_string):
	Fix to use eater dict.
	* flumotion/component/muxers/multipart.py:
	Port to MultiInputParseLaunchComponent, turns out this fixes
	it to use eater dict.



Modified: flumotion/trunk/ChangeLog
==============================================================================
--- flumotion/trunk/ChangeLog	(original)
+++ flumotion/trunk/ChangeLog	Tue Jun  5 19:32:55 2007
@@ -1,5 +1,14 @@
 2007-06-05  Zaheer Abbas Merali  <zaheerabbas at merali dot org>
 
+	* flumotion/component/converters/overlay/overlay.py
+	  (Overlay.get_pipeline_string):
+	Fix to use eater dict.
+	* flumotion/component/muxers/multipart.py:
+	Port to MultiInputParseLaunchComponent, turns out this fixes
+	it to use eater dict.
+
+2007-06-05  Zaheer Abbas Merali  <zaheerabbas at merali dot org>
+
 	* flumotion/manager/manager.py (Vishnu.verifyExistingComponentState,
 	  Vishnu.makeNewComponentState):
 	Do not assume "default" as the eater name when building the

Modified: flumotion/trunk/flumotion/component/converters/overlay/overlay.py
==============================================================================
--- flumotion/trunk/flumotion/component/converters/overlay/overlay.py	(original)
+++ flumotion/trunk/flumotion/component/converters/overlay/overlay.py	Tue Jun  5 19:32:55 2007
@@ -48,7 +48,7 @@
         # this got added to ffmpegcolorspace in 0.8.5
         addalpha = 'ffmpegcolorspace'
 
-        source = self.config['source'][0]
+        source = self.config['eater']['default'][0]
         eater = '@ eater:%s @' % source
 
         # the order here is important; to have our eater be the reference

Modified: flumotion/trunk/flumotion/component/muxers/multipart.py
==============================================================================
--- flumotion/trunk/flumotion/component/muxers/multipart.py	(original)
+++ flumotion/trunk/flumotion/component/muxers/multipart.py	Tue Jun  5 19:32:55 2007
@@ -23,15 +23,6 @@
 
 from flumotion.component import feedcomponent
 
-class Multipart(feedcomponent.ParseLaunchComponent):
-    def get_pipeline_string(self, properties):
-        sources = self.config['source']
-
-        pipeline = 'multipartmux name=muxer '
-        for eater in sources:
-            tmpl = '@ eater:%s @ ! queue ! muxer. '
-            pipeline += tmpl % eater
-
-        pipeline += 'muxer.'
-
-        return pipeline
+class Multipart(feedcomponent.MultiInputParseLaunchComponent):
+    def get_muxer_string(self, properties):
+        return 'multipartmux name=muxer'