[pitivi/ges: 44/287] Rename EffectFactory to Effect and adapt move it to effect.py

[Jean-FranÃois Fortin Tam <jfft src gnome org>]

commit ee6eb002f3048e051a0e90b4725811a954aa6c3c
Author: Thibault Saunier <thibault saunier collabora com>
Date:   Mon Oct 3 21:01:42 2011 -0300

    Rename EffectFactory to Effect and adapt move it to effect.py
    
    It is not a factory anymore

 pitivi/effects.py             |   29 ++++++-
 pitivi/factories/operation.py |  178 +----------------------------------------
 2 files changed, 27 insertions(+), 180 deletions(-)
---
diff --git a/pitivi/effects.py b/pitivi/effects.py
index e09960d..c776ec4 100644
--- a/pitivi/effects.py
+++ b/pitivi/effects.py
@@ -31,8 +31,6 @@ import os
 
 from gettext import gettext as _
 
-from pitivi.factories.operation import EffectFactory
-from pitivi.stream import get_stream_for_pad
 from pitivi.configure import get_pixmap_dir
 from pitivi.undo import UndoableAction
 
@@ -54,10 +52,33 @@ BLACKLISTED_EFFECTS = ["colorconvert", "coglogoinsert", "festival",
                        "alphacolor", "cogcolorspace", "videodetect",
                        "navigationtest", "videoanalyse"]
 
+#FIXME Check if this is still true with GES
 #We should unblacklist it when #650985 is solved
 BLACKLISTED_PLUGINS = ["ldaspa"]
 
 
+class Effect():
+    """
+    Factories that applies an effect on a stream
+    """
+    def __init__(self, effect, name='', categories=[_("Uncategorized")],
+                  human_name="", description="", icon=None):
+        self.effectname = effect
+        self.categories = categories
+        self.description = description
+        self.human_name = human_name
+        self._icon = icon
+
+    def getHumanName(self):
+        return self.human_name
+
+    def getDescription(self):
+        return self.description
+
+    def getCategories(self):
+        return self.categories
+
+
 class EffectsHandler(object):
     """
     Handles all the effects
@@ -134,7 +155,7 @@ class EffectsHandler(object):
             name = element_factory.get_name()
             if "Effect" in klass and name not in BLACKLISTED_EFFECTS and not\
                 [bplug for bplug in BLACKLISTED_PLUGINS if bplug in name]:
-                effect = EffectFactory(name, name,
+                effect = Effect(name, name,
                                    self._getEffectCategories(name),
                                    self._getEffectName(element_factory),
                                    self._getEffectDescripton(element_factory))
@@ -163,7 +184,7 @@ class EffectsHandler(object):
         """
         @ivar name: Factory name.
         @type name: C{str}
