summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorFrans Englich <frans.englich@nokia.com>2009-08-26 14:36:32 (GMT)
committerGareth Stockwell <gareth.stockwell@sosco.com>2009-09-09 13:35:38 (GMT)
commit7d2d15bbc9d598daf94800b576aff19a68119ed1 (patch)
tree61f881bda38b0559db6543ed87b55089e64ef25e /src/plugins
parentc4d341ecf26d63cc7410756f8f7d1926c277f02f (diff)
downloadQt-7d2d15bbc9d598daf94800b576aff19a68119ed1.zip
Qt-7d2d15bbc9d598daf94800b576aff19a68119ed1.tar.gz
Qt-7d2d15bbc9d598daf94800b576aff19a68119ed1.tar.bz2
Work on extending the framework for accomodating effects.
This extends the framework for being able to handle audio effects, largely affecting how the audio chain is set up, connected and disconnected, and therefore the Backend has been refactored slightly, and the class MediaNode introduced, see its documentation. In addition two effects has been written: BassBoost and AudioEqualizer.
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/phonon/mmf/mmf.pro5
-rw-r--r--src/plugins/phonon/mmf/plugin/plugin.pro35
2 files changed, 26 insertions, 14 deletions
diff --git a/src/plugins/phonon/mmf/mmf.pro b/src/plugins/phonon/mmf/mmf.pro
index dc18d20..4e764dc 100644
--- a/src/plugins/phonon/mmf/mmf.pro
+++ b/src/plugins/phonon/mmf/mmf.pro
@@ -1,3 +1,2 @@
-TEMPLATE = subdirs
-SUBDIRS = objectdump plugin
-
+TEMPLATE = subdirs
+SUBDIRS = objectdump plugin
diff --git a/src/plugins/phonon/mmf/plugin/plugin.pro b/src/plugins/phonon/mmf/plugin/plugin.pro
index 418d354..f3a6a9c 100644
--- a/src/plugins/phonon/mmf/plugin/plugin.pro
+++ b/src/plugins/phonon/mmf/plugin/plugin.pro
@@ -22,28 +22,38 @@ phonon_mmf_audio_drm {
}
HEADERS += \
- $$PHONON_MMF_DIR/abstractplayer.h \
+ $$PHONON_MMF_DIR/abstractaudioeffect.h \
$$PHONON_MMF_DIR/abstractmediaplayer.h \
+ $$PHONON_MMF_DIR/abstractplayer.h \
$$PHONON_MMF_DIR/audiooutput.h \
+ $$PHONON_MMF_DIR/audioequalizer.h \
$$PHONON_MMF_DIR/audioplayer.h \
$$PHONON_MMF_DIR/backend.h \
+ $$PHONON_MMF_DIR/bassboost.h \
$$PHONON_MMF_DIR/defs.h \
$$PHONON_MMF_DIR/dummyplayer.h \
+ $$PHONON_MMF_DIR/effectfactory.h \
+ $$PHONON_MMF_DIR/mmf_medianode.h \
$$PHONON_MMF_DIR/mediaobject.h \
$$PHONON_MMF_DIR/utils.h \
$$PHONON_MMF_DIR/videooutput.h \
$$PHONON_MMF_DIR/videooutputobserver.h \
$$PHONON_MMF_DIR/videoplayer.h \
$$PHONON_MMF_DIR/videowidget.h \
- $$PHONON_MMF_DIR/volumeobserver.h
+ $$PHONON_MMF_DIR/volumeobserver.h
SOURCES += \
+ $$PHONON_MMF_DIR/abstractaudioeffect.cpp \
+ $$PHONON_MMF_DIR/abstractmediaplayer.cpp \
$$PHONON_MMF_DIR/abstractplayer.cpp \
- $$PHONON_MMF_DIR/abstractmediaplayer.cpp \
$$PHONON_MMF_DIR/audiooutput.cpp \
+ $$PHONON_MMF_DIR/audioequalizer.cpp \
$$PHONON_MMF_DIR/audioplayer.cpp \
$$PHONON_MMF_DIR/backend.cpp \
+ $$PHONON_MMF_DIR/bassboost.cpp \
$$PHONON_MMF_DIR/dummyplayer.cpp \
+ $$PHONON_MMF_DIR/effectfactory.cpp \
+ $$PHONON_MMF_DIR/mmf_medianode.cpp \
$$PHONON_MMF_DIR/mediaobject.cpp \
$$PHONON_MMF_DIR/utils.cpp \
$$PHONON_MMF_DIR/videooutput.cpp \
@@ -51,15 +61,18 @@ SOURCES += \
$$PHONON_MMF_DIR/videowidget.cpp
debug {
- INCLUDEPATH += $$PHONON_MMF_DIR/objectdump
- LIBS += -lobjectdump
+ INCLUDEPATH += $$PHONON_MMF_DIR/objectdump
+ LIBS += -lobjectdump
}
-
-LIBS += -lmediaclientvideo # For CVideoPlayerUtility
-LIBS += -lcone # For CCoeEnv
-LIBS += -lws32 # For RWindow
-LIBS += -lefsrv # For file server
-LIBS += -lapgrfx -lapmime # For recognizer
+
+LIBS += -lmediaclientvideo # For CVideoPlayerUtility
+LIBS += -lcone # For CCoeEnv
+LIBS += -lws32 # For RWindow
+LIBS += -lefsrv # For file server
+LIBS += -lapgrfx -lapmime # For recognizer
+
+# These are for effects.
+LIBS += -lAudioEqualizerEffect.lib -lBassBoostEffect.lib -lDistanceAttenuationEffect.lib -lDopplerBase.lib -lEffectBase.lib -lEnvironmentalReverbEffect.lib -lListenerDopplerEffect.lib -lListenerLocationEffect.lib -lListenerOrientationEffect.lib -lLocationBase.lib -lLoudnessEffect.lib -lOrientationBase.lib -lRoomLevelEffect.lib -lSourceDopplerEffect.lib -lSourceLocationEffect.lib -lSourceOrientationEffect.lib -lStereoWideningEffect.lib
# This is needed for having the .qtplugin file properly created on Symbian.
QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/phonon_backend