Merged recognizer changes with abstraction for audio / video playback.

Audio playback now working to the same extent as prior to the abstraction, with one regression: the initial volume level in the UI is set to zero, although playback is audible.

Some cleanup is required:

- Functionality common to AudioPlayer and VideoPlayer (e.g. tick timer, changeState function) should be moved into AbstractPlayer.

- Files may be opened by multiple instances of MediaObject at at time.  For example, the musicplayer example app uses one instance to read file metadata, and one for the actual playback.  In order to avoid KErrInUse errors from the file server, files must be opened with an EShare* flag and passed around by handle.  At present this is done in a slightly hacky way (i.e. AbstractPlayer::setSource is renamed to setFileSource).

- The pointer held by MediaObject::m_player must be checked for nullness in many of the public API calls.  This could be made cleaner by implementing a stub derivation of AbstractPlayer, which returns sensible default values.  Note that, if functionality such as tick timer handling is going to be pushed upwards from AudioPlayer / VideoPlayer, we should add an intermediate class to the hierarchy so that the overhead of constructing DummyPlayer objects is minimised.

At present, media type (audio / video) is only recognised from file streams - this needs to be extended to include HTTP streaming aswell.

1 files changed, 19 insertions, 14 deletions

diff --git a/src/plugins/phonon/mmf/mmf.pro b/src/plugins/phonon/mmf/mmf.pro
index 3c8a721..0f00832 100644
--- a/src/plugins/phonon/mmf/mmf.pro
+++ b/src/plugins/phonon/mmf/mmf.pro
@@ -21,20 +21,25 @@ 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
-
-LIBS += -lefsrv		# For file server
-LIBS += -lapgrfx.lib	# For recognizer
+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/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/videoplayer.cpp
+
+LIBS += -lefsrv				# For file server
+LIBS += -lapgrfx.lib -lapmime.lib	# For recognizer
 
 # This is needed for having the .qtplugin file properly created on Symbian.
 QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/phonon_backend