Moved s60mmftrace.h header out of mmf subdirectory

This allows the trace macros to be used by other Symbian multimedia backends.

Reviewed-by: TrustMe

21 files changed, 34 insertions, 30 deletions

diff --git a/plugins/multimedia/symbian/mmf/audiosource/s60audiocaptureservice.cpp b/plugins/multimedia/symbian/mmf/audiosource/s60audiocaptureservice.cpp
index 1c29044706..39db63de4f 100644
--- a/plugins/multimedia/symbian/mmf/audiosource/s60audiocaptureservice.cpp
+++ b/plugins/multimedia/symbian/mmf/audiosource/s60audiocaptureservice.cpp
@@ -45,7 +45,7 @@
 #include "s60audioencodercontrol.h"
 #include "s60audiomediarecordercontrol.h"
 #include "s60audiocontainercontrol.h"
-#include "s60mmftrace.h"
+#include "s60mmtrace.h"
 
 S60AudioCaptureService::S60AudioCaptureService(QObject *parent):
     QMediaService(parent)
diff --git a/plugins/multimedia/symbian/mmf/audiosource/s60audiocapturesession.cpp b/plugins/multimedia/symbian/mmf/audiosource/s60audiocapturesession.cpp
index cd61ca88e7..82a543f00a 100644
--- a/plugins/multimedia/symbian/mmf/audiosource/s60audiocapturesession.cpp
+++ b/plugins/multimedia/symbian/mmf/audiosource/s60audiocapturesession.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include "s60audiocapturesession.h"
-#include "s60mmftrace.h"
+#include "s60mmtrace.h"
 #include <QtCore/qurl.h>
 #include <QDir>
 
diff --git a/plugins/multimedia/symbian/mmf/audiosource/s60audiocontainercontrol.cpp b/plugins/multimedia/symbian/mmf/audiosource/s60audiocontainercontrol.cpp
index bcb549a4fa..54eec244eb 100644
--- a/plugins/multimedia/symbian/mmf/audiosource/s60audiocontainercontrol.cpp
+++ b/plugins/multimedia/symbian/mmf/audiosource/s60audiocontainercontrol.cpp
@@ -41,7 +41,7 @@
 
 #include "s60audiocontainercontrol.h"
 #include "s60audiocapturesession.h"
-#include "s60mmftrace.h"
+#include "s60mmtrace.h"
 
 S60AudioContainerControl::S60AudioContainerControl(QObject *parent)
     : QMediaContainerControl(parent)
diff --git a/plugins/multimedia/symbian/mmf/audiosource/s60audioencodercontrol.cpp b/plugins/multimedia/symbian/mmf/audiosource/s60audioencodercontrol.cpp
index 19fec7d329..cc058fbe38 100644
--- a/plugins/multimedia/symbian/mmf/audiosource/s60audioencodercontrol.cpp
+++ b/plugins/multimedia/symbian/mmf/audiosource/s60audioencodercontrol.cpp
@@ -41,7 +41,7 @@
 
 #include "s60audioencodercontrol.h"
 #include "s60audiocapturesession.h"
-#include "s60mmftrace.h"
+#include "s60mmtrace.h"
 
 #include "qaudioformat.h"
 
diff --git a/plugins/multimedia/symbian/mmf/audiosource/s60audioendpointselector.cpp b/plugins/multimedia/symbian/mmf/audiosource/s60audioendpointselector.cpp
index 2643d3b14e..ac2b02db59 100644
--- a/plugins/multimedia/symbian/mmf/audiosource/s60audioendpointselector.cpp
+++ b/plugins/multimedia/symbian/mmf/audiosource/s60audioendpointselector.cpp
@@ -41,7 +41,7 @@
 
 #include "s60audiocapturesession.h"
 #include "s60audioendpointselector.h"
-#include "s60mmftrace.h"
+#include "s60mmtrace.h"
 
 #include <qaudiodeviceinfo.h>
 
diff --git a/plugins/multimedia/symbian/mmf/audiosource/s60audiomediarecordercontrol.cpp b/plugins/multimedia/symbian/mmf/audiosource/s60audiomediarecordercontrol.cpp
index b6ece17d95..2c7c96e78e 100644
--- a/plugins/multimedia/symbian/mmf/audiosource/s60audiomediarecordercontrol.cpp
+++ b/plugins/multimedia/symbian/mmf/audiosource/s60audiomediarecordercontrol.cpp
@@ -41,7 +41,7 @@
 
 #include "s60audiomediarecordercontrol.h"
 #include "s60audiocapturesession.h"
-#include "s60mmftrace.h"
+#include "s60mmtrace.h"
 
 S60AudioMediaRecorderControl::S60AudioMediaRecorderControl(QObject *session, QObject *parent)
     :QMediaRecorderControl(parent), m_state(QMediaRecorder::StoppedState)
