sebastien - in flumotion/branches/transcoder-1: . flumotion/common
flumotion/component/combiners/switch flumotion/manager
flumotion-commit at lists.fluendo.com
flumotion-commit at lists.fluendo.com
Fri May 11 11:31:11 CEST 2007
Author: sebastien
Date: Fri May 11 11:31:08 2007
New Revision: 4933
Modified:
flumotion/branches/transcoder-1/ChangeLog
flumotion/branches/transcoder-1/flumotion/common/config.py
flumotion/branches/transcoder-1/flumotion/common/enum.py
flumotion/branches/transcoder-1/flumotion/component/combiners/switch/switch.py
flumotion/branches/transcoder-1/flumotion/manager/admin.py
flumotion/branches/transcoder-1/flumotion/manager/manager.py
Log:
2007-05-10 Sebastien Merle <sebastien at fluendo.com>
* Merged flumotion trunk changesets up to [4932].
Modified: flumotion/branches/transcoder-1/ChangeLog
==============================================================================
--- flumotion/branches/transcoder-1/ChangeLog (original)
+++ flumotion/branches/transcoder-1/ChangeLog Fri May 11 11:31:08 2007
@@ -1,6 +1,6 @@
2007-05-10 Sebastien Merle <sebastien at fluendo.com>
- * Merged flumotion trunk changesets up to [4929].
+ * Merged flumotion trunk changesets up to [4932].
2007-05-09 Sebastien Merle <sebastien at fluendo.com>
@@ -30,6 +30,17 @@
* flumotion/manager/admin.py:
Added the loadComponent method.
+2007-05-10 Sebastien Merle <sebastien at fluendo.com>
+
+ * flumotion/common/enum.py:
+ Corrected a bug when creating a generic enum instance.
+
+2007-05-10 Zaheer Abbas Merali <<zaheerabbas at merali dot org>>
+
+ * flumotion/component/combiners/switch/switch.py (Switch, SingleSwitch,
+ AVSwitch):
+ Change log categories.
+
2007-05-10 Zaheer Abbas Merali <<zaheerabbas at merali dot org>>
* flumotion/component/Makefile.am:
Modified: flumotion/branches/transcoder-1/flumotion/common/config.py
==============================================================================
--- flumotion/branches/transcoder-1/flumotion/common/config.py (original)
+++ flumotion/branches/transcoder-1/flumotion/common/config.py Fri May 11 11:31:08 2007
@@ -62,7 +62,7 @@
def _buildComponentConfig(parentName, componentType, componentName,
componentProperties, componentPlugs=None,
- eaters=None, isClockMaster=False,
+ eaters=None, isClockMaster=None,
flumotionVersion=None):
"""
Build a component configuration dictionary.
@@ -165,8 +165,8 @@
def buildComponentConfig(parentName, componentType, componentName,
- componentProperties, componentPlugs=None,
- workerName=None, eaters=None, isClockMaster=None,
+ componentProperties, componentPlugs,
+ workerName, eaters=None, isClockMaster=None,
flumotionVersion=None):
config = _buildComponentConfig(parentName, componentType, componentName,
componentProperties, componentPlugs,
Modified: flumotion/branches/transcoder-1/flumotion/common/enum.py
==============================================================================
--- flumotion/branches/transcoder-1/flumotion/common/enum.py (original)
+++ flumotion/branches/transcoder-1/flumotion/common/enum.py Fri May 11 11:31:08 2007
@@ -46,7 +46,7 @@
setattr(self, enum.name, enum)
class Enum(object, jelly.Jellyable):
-
+
__metaclass__ = EnumMetaClass
def __init__(self, value, name, nick=None):
self.value = value
@@ -117,16 +117,14 @@
enumClassName, value, name, nick = jellyList[1:]
enumClass = _enumClassRegistry.get(enumClassName, None)
if enumClass:
+ # Retrieve the enum singleton
enum = enumClass.get(value)
assert enum.name == name, "Inconsistent Enum Name"
- return enum
- # Become a generic Enum instance
- self.__class__ = Enum
- self._enumClassName = enumClassName
- self.value = value
- self.name = name
- self.nick = nick
- return self
+ else:
+ # Create a generic Enum container
+ enum = Enum(value, name, nick)
+ enum._enumClassName = enumClassName
+ return enum
jelly.setUnjellyableForClass(qual(Enum), EnumUnjellyer)
Modified: flumotion/branches/transcoder-1/flumotion/component/combiners/switch/switch.py
==============================================================================
--- flumotion/branches/transcoder-1/flumotion/component/combiners/switch/switch.py (original)
+++ flumotion/branches/transcoder-1/flumotion/component/combiners/switch/switch.py Fri May 11 11:31:08 2007
@@ -30,7 +30,7 @@
return self.comp.switchToBackup()
class Switch(feedcomponent.MultiInputParseLaunchComponent):
- logCategory = 'conv-switch'
+ logCategory = 'comb-switch'
componentMediumClass = SwitchMedium
def init(self):
@@ -55,7 +55,7 @@
'switchToBackup')
class SingleSwitch(Switch):
- logCategory = "conv-single-switch"
+ logCategory = "comb-single-switch"
def init(self):
Switch.init(self)
@@ -113,7 +113,7 @@
self.uiState.set("active-eater", "backup")
class AVSwitch(Switch):
- logCategory = "conv-av-switch"
+ logCategory = "comb-av-switch"
def init(self):
Switch.init(self)
Modified: flumotion/branches/transcoder-1/flumotion/manager/admin.py
==============================================================================
--- flumotion/branches/transcoder-1/flumotion/manager/admin.py (original)
+++ flumotion/branches/transcoder-1/flumotion/manager/admin.py Fri May 11 11:31:08 2007
@@ -411,7 +411,7 @@
def perspective_loadComponent(self, componentType, componentId,
componentProperties, workerName,
- eaters=None, isClockMaster=False):
+ eaters=None, isClockMaster=None):
"""
Load a component into the manager configuration.
Returns a deferred that will be called with the component state.
@@ -429,7 +429,6 @@
@param eaters: the stream eaters of the component to be added.
@type eaters: dict of str keyed list of str
@param isClockMaster: if the component to be added is clock master.
- By default a componenet is not a clack master.
@type isClockMaster: bool
"""
return self.vishnu.loadComponent(self.remoteIdentity, componentType,
Modified: flumotion/branches/transcoder-1/flumotion/manager/manager.py
==============================================================================
--- flumotion/branches/transcoder-1/flumotion/manager/manager.py (original)
+++ flumotion/branches/transcoder-1/flumotion/manager/manager.py Fri May 11 11:31:08 2007
@@ -555,7 +555,7 @@
def loadComponent(self, identity, componentType, componentId,
componentProperties, workerName,
- eaters=None, isClockMaster=False):
+ eaters=None, isClockMaster=None):
"""
Load a component into the manager configuration.
Returns a deferred that will be called with the component state.
@@ -573,7 +573,6 @@
@param eaters: the stream eaters of the component to be added.
@type eaters: dict of str keyed list of str
@param isClockMaster: if the component to be added is clock master.
- By default a componenet is not a clack master.
@type isClockMaster: bool
"""
self.debug('loading %s component %s on %s',
More information about the flumotion-commit
mailing list