Make the MediaObject propagation generic for all kinds of nodes.

Previously the MediaObject propagation was only done for effects, but now it's
for all kinds of nodes. This is needed for AudioOutput.

1 files changed, 6 insertions, 8 deletions

diff --git a/src/3rdparty/phonon/mmf/abstractaudioeffect.h b/src/3rdparty/phonon/mmf/abstractaudioeffect.h
index 4c2eba3..cf2fb3c 100644
--- a/src/3rdparty/phonon/mmf/abstractaudioeffect.h
+++ b/src/3rdparty/phonon/mmf/abstractaudioeffect.h
@@ -66,7 +66,6 @@ public:
     virtual void setParameterValue(const EffectParameter &,
                                    const QVariant &newValue);
 
-    virtual bool connectMediaNode(MediaNode *target);
     virtual bool disconnectMediaNode(MediaNode *target);
 
     enum Type
@@ -83,20 +82,19 @@ public:
     };
 
 protected:
-    virtual void activateOn(CPlayerType *player) = 0;
+    virtual bool activateOn(CPlayerType *player) = 0;
     virtual void parameterChanged(const int id,
                                   const QVariant &value) = 0;
 
-    QScopedPointer<CAudioEffect>    m_effect;
-private:
     /**
-     * From @p target, we walk the chain backwards and try to find the media
-     * object, and apply ourselves to that one.
+     * Part of the implementation of AbstractAudioEffect. Forwards the call to
+     * activateOn(), essentially.
      */
-    bool activateBackwardsInChain(MediaNode *target);
+    virtual bool activateOnMediaObject(MediaObject *mo);
 
+    QScopedPointer<CAudioEffect>    m_effect;
+private:
     const QList<EffectParameter>    m_params;
-    bool                            m_isApplied;
     QHash<int, QVariant>            m_values;
 };
 }