summaryrefslogtreecommitdiffstats
path: root/src/plugins/phonon
diff options
context:
space:
mode:
authorFrans Englich <frans.englich@nokia.com>2009-08-17 13:40:04 (GMT)
committerFrans Englich <frans.englich@nokia.com>2009-08-17 14:42:33 (GMT)
commitd10291404e189e3a57cda7fac6f69aa5f9629cae (patch)
tree72628097f224c6087ff93990ec4d6723b94e5090 /src/plugins/phonon
parent1ef8ddc53d3d2512bbe5afbd2e6fb26cae206944 (diff)
downloadQt-d10291404e189e3a57cda7fac6f69aa5f9629cae.zip
Qt-d10291404e189e3a57cda7fac6f69aa5f9629cae.tar.gz
Qt-d10291404e189e3a57cda7fac6f69aa5f9629cae.tar.bz2
Refactor the media object such that we can do both video and sound.
As per discussions with Gareth.
Diffstat (limited to 'src/plugins/phonon')
-rw-r--r--src/plugins/phonon/mmf/mmf.pro27
1 files changed, 16 insertions, 11 deletions
diff --git a/src/plugins/phonon/mmf/mmf.pro b/src/plugins/phonon/mmf/mmf.pro
index ee2d3f9..266c3db 100644
--- a/src/plugins/phonon/mmf/mmf.pro
+++ b/src/plugins/phonon/mmf/mmf.pro
@@ -21,17 +21,22 @@ phonon_mmf_audio_drm {
LIBS += -lmediaclientaudio.lib
}
-HEADERS += \
- $$PHONON_MMF_DIR/audiooutput.h \
- $$PHONON_MMF_DIR/backend.h \
- $$PHONON_MMF_DIR/mediaobject.h \
- $$PHONON_MMF_DIR/utils.h
-
-SOURCES += \
- $$PHONON_MMF_DIR/audiooutput.cpp \
- $$PHONON_MMF_DIR/backend.cpp \
- $$PHONON_MMF_DIR/mediaobject.cpp \
- $$PHONON_MMF_DIR/utils.cpp
+HEADERS += \
+ $$PHONON_MMF_DIR/abstractplayer.h \
+ $$PHONON_MMF_DIR/audiooutput.h \
+ $$PHONON_MMF_DIR/audioplayer.h \
+ $$PHONON_MMF_DIR/backend.h \
+ $$PHONON_MMF_DIR/mediaobject.h \
+ $$PHONON_MMF_DIR/utils.h \
+ $$PHONON_MMF_DIR/mmf_videoplayer.h
+
+SOURCES += \
+ $$PHONON_MMF_DIR/audiooutput.cpp \
+ $$PHONON_MMF_DIR/audioplayer.cpp \
+ $$PHONON_MMF_DIR/backend.cpp \
+ $$PHONON_MMF_DIR/mediaobject.cpp \
+ $$PHONON_MMF_DIR/utils.cpp \
+ $$PHONON_MMF_DIR/mmf_videoplayer.cpp
# This is needed for having the .qtplugin file properly created on Symbian.
QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/phonon_backend