[SCM] morituri/master: * gstreamer.py: Add getPipeline() method. Base class implementation uses getPipelineDesc().

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 7ae0f41457b199a0bd000ccfab95765f5eb1b4a4
Author: Thomas Vander Stichele <thomas (at) apestaart (dot) org>
Date:   Fri Aug 5 19:11:00 2011 +0000

    	* gstreamer.py:
    	  Add getPipeline() method.
    	  Base class implementation uses getPipelineDesc().

diff --git a/morituri/extern/task/ChangeLog b/morituri/extern/task/ChangeLog
new file mode 100644
index 0000000..bdade9d
--- /dev/null
+++ b/morituri/extern/task/ChangeLog
@@ -0,0 +1,6 @@
+2011-08-05  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* gstreamer.py:
+	  Add getPipeline() method.
+	  Base class implementation uses getPipelineDesc().
+
diff --git a/morituri/extern/task/gstreamer.py b/morituri/extern/task/gstreamer.py
index e0f354a..91e69ec 100644
--- a/morituri/extern/task/gstreamer.py
+++ b/morituri/extern/task/gstreamer.py
@@ -54,10 +54,8 @@ class GstPipelineTask(task.Task):
         self.gst = gst
 
         task.Task.start(self, runner)
-        desc = self.getPipelineDesc()
 
-        self.debug('creating pipeline %r', desc)
-        self.pipeline = self.gst.parse_launch(desc)
+        self.getPipeline()
 
         self._bus = self.pipeline.get_bus()
         self.gst.debug('got bus %r' % self._bus)
@@ -117,8 +115,13 @@ class GstPipelineTask(task.Task):
         self.stopped()
         task.Task.stop(self)
 
+    ### subclass optional implementations
+    def getPipeline(self):
+        desc = self.getPipelineDesc()
+
+        self.debug('creating pipeline %r', desc)
+        self.pipeline = self.gst.parse_launch(desc)
 
-    ### subclass required implementations
     def getPipelineDesc(self):
         """
         subclasses should implement this to provide a pipeline description.
@@ -127,10 +130,10 @@ class GstPipelineTask(task.Task):
         """
         raise NotImplementedError
 
-    ### subclass optional implementations
     def parsed(self):
         """
-        Called after parsing the pipeline but before setting it to paused.
+        Called after parsing/getting the pipeline but before setting it to
+        paused.
         """
         pass
 

-- 
morituri packaging