Refactored object tree dumping framework into a separate DLL

3 files changed, 109 insertions, 88 deletions

diff --git a/src/plugins/phonon/mmf/mmf.pro b/src/plugins/phonon/mmf/mmf.pro
index 4496feb..dc18d20 100644
--- a/src/plugins/phonon/mmf/mmf.pro
+++ b/src/plugins/phonon/mmf/mmf.pro
@@ -1,89 +1,3 @@
-# MMF Phonon backend
-
-QT += phonon
-TARGET = phonon_mmf
-PHONON_MMF_DIR = $$QT_SOURCE_TREE/src/3rdparty/phonon/mmf
-
-# Uncomment the following line in order to use the CDrmPlayerUtility client
-# API for audio playback, rather than CMdaAudioPlayerUtility.
-#CONFIG += phonon_mmf_audio_drm
-
-phonon_mmf_audio_drm {
-    LIBS += -lDrmAudioPlayUtility
-
-    # In the internal 5th SDK, DrmAudioSamplePlayer.h is placed in this
-    # folder, as opposed to the public, where it is placed in
-    # epoc32/include.
-    INCLUDEPATH *= /epoc32/include/osextensions
-
-    DEFINES += QT_PHONON_MMF_AUDIO_DRM
-} else {
-    LIBS += -lmediaclientaudio
-}
-
-HEADERS +=                                           \
-           $$PHONON_MMF_DIR/abstractplayer.h         \
-           $$PHONON_MMF_DIR/abstractmediaplayer.h    \
-           $$PHONON_MMF_DIR/audiooutput.h            \
-           $$PHONON_MMF_DIR/audioplayer.h            \
-           $$PHONON_MMF_DIR/backend.h                \
-           $$PHONON_MMF_DIR/defs.h                   \
-           $$PHONON_MMF_DIR/dummyplayer.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
-
-SOURCES +=                                           \
-           $$PHONON_MMF_DIR/abstractplayer.cpp       \
-	   $$PHONON_MMF_DIR/abstractmediaplayer.cpp  \
-           $$PHONON_MMF_DIR/audiooutput.cpp          \
-           $$PHONON_MMF_DIR/audioplayer.cpp          \
-           $$PHONON_MMF_DIR/backend.cpp              \
-           $$PHONON_MMF_DIR/dummyplayer.cpp          \
-           $$PHONON_MMF_DIR/mediaobject.cpp          \
-           $$PHONON_MMF_DIR/utils.cpp                \
-           $$PHONON_MMF_DIR/videooutput.cpp          \
-           $$PHONON_MMF_DIR/videoplayer.cpp          \
-           $$PHONON_MMF_DIR/videowidget.cpp
-
-# This is not mmfphonon-specific, and should be factored out into a separate
-# library (QtCore?) at a later date
-debug {
-HEADERS +=                                           \
-           $$PHONON_MMF_DIR/objectdump.h             \
-	   $$PHONON_MMF_DIR/objectdump_symbian.h     \
-           $$PHONON_MMF_DIR/objecttree.h
-
-SOURCES +=                                           \
-           $$PHONON_MMF_DIR/objectdump.cpp           \
-	   $$PHONON_MMF_DIR/objectdump_symbian.cpp   \
-           $$PHONON_MMF_DIR/objecttree.cpp
-
-}
-	   
-LIBS += -lmediaclientvideo		# For CVideoPlayerUtility
-LIBS += -lcone				# For CCoeEnv
-LIBS += -lws32				# For RWindow
-LIBS += -lefsrv                     	# For file server
-LIBS += -lapgrfx -lapmime	   	# For recognizer
-
-# This is needed for having the .qtplugin file properly created on Symbian.
-QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/phonon_backend
-
-target.path = $$[QT_INSTALL_PLUGINS]/phonon_backend
-INSTALLS += target
-
-include(../../qpluginbase.pri)
-
-# We need this to be able to resolve ambiguity for VideoPlayer.h. Phonon and
-# the SDK has the header.
-INCLUDEPATH *= /epoc32
-
-# Temporary steal one of the reserved, until we know that this MMF plugin is
-# turning into something at all.
-symbian:TARGET.UID3=0x2001E627
+TEMPLATE	= subdirs
+SUBDIRS		= objectdump plugin
 