diff --git a/plugins/multimedia/symbian/mmf/mediaplayer/s60audioplayersession.cpp b/plugins/multimedia/symbian/mmf/mediaplayer/s60audioplayersession.cpp
index 2b5150e516..82125da719 100644
--- a/plugins/multimedia/symbian/mmf/mediaplayer/s60audioplayersession.cpp
+++ b/plugins/multimedia/symbian/mmf/mediaplayer/s60audioplayersession.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include "s60audioplayersession.h"
-#include "s60mmftrace.h"
+#include "s60mmtrace.h"
 #include <QtCore/qdebug.h>
 #include <QtCore/qvariant.h>
 
diff --git a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediametadataprovider.cpp b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediametadataprovider.cpp
index 9c4c16effa..2d23db0434 100644
--- a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediametadataprovider.cpp
+++ b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediametadataprovider.cpp
@@ -42,7 +42,7 @@
 #include "s60mediametadataprovider.h"
 #include "s60mediaplayercontrol.h"
 #include "s60mediaplayersession.h"
-#include "s60mmftrace.h"
+#include "s60mmtrace.h"
 #include <QtCore/qdebug.h>
 
 /*!
diff --git a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayeraudioendpointselector.cpp b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayeraudioendpointselector.cpp
index abe52fd5cc..cdcc9f3841 100644
--- a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayeraudioendpointselector.cpp
+++ b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayeraudioendpointselector.cpp
@@ -42,7 +42,7 @@
 #include "s60mediaplayercontrol.h"
 #include "s60mediaplayersession.h"
 #include "s60mediaplayeraudioendpointselector.h"
-#include "s60mmftrace.h"
+#include "s60mmtrace.h"
 
 #include <QtGui/QIcon>
 #include <QtCore/QDebug>
diff --git a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayercontrol.cpp b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayercontrol.cpp
index 5b38d773f9..dd0aac6877 100644
--- a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayercontrol.cpp
+++ b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayercontrol.cpp
@@ -42,7 +42,7 @@
 
 #include "s60mediaplayercontrol.h"
 #include "s60mediaplayersession.h"
-#include "s60mmftrace.h"
+#include "s60mmtrace.h"
 
 #include <QtCore/qdir.h>
 #include <QtCore/qurl.h>
diff --git a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayerservice.cpp b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayerservice.cpp
index d623d727ee..11f9373141 100644
--- a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayerservice.cpp
+++ b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayerservice.cpp
@@ -54,7 +54,7 @@
 #include "s60mediaplayeraudioendpointselector.h"
 #include "s60medianetworkaccesscontrol.h"
 #include "s60mediastreamcontrol.h"
-#include "s60mmftrace.h"
+#include "s60mmtrace.h"
 
 #include <qmediaplaylistnavigator.h>
 #include <qmediaplaylist.h>
diff --git a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayersession.cpp b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayersession.cpp
index 76a4fca51a..cc9ddf56a6 100644
--- a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayersession.cpp
+++ b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayersession.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include "s60mediaplayersession.h"
-#include "s60mmftrace.h"
+#include "s60mmtrace.h"
 
 #include <QtCore/qdebug.h>
 #include <QtCore/qdir.h>
diff --git a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediarecognizer.cpp b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediarecognizer.cpp
index 314b797d10..a0bf0b35fc 100644
--- a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediarecognizer.cpp
+++ b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediarecognizer.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include "s60mediarecognizer.h"
-#include "s60mmftrace.h"
+#include "s60mmtrace.h"
 #include <e32def.h>
 #include <e32cmn.h>
 #include <QtCore/qurl.h>
diff --git a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediastreamcontrol.cpp b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediastreamcontrol.cpp
index f222e0a0c0..61a8e4109e 100644
--- a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediastreamcontrol.cpp
+++ b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediastreamcontrol.cpp
@@ -42,7 +42,7 @@
 #include "s60mediastreamcontrol.h"
 #include "s60mediaplayersession.h"
 #include "s60mediaplayercontrol.h"
-#include "s60mmftrace.h"
+#include "s60mmtrace.h"
 #include <qmediastreamscontrol.h>
 
 #include <QtCore/qdir.h>
diff --git a/plugins/multimedia/symbian/mmf/mediaplayer/s60videoplayersession.cpp b/plugins/multimedia/symbian/mmf/mediaplayer/s60videoplayersession.cpp
index d9e7b31df0..182132e45f 100644
--- a/plugins/multimedia/symbian/mmf/mediaplayer/s60videoplayersession.cpp
+++ b/plugins/multimedia/symbian/mmf/mediaplayer/s60videoplayersession.cpp
@@ -45,7 +45,7 @@
 #include "s60videowidgetdisplay.h"
 #include "s60videowindowcontrol.h"
 #include "s60videowindowdisplay.h"
-#include "s60mmftrace.h"
+#include "s60mmtrace.h"
 
 #include <QtCore/QTimer>
 #include <QtGui/QApplication>
diff --git a/plugins/multimedia/symbian/mmf/mmf.pro b/plugins/multimedia/symbian/mmf/mmf.pro
index 2bae03e596..4b335c194f 100644
--- a/plugins/multimedia/symbian/mmf/mmf.pro
+++ b/plugins/multimedia/symbian/mmf/mmf.pro
@@ -9,6 +9,7 @@ qtAddLibrary(QtMultimediaKit)
 #includes here so that all defines are added here also
 include(mediaplayer/mediaplayer_s60.pri)
 include(radio/radio.pri)
+include(../trace/trace.pri)
 
 QT += network
 
@@ -24,7 +25,6 @@ INCLUDEPATH += . \
     $${SOURCE_DIR}/src/multimedia \
     $${SOURCE_DIR}/src/multimedia/audio \
     $${SOURCE_DIR}/src/multimedia/video \
-    $${SOURCE_DIR}/plugins/multimedia/symbian/mmf/inc \
     $${SOURCE_DIR}
 
 
diff --git a/plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_31.cpp b/plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_31.cpp
index 3d965bf10e..595a8ba62c 100644
--- a/plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_31.cpp
+++ b/plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_31.cpp
@@ -41,7 +41,7 @@
 
 #include "s60radiotunercontrol_31.h"
 #include "s60radiotunerservice.h"
-#include "s60mmftrace.h"
+#include "s60mmtrace.h"
 
 #include <QFile>
 
diff --git a/plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_since32.cpp b/plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_since32.cpp
index 71d83293ae..65381fd368 100644
--- a/plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_since32.cpp
+++ b/plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_since32.cpp
@@ -41,7 +41,7 @@
 
 #include "s60radiotunercontrol_since32.h"
 #include "s60radiotunerservice.h"
-#include "s60mmftrace.h"
+#include "s60mmtrace.h"
 
 #include <RadioFmTunerUtility.h>
 
diff --git a/plugins/multimedia/symbian/mmf/radio/s60radiotunerservice.cpp b/plugins/multimedia/symbian/mmf/radio/s60radiotunerservice.cpp
index 3ab12b5b1e..87859b8f22 100644
--- a/plugins/multimedia/symbian/mmf/radio/s60radiotunerservice.cpp
+++ b/plugins/multimedia/symbian/mmf/radio/s60radiotunerservice.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include "s60radiotunerservice.h"
-#include "s60mmftrace.h"
+#include "s60mmtrace.h"
 
 
 S60RadioTunerService::S60RadioTunerService(QObject *parent)
diff --git a/plugins/multimedia/symbian/mmf/inc/s60mmftrace.h b/plugins/multimedia/symbian/trace/s60mmtrace.h
index 6516c9833f..242bad59d8 100644
--- a/plugins/multimedia/symbian/mmf/inc/s60mmftrace.h
+++ b/plugins/multimedia/symbian/trace/s60mmtrace.h
@@ -39,24 +39,24 @@
 **
 ****************************************************************************/
 
