zaheer - in flumotion/trunk: . flumotion/component flumotion/component/combiners/switch

[flumotion-commit at lists.fluendo.com]

Author: zaheer
Date: Mon May 14 16:12:30 2007
New Revision: 4939

Modified:
   flumotion/trunk/ChangeLog
   flumotion/trunk/flumotion/component/combiners/switch/switch.py
   flumotion/trunk/flumotion/component/feedcomponent010.py
Log:
	* flumotion/component/combiners/switch/switch.py
	  (SingleSwitch.configure_pipeline, AVSwitch.configure_pipeline):
	* flumotion/component/feedcomponent010.py
	  (FeedComponent.get_eater_name_for_feedId):
	s/feedid/feedId



Modified: flumotion/trunk/ChangeLog
==============================================================================
--- flumotion/trunk/ChangeLog	(original)
+++ flumotion/trunk/ChangeLog	Mon May 14 16:12:30 2007
@@ -1,5 +1,13 @@
 2007-05-14  Zaheer Abbas Merali  <<zaheerabbas at merali dot org>>
 
+	* flumotion/component/combiners/switch/switch.py
+	  (SingleSwitch.configure_pipeline, AVSwitch.configure_pipeline):
+	* flumotion/component/feedcomponent010.py
+	  (FeedComponent.get_eater_name_for_feedId):
+	s/feedid/feedId
+
+2007-05-14  Zaheer Abbas Merali  <<zaheerabbas at merali dot org>>
+
 	* flumotion/component/combiners/switch/Makefile.am:
 	* flumotion/component/combiners/switch/basicwatchdog.py
 	  (SingleBasicWatchdog, SingleBasicWatchdog.eaterSetInactive,

Modified: flumotion/trunk/flumotion/component/combiners/switch/switch.py
==============================================================================
--- flumotion/trunk/flumotion/component/combiners/switch/switch.py	(original)
+++ flumotion/trunk/flumotion/component/combiners/switch/switch.py	Mon May 14 16:12:30 2007
@@ -84,13 +84,13 @@
             padPeers["sink%d" % sinkPadNumber] = sw.get_pad("sink%d" % (
                 sinkPadNumber)).get_peer().get_parent().get_name()
 
-        for feedid in self.eater_names:
-            eaterName = self.get_eater_name_for_feedid(feedid)
-            self.debug("feedid %s is mapped to eater name %s", feedid, 
+        for feedId in self.eater_names:
+            eaterName = self.get_eater_name_for_feedId(feedId)
+            self.debug("feedId %s is mapped to eater name %s", feedId, 
                 eaterName)
             if eaterName:
                 for sinkPad in padPeers:
-                    if feedid in padPeers[sinkPad]:
+                    if feedId in padPeers[sinkPad]:
                         self.switchPads[eaterName] = sinkPad
                 if not self.switchPads.has_key(eaterName):    
                     self.warning("could not find sink pad for eater %s", 
@@ -158,13 +158,13 @@
                 asw.get_pad("sink%d" % (
                 sinkPadNumber)).get_peer().get_parent().get_name()
 
-        for feedid in self.eater_names:
-            eaterName = self.get_eater_name_for_feedid(feedid)
-            self.debug("feedid %s is mapped to eater name %s", feedid, 
+        for feedId in self.eater_names:
+            eaterName = self.get_eater_name_for_feedId(feedId)
+            self.debug("feedId %s is mapped to eater name %s", feedId, 
                 eaterName)
             if eaterName:
                 for sinkPadName, switchElement in padPeers:
-                    if feedid in padPeers[(sinkPadName, switchElement)]:
+                    if feedId in padPeers[(sinkPadName, switchElement)]:
                         self.switchPads[eaterName] = sinkPadName
                 if not self.switchPads.has_key(eaterName):
                     self.warning("could not find sink pad for eater %s", 

Modified: flumotion/trunk/flumotion/component/feedcomponent010.py
==============================================================================
--- flumotion/trunk/flumotion/component/feedcomponent010.py	(original)
+++ flumotion/trunk/flumotion/component/feedcomponent010.py	Mon May 14 16:12:30 2007
@@ -1308,7 +1308,7 @@
                 self._gotFirstNewSegment[feedId] = True
         return True
 
-    def get_eater_name_for_feedid(self, feedId):
+    def get_eater_name_for_feedId(self, feedId):
         if self._eaterMapping.has_key(feedId):
             return self._eaterMapping[feedId]
         return None