-        @returns: The l{EffectFactory} corresponding to the name
+        @returns: The l{Effect} corresponding to the name
         @raises: KeyError if the name doesn't  exist
         """
         return self._effect_factories_dict.get(name)
diff --git a/pitivi/factories/operation.py b/pitivi/factories/operation.py
index 5b3ff19..0297305 100644
--- a/pitivi/factories/operation.py
+++ b/pitivi/factories/operation.py
@@ -19,58 +19,20 @@
 # Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
 # Boston, MA 02110-1301, USA.
 
-import gst
-from pitivi.factories.base import OperationFactory
-from pitivi.stream import AudioStream, VideoStream
-
 from gettext import gettext as _
 
 
-# FIXME: define a proper hierarchy
-class OperationFactoryError(Exception):
-    pass
-
-
-class ModifierFactoryError(OperationFactoryError):
-    pass
-
-
-class TransformFactory(OperationFactory):
-    """
-    Factories that take exactly one input stream and output exactly one output
-    stream.
-    """
-
-    def addTransformStreams(self, input_stream, output_stream):
-        self.addInputStream(input_stream)
-        self.addOutputStream(output_stream)
-
-    def addInputStream(self, stream):
-        if len(self.input_streams) > 1:
-            raise OperationFactoryError("Can't handle more than one stream")
-        return OperationFactory.addInputStream(self, stream)
-
-    def addOutputStream(self, stream):
-        if len(self.output_streams) > 1:
-            raise OperationFactoryError("Can't handle more than one stream")
-        return OperationFactory.addOutputStream(self, stream)
-
-    def _requestNewInputStream(self, *args):
-        raise OperationFactoryError("TransformFactory doesn't allow request pads")
-
-
-class EffectFactory(TransformFactory):
+class Effect():
     """
     Factories that applies an effect on a stream
     """
     def __init__(self, effect, name='', categories=[_("Uncategorized")],
                   human_name="", description="", icon=None):
-        TransformFactory.__init__(self, name)
         self.effectname = effect
         self.categories = categories
         self.description = description
         self.human_name = human_name
-        self._setIcon(icon)
+        self._icon = icon
 
     def getHumanName(self):
         return self.human_name
@@ -80,139 +42,3 @@ class EffectFactory(TransformFactory):
 
     def getCategories(self):
         return self.categories
-
-    def _makeBin(self, *args):
-        bin = gst.Bin()
-        fx = gst.element_factory_make(self.effectname, "effect")
-        if isinstance(self.input_streams[0], VideoStream):
-            csp = gst.element_factory_make("ffmpegcolorspace")
-        else:
-            csp = gst.parse_bin_from_description("audioconvert ! audioresample",
-                                                 True)
-
-        bin.add(fx, csp)
-        csp.link(fx)
-
-        bin.add_pad(gst.GhostPad("sink", csp.get_pad("sink")))
-        bin.add_pad(gst.GhostPad("src", fx.get_pad("src")))
-
-        return bin
-
-    def _releaseBin(self, bin):
-        elements = bin.elements()
-        for element in elements.next():
-            del element
-
-    def addInputStream(self, stream):
-        return OperationFactory.addInputStream(self, stream)
-
-    def addOutputStream(self, stream):
-        return OperationFactory.addOutputStream(self, stream)
-
-
-class StreamModifierFactory(TransformFactory):
-    """
-    Factories that modify the nature/type of a stream.
-    """
-    pass
-
-
-class AudioModifierFactory(StreamModifierFactory):
-
-    def _makeBin(self, *args):
-        b = gst.Bin()
-        idt = gst.element_factory_make("identity", "single-segment")
-        idt.props.single_segment = True
-        idt.props.silent = True
-        aconv = gst.element_factory_make("audioconvert", "aconv")
-        ares = gst.element_factory_make("audioresample", "ares")
-        arate = gst.element_factory_make("audiorate", "arate")
-        b.add(idt, aconv, ares, arate)
-        gst.element_link_many(idt, aconv, ares, arate)
-
-        gsink = gst.GhostPad("sink", idt.get_pad("sink"))
-        gsink.set_active(True)
-        b.add_pad(gsink)
-
-        # if we have an output stream specified, we add a capsfilter
-        if len(self.output_streams):
-            cfilter = gst.element_factory_make("capsfilter")
-            cfilter.props.caps = self.output_streams[0].caps
-            b.add(cfilter)
-            arate.link(cfilter)
-
-            gsrc = gst.GhostPad("src", cfilter.get_pad("src"))
-        else:
-            gsrc = gst.GhostPad("src", arate.get_pad("src"))
-
-        gsrc.set_active(True)
-        b.add_pad(gsrc)
-        return b
-
-
-class VideoModifierFactory(StreamModifierFactory):
-
-    def _makeBin(self, *args):
-        b = gst.Bin()
-        idt = gst.element_factory_make("identity", "single-segment")
-        idt.props.single_segment = True
-        idt.props.silent = True
-        csp = gst.element_factory_make("ffmpegcolorspace", "csp")
-        vrate = gst.element_factory_make("videorate", "vrate")
-
-        b.add(idt, csp, vrate)
-        gst.element_link_many(idt, csp, vrate)
-
-        gsink = gst.GhostPad("sink", idt.get_pad("sink"))
-        gsink.set_active(True)
-        b.add_pad(gsink)
-
-        # if we have an output stream specified, we add a capsfilter
-        vscale = gst.element_factory_make("videoscale")
-        try:
-            vscale.props.add_borders = True
-        except AttributeError:
-            self.warning("User has old version of videoscale. "
-                    "add-border not enabled.")
-
-        b.add(vscale)
-        vrate.link(vscale)
-        self.debug("output_streams:%d", len(self.output_streams))
-
-        if len(self.output_streams):
-            idt = gst.element_factory_make("capsfilter")
-            idt.props.caps = self.output_streams[0].caps
-            b.add(idt)
-            vscale.link(idt)
-
-            gsrc = gst.GhostPad("src", idt.get_pad("src"))
-        else:
-            gsrc = gst.GhostPad("src", vscale.get_pad("src"))
-
-        gsrc.set_active(True)
-        b.add_pad(gsrc)
-        return b
-
-
-def get_modifier_for_stream(input_stream=None, output_stream=None):
-    """
-    Returns a L{StreamModifierFactory} for the given streams.
-
-    @raises ModifierFactoryError: If no modifier factory is available
-    for the given streams.
-    """
-    if input_stream == None and output_stream == None:
-        raise ModifierFactoryError("No streams provided")
-    if (isinstance(input_stream, AudioStream) or input_stream == None) and \
-           (isinstance(output_stream, AudioStream) or output_stream == None):
-        res = AudioModifierFactory()
-    elif (isinstance(input_stream, VideoStream) or input_stream == None) and \
-             (isinstance(output_stream, VideoStream) or output_stream == None):
-        res = VideoModifierFactory()
-    else:
-        raise ModifierFactoryError("No modifier for given stream type")
-    if input_stream:
-        res.addInputStream(input_stream)
-    if output_stream:
-        res.addOutputStream(output_stream)
-    return res