-#ifndef S60MMFTRACE_H
-#define S60MMFTRACE_H
+#ifndef S60MMTRACE_H
+#define S60MMTRACE_H
 
 #ifdef _DEBUG
-#define MMF_ENABLE_TRACE
+#define QTMMK_BACKEND_ENABLE_TRACE
 #endif
 
-//#define MMF_ENABLE_VERBOSE_TRACE
+//#define QTMMK_BACKEND_ENABLE_VERBOSE_TRACE
 
-#ifdef MMF_ENABLE_TRACE
+#ifdef QTMMK_BACKEND_ENABLE_TRACE
 
 #   include <QtCore/QDebug>
-#   define TRACE(args) qDebug() << "[QtMultimediaKit mmf]" << args
-#   ifdef MMF_ENABLE_VERBOSE_TRACE
+#   define TRACE(args) qDebug() << "[QtMultimediaKit]" << args
+#   ifdef QTMMK_BACKEND_ENABLE_VERBOSE_TRACE
 #       define VERBOSE_TRACE(args) TRACE(args)
-#   else // MMF_ENABLE_VERBOSE_TRACE
+#   else // QTMMK_BACKEND_ENABLE_VERBOSE_TRACE
 #       define VERBOSE_TRACE(args)
-#   endif // MMF_ENABLE_VERBOSE_TRACE
+#   endif // QTMMK_BACKEND_ENABLE_VERBOSE_TRACE
 
     template <typename T>
     inline void *qtVoidPtr(T *ptr)
@@ -64,9 +64,10 @@
 
 #   define qtThisPtr() qtVoidPtr(this)
 
-#else // MMF_ENABLE_TRACE
+#else // QTMMK_BACKEND_ENABLE_TRACE
 #   define TRACE(args)
 #   define VERBOSE_TRACE(args)
 #endif
 
-#endif // S60MMFTRACE_H
+#endif // S60MMTRACE_H
+
diff --git a/plugins/multimedia/symbian/trace/trace.pri b/plugins/multimedia/symbian/trace/trace.pri
new file mode 100644
index 0000000000..bb852550b7
--- /dev/null
+++ b/plugins/multimedia/symbian/trace/trace.pri
@@ -0,0 +1,3 @@
+INCLUDEPATH += $$PWD
+HEADERS += $$PWD/s60mmtrace.h
+