Changeset 651 for trunk/src/3rdparty/phonon/mmf/abstractaudioeffect.h

Timestamp:

Mar 8, 2010, 12:52:58 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.2 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/3rdparty/phonon/mmf/abstractaudioeffect.h (modified) (6 diffs)

trunk/src/3rdparty/phonon/mmf/abstractaudioeffect.h

@@ -24 +24 @@
 #include <AudioEffectBase.h>
 
-#include <Phonon/effectinterface.h>
-#include <Phonon/effectparameter.h>
+#include <phonon/effectinterface.h>
 
 #include "audioplayer.h"
+
 #include "mmf_medianode.h"
 #include "mmf_videoplayer.h"
+
+
 
 QT_BEGIN_NAMESPACE
@@ -37 +39 @@
 namespace MMF
 {
+
 class AbstractMediaPlayer;
 
@@ -64 +67 @@
                         const QList<EffectParameter> &params);
 
-    virtual QList<EffectParameter> parameters() const;
-    virtual QVariant parameterValue(const EffectParameter &param) const;
-    virtual void setParameterValue(const EffectParameter &,
+    // Phonon::EffectInterface
+    virtual QList<Phonon::EffectParameter> parameters() const;
+    virtual QVariant parameterValue(const Phonon::EffectParameter &param) const;
+    virtual void setParameterValue(const Phonon::EffectParameter &,
                                    const QVariant &newValue);
 
-    enum Type
+    // Parameters which are shared by all effects
+    enum CommonParameters
     {
-        EffectAudioEqualizer = 1,
-        EffectBassBoost,
-        EffectDistanceAttenuation,
-        EffectEnvironmentalReverb,
-        EffectListenerOrientation,
-        EffectLoudness,
-        EffectSourceOrientation,
-        EffectStereoWidening
+        ParameterEnable = 0,
+        ParameterBase // must be last entry in enum
     };
+
+
+
+
+
 
 protected:
@@ -86 +90 @@
     void disconnectMediaObject(MediaObject *mediaObject);
 
-    virtual void connectAudioPlayer(AudioPlayer::NativePlayer *player) = 0;
-    virtual void applyParameters() = 0;
+    virtual void createEffect(AudioPlayer::NativePlayer *player) = 0;
 
-    virtual void parameterChanged(const int id,
-                                  const QVariant &value) = 0;
+    // Effect-specific parameter changed
+    virtual int effectParameterChanged(const EffectParameter &param,
+                                  const QVariant &value);
+
+private:
+    void createEffect();
+    void setEnabled(bool enabled);
+    const EffectParameter& internalParameter(int id) const;
+    int parameterChanged(const EffectParameter &param,
+            const QVariant &value);
 
 protected:
@@ -96 +107 @@
 
 private:
+
     AbstractMediaPlayer *           m_player;
-    const QList<EffectParameter>    m_params;
     QHash<int, QVariant>            m_values;
 };
@@ -104 +115 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 QT_END_NAMESPACE