diff --git a/src/plugins/phonon/mmf/objectdump/objectdump.pro b/src/plugins/phonon/mmf/objectdump/objectdump.pro
new file mode 100644
index 0000000..b9e2017
--- /dev/null
+++ b/src/plugins/phonon/mmf/objectdump/objectdump.pro
@@ -0,0 +1,28 @@
+TEMPLATE = lib
+TARGET = objectdump
+OBJECTDUMP_DIR = $$QT_SOURCE_TREE/src/3rdparty/phonon/mmf/objectdump
+
+CONFIG += dll
+
+DEFINES += OBJECTDUMP_LIBRARY
+
+HEADERS +=					\
+	$$OBJECTDUMP_DIR/objectdump_global.h 	\
+	$$OBJECTDUMP_DIR/objectdump.h		\
+	$$OBJECTDUMP_DIR/objecttree.h
+
+SOURCES += 					\
+	$$OBJECTDUMP_DIR/objectdump.cpp 	\
+	$$OBJECTDUMP_DIR/objecttree.cpp
+
+symbian {
+	HEADERS += $$OBJECTDUMP_DIR/objectdump_symbian.h
+	SOURCES += $$OBJECTDUMP_DIR/objectdump_symbian.cpp 
+
+	LIBS += -lcone
+	LIBS += -lws32
+
+	TARGET.CAPABILITY = all -tcb
+} else {
+	SOURCES += $$OBJECTDUMP_DIR/objectdump_stub.cpp
+}
diff --git a/src/plugins/phonon/mmf/plugin/plugin.pro b/src/plugins/phonon/mmf/plugin/plugin.pro
new file mode 100644
index 0000000..418d354
--- /dev/null
+++ b/src/plugins/phonon/mmf/plugin/plugin.pro
@@ -0,0 +1,79 @@
+# MMF Phonon backend
+
+QT += phonon
+TARGET = phonon_mmf
+PHONON_MMF_DIR = $$QT_SOURCE_TREE/src/3rdparty/phonon/mmf
+
+# Uncomment the following line in order to use the CDrmPlayerUtility client
+# API for audio playback, rather than CMdaAudioPlayerUtility.
+#CONFIG += phonon_mmf_audio_drm
+
+phonon_mmf_audio_drm {
+    LIBS += -lDrmAudioPlayUtility
+
+    # In the internal 5th SDK, DrmAudioSamplePlayer.h is placed in this
+    # folder, as opposed to the public, where it is placed in
+    # epoc32/include.
+    INCLUDEPATH *= /epoc32/include/osextensions
+
+    DEFINES += QT_PHONON_MMF_AUDIO_DRM
+} else {
+    LIBS += -lmediaclientaudio
+}
+
+HEADERS +=                                           \
+           $$PHONON_MMF_DIR/abstractplayer.h         \
+           $$PHONON_MMF_DIR/abstractmediaplayer.h    \
+           $$PHONON_MMF_DIR/audiooutput.h            \
+           $$PHONON_MMF_DIR/audioplayer.h            \
+           $$PHONON_MMF_DIR/backend.h                \
+           $$PHONON_MMF_DIR/defs.h                   \
+           $$PHONON_MMF_DIR/dummyplayer.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
+
+SOURCES +=                                           \
+           $$PHONON_MMF_DIR/abstractplayer.cpp       \
+	   $$PHONON_MMF_DIR/abstractmediaplayer.cpp  \
+           $$PHONON_MMF_DIR/audiooutput.cpp          \
+           $$PHONON_MMF_DIR/audioplayer.cpp          \
+           $$PHONON_MMF_DIR/backend.cpp              \
+           $$PHONON_MMF_DIR/dummyplayer.cpp          \
+           $$PHONON_MMF_DIR/mediaobject.cpp          \
+           $$PHONON_MMF_DIR/utils.cpp                \
+           $$PHONON_MMF_DIR/videooutput.cpp          \
+           $$PHONON_MMF_DIR/videoplayer.cpp          \
+           $$PHONON_MMF_DIR/videowidget.cpp
+
+debug {
+	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
+
+# This is needed for having the .qtplugin file properly created on Symbian.
+QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/phonon_backend
+
+target.path = $$[QT_INSTALL_PLUGINS]/phonon_backend
+INSTALLS += target
+
+include(../../../qpluginbase.pri)
+
+# We need this to be able to resolve ambiguity for VideoPlayer.h. Phonon and
+# the SDK has the header.
+INCLUDEPATH *= /epoc32
+
+# Temporary steal one of the reserved, until we know that this MMF plugin is
+# turning into something at all.
+symbian:TARGET.UID3=0x2001E627
+