Cleaned up trace in Symbian MMF backend

* Replaced RDebug-based macros with qDebug versions, allowing use of Qt pretty-printing * Removed all trace from trivial accessor functions * Removed verbose / redundant trace Reviewed-by: TrustMe
author: Gareth Stockwell <gareth.stockwell@accenture.com> 2011-10-06 14:59:42 +0100
committer: Gareth Stockwell <gareth.stockwell@accenture.com> 2011-10-06 15:50:00 +0100
commit: 3dc5b580ba8bc8fb489c88975bb03cfee7013ed9 (patch)
tree: 807a703f744b7542d5e7feabc6cfe0ca830cfd87
parent: 2829240beca99d57e94b52b7b3efab3c328f0d8e (diff)
16 files changed, 284 insertions, 918 deletions
diff --git a/plugins/multimedia/symbian/mmf/audiosource/s60audiocaptureservice.cpp b/plugins/multimedia/symbian/mmf/audiosource/s60audiocaptureservice.cpp
index f4357a0237..1c29044706 100644
--- a/plugins/multimedia/symbian/mmf/audiosource/s60audiocaptureservice.cpp
+++ b/plugins/multimedia/symbian/mmf/audiosource/s60audiocaptureservice.cpp
@@ -39,60 +39,57 @@
 **
 ****************************************************************************/
 
-#include "DebugMacros.h"
-#include <QDebug>
-
 #include "s60audiocaptureservice.h"
 #include "s60audiocapturesession.h"
 #include "s60audioendpointselector.h"
 #include "s60audioencodercontrol.h"
 #include "s60audiomediarecordercontrol.h"
 #include "s60audiocontainercontrol.h"
+#include "s60mmftrace.h"
 
 S60AudioCaptureService::S60AudioCaptureService(QObject *parent):
     QMediaService(parent)
 {
-    DP0("S60AudioCaptureService::S60AudioCaptureService +++");
+    TRACE("S60AudioCaptureService::S60AudioCaptureService" << qtThisPtr());
 
     m_session = new S60AudioCaptureSession(this);
     m_encoderControl = new S60AudioEncoderControl(m_session,this);
     m_recorderControl = new S60AudioMediaRecorderControl(m_session,this);
     m_endpointSelector = new S60AudioEndpointSelector(m_session,this); 
     m_containerControl = new S60AudioContainerControl(m_session, this);
-
-    DP0("S60AudioCaptureService::S60AudioCaptureService ---");
 }
 
 S60AudioCaptureService::~S60AudioCaptureService()
 {
-    DP0("S60AudioCaptureService::~S60AudioCaptureService +++");
-    DP0("S60AudioCaptureService::~S60AudioCaptureService ---");
+    TRACE("S60AudioCaptureService::~S60AudioCaptureService" << qtThisPtr());
 }
 
 QMediaControl *S60AudioCaptureService::requestControl(const char *name)
 {
-    DP0("S60AudioCaptureService::requestControl");
+    QMediaControl *result = 0;
 
     if (qstrcmp(name,QMediaRecorderControl_iid) == 0)
-        return m_recorderControl;
+        result = m_recorderControl;
 
     if (qstrcmp(name,QAudioEncoderControl_iid) == 0)
-        return m_encoderControl;
+        result =  m_encoderControl;
 
     if (qstrcmp(name,QAudioEndpointSelector_iid) == 0)
-        return m_endpointSelector;
+        result =  m_endpointSelector;
     
     if (qstrcmp(name,QMediaContainerControl_iid) == 0)
-        return m_containerControl;
+        result =  m_containerControl;
 
-    return 0;
+    TRACE("S60AudioCaptureService::requestControl" << qtThisPtr()
+          << "name" << name << "result" << result);
+
+    return result;
 }
 
 void S60AudioCaptureService::releaseControl(QMediaControl *control)
 {
-    DP0("S60AudioCaptureService::releaseControl +++");
+    TRACE("S60AudioCaptureService::releaseControl" << qtThisPtr()
+          << "control" << control);
 
     Q_UNUSED(control)
-
-    DP0("S60AudioCaptureService::releaseControl ---");
 }
diff --git a/plugins/multimedia/symbian/mmf/audiosource/s60audiocapturesession.cpp b/plugins/multimedia/symbian/mmf/audiosource/s60audiocapturesession.cpp
index e80549afee..cd61ca88e7 100644
--- a/plugins/multimedia/symbian/mmf/audiosource/s60audiocapturesession.cpp
+++ b/plugins/multimedia/symbian/mmf/audiosource/s60audiocapturesession.cpp
@@ -39,10 +39,8 @@
 **
 ****************************************************************************/
 
-#include "DebugMacros.h"
-
 #include "s60audiocapturesession.h"
-#include <QtCore/qdebug.h>
+#include "s60mmftrace.h"
 #include <QtCore/qurl.h>
 #include <QDir>
 
@@ -71,7 +69,7 @@ S60AudioCaptureSession::S60AudioCaptureSession(QObject *parent):
     , m_error(QMediaRecorder::NoError)
     , m_isMuted(false)
 {
-   DP0("S60AudioCaptureSession::S60AudioCaptureSession +++");
+    TRACE("S60AudioCaptureSession::S60AudioCaptureSession" << qtThisPtr());
 #ifdef AUDIOINPUT_ROUTING
     m_audioInput = NULL;
     m_setActiveEndPoint = FALSE;
@@ -79,14 +77,10 @@ S60AudioCaptureSession::S60AudioCaptureSession(QObject *parent):
 #endif //AUDIOINPUT_ROUTING
     TRAPD(err, initializeSessionL());
     setError(err);
-
-    DP0("S60AudioCaptureSession::S60AudioCaptureSession ---");
 }
 
 void S60AudioCaptureSession::initializeSessionL()
 {
-    DP0("S60AudioCaptureSession::initializeSessionL +++");
-
     m_recorderUtility = CMdaAudioRecorderUtility::NewL(*this, 0, EMdaPriorityNormal, EMdaPriorityPreferenceTimeAndQuality);
     updateAudioContainersL();
     populateAudioCodecsDataL();
@@ -97,22 +91,19 @@ void S60AudioCaptureSession::initializeSessionL()
     User::LeaveIfError(m_fsSession.Connect());
     m_captureState = EInitialized;
     emit stateChanged(m_captureState);
-
-    DP0("S60AudioCaptureSession::initializeSessionL ---");
 }
 
 void S60AudioCaptureSession::setError(TInt aError)
 {
-    DP0("S60AudioCaptureSession::setError +++");
-
-    DP1("S60AudioCaptureSession::setError:", aError);
-
     if (aError == KErrNone)
         return;
 
     m_error = aError;
     QMediaRecorder::Error recorderError = fromSymbianErrorToMultimediaError(m_error);
 
+    TRACE("S60AudioCaptureSession::setError" << qtThisPtr()
+          << "error" << m_error << "recorderError" << recorderError);
+
     // TODO: fix to user friendly string at some point
     // These error string are only dev usable
     QString symbianError;
@@ -120,16 +111,10 @@ void S60AudioCaptureSession::setError(TInt aError)
     symbianError.append(QString::number(m_error));
     stop();
     emit error(recorderError, symbianError);
-
-    DP0("S60AudioCaptureSession::setError ---");
 }
 
 QMediaRecorder::Error S60AudioCaptureSession::fromSymbianErrorToMultimediaError(int error)
 {
-    DP0("S60AudioCaptureSession::fromSymbianErrorToMultimediaError +++");
-
-    DP1("S60AudioCaptureSession::fromSymbianErrorToMultimediaError:", error);
-
     switch(error) {
     case KErrNoMemory:
     case KErrNotFound:
@@ -151,107 +136,90 @@ QMediaRecorder::Error S60AudioCaptureSession::fromSymbianErrorToMultimediaError(
         return QMediaRecorder::FormatError;
     case KErrNone:
     default:
-        DP0("S60AudioCaptureSession::fromSymbianErrorToMultimediaError: ---");
         return QMediaRecorder::NoError;
     }
 }
 
 S60AudioCaptureSession::~S60AudioCaptureSession()
 {
-    DP0("S60AudioCaptureSession::~S60AudioCaptureSession +++");
+    TRACE("S60AudioCaptureSession::~S60AudioCaptureSession" << qtThisPtr());
     //stop the utility before deleting it
     stop();
     if (m_recorderUtility)
         delete m_recorderUtility;
     m_fsSession.Close();
-    DP0("S60AudioCaptureSession::~S60AudioCaptureSession ---");
 }
 
 QAudioFormat S60AudioCaptureSession::format() const
 {
-    DP0("S60AudioCaptureSession::format");
-
     return m_format;
 }
 
 bool S60AudioCaptureSession::setFormat(const QAudioFormat &format)
 {
-    DP0("S60AudioCaptureSession::setFormat +++");
-
-    m_format = format;
-
-    DP0("S60AudioCaptureSession::setFormat ---");
-
+    if (format != m_format) {
+        TRACE("S60AudioCaptureSession::setFormat" << qtThisPtr()
+              << "sampleRate" << format.sampleRate()
+              << "channelCount" << format.channelCount()
+              << "sampleSize" << format.sampleSize()
+              << "codec" << format.codec()
+              << "byteOrder" << format.byteOrder()
+              << "sampleType" << format.sampleType());
+        m_format = format;
+    }
     return true;
 }
 
 QAudioEncoderSettings S60AudioCaptureSession::settings() const
 {
-    DP0("S60AudioCaptureSession::settings");
-
     return m_audioEncoderSettings;
 }
 
-bool S60AudioCaptureSession::setEncoderSettings(const QAudioEncoderSettings &setting)
+bool S60AudioCaptureSession::setEncoderSettings(const QAudioEncoderSettings &settings)
 {
-    DP0("S60AudioCaptureSession::setEncoderSettings +++");
-
-    m_audioEncoderSettings = setting;
-
-    DP0("S60AudioCaptureSession::setEncoderSettings ---");
-
+    if (settings != m_audioEncoderSettings) {
+        TRACE("S60AudioCaptureSession::setEncoderSettings" << qtThisPtr()
+              << "encodingMode" << settings.encodingMode()
+              << "codec" << settings.codec()
+              << "bitRate" << settings.bitRate()
+              << "channelCount" << settings.channelCount()
+              << "sampleRate" << settings.sampleRate()
+              << "quality" << settings.quality());
+        m_audioEncoderSettings = settings;
+    }
     return true;
 }
 
 QStringList S60AudioCaptureSession::supportedAudioCodecs() const
 {
-    DP0("S60AudioCaptureSession::supportedAudioCodecs");
-
     return m_audioCodeclist.keys();
 }
 
 QStringList S60AudioCaptureSession::supportedAudioContainers() const
 {
-    DP0("S60AudioCaptureSession::supportedAudioContainers");
-
     return m_controllerIdMap.keys();
 }
 
 QString S60AudioCaptureSession::codecDescription(const QString &codecName)
 {
-    DP0("S60AudioCaptureSession::codecDescription +++");
-
-    if (m_audioCodeclist.keys().contains(codecName)) {
-
-        DP0("S60AudioCaptureSession::codecDescription ---");
+    if (m_audioCodeclist.keys().contains(codecName))
         return m_audioCodeclist.value(codecName).codecDescription;
-    }
-    else {
-        DP0("S60AudioCaptureSession::codecDescription ---");
-
+    else
         return QString();
-    }
 }
 
 QString S60AudioCaptureSession::audioContainerDescription(const QString &containerName)
 {
-    DP0("S60AudioCaptureSession::audioContainerDescription +++");
-
-    if (m_controllerIdMap.keys().contains(containerName)) {
-        DP0("S60AudioCaptureSession::audioContainerDescription ---");
-
+    if (m_controllerIdMap.keys().contains(containerName))
         return m_controllerIdMap.value(containerName).destinationFormatDescription;
-    }
-    else {
-        DP0("S60AudioCaptureSession::audioContainerDescription ---");
-
+    else
         return QString();
-    }
 }
 
 bool S60AudioCaptureSession::setAudioCodec(const QString &codecName)
 {
-    DP0("S60AudioCaptureSession::setAudioCodec");
+    TRACE("S60AudioCaptureSession::setAudioCodec" << qtThisPtr()
+          << "codec" << codecName);
 
     QStringList codecs = supportedAudioCodecs();
     if(codecs.contains(codecName)) {
@@ -263,7 +231,8 @@ bool S60AudioCaptureSession::setAudioCodec(const QString &codecName)
 
 bool S60AudioCaptureSession::setAudioContainer(const QString &containerMimeType)
 {
-    DP0("S60AudioCaptureSession::setAudioContainer");
+    TRACE("S60AudioCaptureSession::setAudioContainer" << qtThisPtr()
+          << "mimeType" << containerMimeType);
 
     QStringList containers = supportedAudioContainers();
     if (containerMimeType == "audio/mpeg")
@@ -280,28 +249,23 @@ bool S60AudioCaptureSession::setAudioContainer(const QString &containerMimeType)
 
 QString S60AudioCaptureSession::audioCodec() const
 {
-    DP0("S60AudioCaptureSession::audioCodec");
-
     return m_format.codec();
 }
 
 QString S60AudioCaptureSession::audioContainer() const
 {
-    DP0("S60AudioCaptureSession::audioContainer");
-
     return m_container;
 }
 
 QUrl S60AudioCaptureSession::outputLocation() const
 {
-    DP0("S60AudioCaptureSession::outputLocation");
-
     return m_sink;
 }
 
 bool S60AudioCaptureSession::setOutputLocation(const QUrl& sink)
 {
-    DP0("S60AudioCaptureSession::setOutputLocation");
+    TRACE("S60AudioCaptureSession::setOutputLocation" << qtThisPtr()
+          << "location" << sink);
 
     QString filename = QDir::toNativeSeparators(sink.toString());
     TPtrC16 path(reinterpret_cast<const TUint16*>(filename.utf16()));
@@ -318,8 +282,6 @@ bool S60AudioCaptureSession::setOutputLocation(const QUrl& sink)
 
 qint64 S60AudioCaptureSession::position() const
 {
-    DP0("S60AudioCaptureSession::position");
-
     if ((m_captureState != ERecording) || !m_recorderUtility)
         return 0;
 
@@ -328,7 +290,7 @@ qint64 S60AudioCaptureSession::position() const
 
 void S60AudioCaptureSession::prepareSinkL()
 {
-    DP0("S60AudioCaptureSession::prepareSinkL +++");
+    TRACE("S60AudioCaptureSession::prepareSinkL" << qtThisPtr());
 
     /* If m_outputLocation is null, set a default location */
     if (m_sink.isEmpty()) {
@@ -356,13 +318,11 @@ void S60AudioCaptureSession::prepareSinkL()
 
     sink.append(m_controllerIdMap.value(m_container).fileExtension);
     m_sink.setUrl(sink);
-
-    DP0("S60AudioCaptureSession::prepareSinkL ---");
 }
 
 void S60AudioCaptureSession::record()
 {
-    DP0("S60AudioCaptureSession::record +++");
+    TRACE("S60AudioCaptureSession::record" << qtThisPtr());
 
     if (!m_recorderUtility)
         return;
@@ -383,13 +343,11 @@ void S60AudioCaptureSession::record()
         m_captureState = ERecording;
         emit stateChanged(m_captureState);
     }
-
-    DP0("S60AudioCaptureSession::record ---");
 }
 
 void S60AudioCaptureSession::mute(bool muted)
 {
-    DP0("S60AudioCaptureSession::mute +++");
+    TRACE("S60AudioCaptureSession::mute" << qtThisPtr() << "muted" << muted);
 
     if (!m_recorderUtility)
         return;
@@ -400,20 +358,16 @@ void S60AudioCaptureSession::mute(bool muted)
         m_recorderUtility->SetGain(m_recorderUtility->MaxGain());
 
     m_isMuted = muted;
-
-    DP0("S60AudioCaptureSession::mute ---");
 }
 
 bool S60AudioCaptureSession::muted()
 {
-    DP0("S60AudioCaptureSession::muted");
-
     return m_isMuted;
 }
 
 void S60AudioCaptureSession::setDefaultSettings()
 {
-    DP0("S60AudioCaptureSession::setDefaultSettings +++");
+    TRACE("S60AudioCaptureSession::setDefaultSettings" << qtThisPtr());
 
     // Setting AMR to default format if supported
     if (m_controllerIdMap.count() > 0) {
@@ -432,13 +386,11 @@ void S60AudioCaptureSession::setDefaultSettings()
         }else
             m_format.setCodec(m_audioCodeclist.keys()[0]);
     }
-
-    DP0("S60AudioCaptureSession::setDefaultSettings ---");
 }
 
 void S60AudioCaptureSession::pause()
 {
-    DP0("S60AudioCaptureSession::pause +++");
+    TRACE("S60AudioCaptureSession::pause" << qtThisPtr());
 
     if (!m_recorderUtility)
         return;
@@ -447,13 +399,11 @@ void S60AudioCaptureSession::pause()
     m_recorderUtility->Stop();
     m_captureState = EPaused;
     emit stateChanged(m_captureState);
-
-    DP0("S60AudioCaptureSession::pause ---");
 }
 
 void S60AudioCaptureSession::stop()
 {
-    DP0("S60AudioCaptureSession::stop +++");
+    TRACE("S60AudioCaptureSession::stop" << qtThisPtr());
 
     if (!m_recorderUtility)
         return;
@@ -478,20 +428,19 @@ void S60AudioCaptureSession::stop()
 
 void S60AudioCaptureSession::initAudioInputs()
 {
-   DP0(" S60AudioCaptureSession::initAudioInputs +++");
+    TRACE("S60AudioCaptureSession::initAudioInputs" << qtThisPtr());
 
     m_audioInputs[S60AudioCaptureSession::microPhone] = QString("Microphone associated with the currently active speaker.");
     m_audioInputs[S60AudioCaptureSession::voiceCall] = QString("Audio stream associated with the current phone call.");
     m_audioInputs[S60AudioCaptureSession::fmRadio] = QString("Audio of the currently tuned FM radio station.");
-
-   DP0(" S60AudioCaptureSession::initAudioInputs ---");
 }
 
 #endif //AUDIOINPUT_ROUTING
 
 void S60AudioCaptureSession::setActiveEndpoint(const QString& audioEndpoint)
 {
-  DP0(" S60AudioCaptureSession::setActiveEndpoint +++");
+    TRACE("S60AudioCaptureSession::setActiveEndpoint" << qtThisPtr()
+          << "endpoint" << audioEndpoint);
 
     if (!m_audioInputs.keys().contains(audioEndpoint))
         return;
@@ -502,21 +451,15 @@ void S60AudioCaptureSession::setActiveEndpoint(const QString& audioEndpoint)
         m_setActiveEndPoint = TRUE;
 #endif
        }
-
-  DP0(" S60AudioCaptureSession::setActiveEndpoint ---");
 }
 
 QList<QString> S60AudioCaptureSession::availableEndpoints() const
 {
-    DP0(" S60AudioCaptureSession::availableEndpoints");
-
     return m_audioInputs.keys();
 }
 
 QString S60AudioCaptureSession::endpointDescription(const QString& name) const
 {
-  DP0(" S60AudioCaptureSession::endpointDescription +++");
-
     if (m_audioInputs.keys().contains(name))
         return m_audioInputs.value(name);
     return QString();
@@ -524,8 +467,6 @@ QString S60AudioCaptureSession::endpointDescription(const QString& name) const
 
 QString S60AudioCaptureSession::activeEndpoint() const
 {
-   DP0(" S60AudioCaptureSession::activeEndpoint");
-
     QString inputSourceName = NULL;
 #ifdef AUDIOINPUT_ROUTING
     if (m_audioInput) {
@@ -538,8 +479,6 @@ QString S60AudioCaptureSession::activeEndpoint() const
 
 QString S60AudioCaptureSession::defaultEndpoint() const
 {
-   DP0(" S60AudioCaptureSession::defaultEndpoint");
-
 #ifdef AUDIOINPUT_ROUTING
     return QString(S60AudioCaptureSession::microPhone);
 #else
@@ -551,8 +490,8 @@ QString S60AudioCaptureSession::defaultEndpoint() const
 
 void S60AudioCaptureSession::doSetAudioInputL(const QString& name)
 {
-   DP0(" S60AudioCaptureSession::doSetAudioInputL +++");
-   DP1(" S60AudioCaptureSession::doSetAudioInputL:", name);
+    TRACE("S60AudioCaptureSession::doSetAudioInputL" << qtThisPtr()
+          << "name" << name);
     TInt err(KErrNone);
 
     if (!m_recorderUtility)
@@ -582,15 +521,11 @@ void S60AudioCaptureSession::doSetAudioInputL(const QString& name)
             }
         }
         inputArray.Close();
-
-   DP0(" S60AudioCaptureSession::doSetAudioInputL ---");
 }
 
 
 QString S60AudioCaptureSession::qStringFromTAudioInputPreference(CAudioInput::TAudioInputPreference input) const
 {
-   DP0(" S60AudioCaptureSession::qStringFromTAudioInputPreference");
-
     if (input == CAudioInput::EVoiceCall)
         return S60AudioCaptureSession::voiceCall;
     else if (input == CAudioInput::EFMRadio)
@@ -604,7 +539,9 @@ QString S60AudioCaptureSession::qStringFromTAudioInputPreference(CAudioInput::TA
 void S60AudioCaptureSession::MoscoStateChangeEvent(CBase* aObject,
         TInt aPreviousState, TInt aCurrentState, TInt aErrorCode)
 {
-    DP0("S60AudioCaptureSession::MoscoStateChangeEvent +++");
+    TRACE("S60AudioCaptureSession::MoscoStateChangeEvent" << qtThisPtr()
+          << "prevState" << aPreviousState << "currentState" << aCurrentState
+          << "error" << aErrorCode);
 
     if (aErrorCode==KErrNone) {
 	    TRAPD(err, MoscoStateChangeEventL(aObject, aPreviousState, aCurrentState, NULL));
@@ -613,17 +550,11 @@ void S60AudioCaptureSession::MoscoStateChangeEvent(CBase* aObject,
     else {
         setError(aErrorCode);
     }
-  DP1("S60AudioCaptureSession::MoscoStateChangeEvent, aErrorCode:", aErrorCode);
-  DP0("S60AudioCaptureSession::MoscoStateChangeEvent ---");
 }
 
 void S60AudioCaptureSession::MoscoStateChangeEventL(CBase* aObject,
         TInt aPreviousState, TInt aCurrentState, TInt aErrorCode)
 {
-    DP0("S60AudioCaptureSession::MoscoStateChangeEventL +++");
-
-    DP5("S60AudioCaptureSession::MoscoStateChangeEventL - aPreviousState:", aPreviousState,
-            "aCurrentState:", aCurrentState, "aErrorCode:", aErrorCode);
 	if (aObject != m_recorderUtility)
 	    return;
 
@@ -653,14 +584,10 @@ void S60AudioCaptureSession::MoscoStateChangeEventL(CBase* aObject,
             break;
         }
 		}
-
-  DP0("S60AudioCaptureSession::MoscoStateChangeEventL ---");
 }
 
 void S60AudioCaptureSession::updateAudioContainersL()
 {
-    DP0("S60AudioCaptureSession::updateAudioContainersL +++");
-
     CMMFControllerPluginSelectionParameters* pluginParameters =
     	CMMFControllerPluginSelectionParameters::NewLC();
 	CMMFFormatSelectionParameters* formatParameters =
@@ -709,16 +636,11 @@ void S60AudioCaptureSession::updateAudioContainersL()
 		}
 	}
 	CleanupStack::PopAndDestroy(4);//controllers, ids, formatParameters, pluginParameters
-
-  DP0("S60AudioCaptureSession::updateAudioContainersL ---");
 }
 
 void S60AudioCaptureSession::retrieveSupportedAudioSampleRatesL()
 {
-    DP0("S60AudioCaptureSession::retrieveSupportedAudioSampleRatesL +++");
-
     if (!m_recorderUtility) {
-        DP0("No RecorderUtility");
         return;
     }
 
@@ -731,14 +653,10 @@ void S60AudioCaptureSession::retrieveSupportedAudioSampleRatesL()
         m_supportedSampleRates.append(supportedSampleRates[j]);
 
     CleanupStack::PopAndDestroy(&supportedSampleRates);
-
-    DP0("S60AudioCaptureSession::retrieveSupportedAudioSampleRatesL ---");
 }
 
 QList<int> S60AudioCaptureSession::supportedAudioSampleRates(const QAudioEncoderSettings &settings) const
 {
-    DP0("S60AudioCaptureSession::supportedAudioSampleRates +++");
-
     QList<int> supportedSampleRates;
 
     if (!settings.codec().isEmpty()) {
@@ -749,18 +667,12 @@ QList<int> S60AudioCaptureSession::supportedAudioSampleRates(const QAudioEncoder
     }else
         supportedSampleRates = m_supportedSampleRates;
 
-    DP0("S60AudioCaptureSession::supportedAudioSampleRates ---");
-
     return supportedSampleRates;
 }
 
 void S60AudioCaptureSession::populateAudioCodecsDataL()
 {
-    DP0("S60AudioCaptureSession::populateAudioCodecsDataL +++");
-
     if (!m_recorderUtility) {
-        DP0("No RecorderUtility");
-
         return;
     }
 
@@ -790,13 +702,11 @@ void S60AudioCaptureSession::populateAudioCodecsDataL()
 
     // default samplerates
     m_supportedSampleRates << 96000 << 88200 << 64000 << 48000 << 44100 << 32000 << 24000 << 22050 << 16000 << 12000 << 11025 << 8000;
-
-    DP0("S60AudioCaptureSession::populateAudioCodecsDataL ---");
 }
 
 void S60AudioCaptureSession::applyAudioSettingsL()
 {
-   DP0("S60AudioCaptureSession::applyAudioSettingsL +++");
+    TRACE("S60AudioCaptureSession::applyAudioSettingsL" << qtThisPtr());
 
     if (!m_recorderUtility)
         return;
@@ -883,14 +793,10 @@ void S60AudioCaptureSession::applyAudioSettingsL()
             CleanupStack::PopAndDestroy(&supportedBitRates);
         }
     }
-
-    DP0("S60AudioCaptureSession::applyAudioSettingsL ---");
 }
 
 TFourCC S60AudioCaptureSession::determinePCMFormat()
 {
-    DP0("S60AudioCaptureSession::determinePCMFormat +++");
-
     TFourCC fourCC;
 
     if (m_format.sampleSize() == 8) {
@@ -931,7 +837,5 @@ TFourCC S60AudioCaptureSession::determinePCMFormat()
         }
     }
 
-    DP0("S60AudioCaptureSession::determinePCMFormat ---");
-
     return fourCC;
 }
diff --git a/plugins/multimedia/symbian/mmf/audiosource/s60audiocontainercontrol.cpp b/plugins/multimedia/symbian/mmf/audiosource/s60audiocontainercontrol.cpp
index 7227d7390b..bcb549a4fa 100644
--- a/plugins/multimedia/symbian/mmf/audiosource/s60audiocontainercontrol.cpp
+++ b/plugins/multimedia/symbian/mmf/audiosource/s60audiocontainercontrol.cpp
@@ -39,58 +39,42 @@
 **
 ****************************************************************************/
 
-#include "DebugMacros.h"
-
 #include "s60audiocontainercontrol.h"
 #include "s60audiocapturesession.h"
-#include <QtCore/qdebug.h>
+#include "s60mmftrace.h"
 
 S60AudioContainerControl::S60AudioContainerControl(QObject *parent)
     : QMediaContainerControl(parent)
 {
-    DP0("S60AudioContainerControl::S60AudioContainerControl(QObject *parent) +++");
-
-    DP0("S60AudioContainerControl::S60AudioContainerControl(QObject *parent) ---");
-
+    TRACE("S60AudioContainerControl::S60AudioContainerControl" << qtThisPtr());
 }
 
 S60AudioContainerControl::S60AudioContainerControl(QObject *session, QObject *parent)
    : QMediaContainerControl(parent)
 {
-    DP0("S60AudioContainerControl::S60AudioContainerControl(QObject *session, QObject *parent) +++");
-
+    TRACE("S60AudioContainerControl::S60AudioContainerControl" << qtThisPtr());
     m_session = qobject_cast<S60AudioCaptureSession*>(session);
-
-    DP0("S60AudioContainerControl::S60AudioContainerControl(QObject *session, QObject *parent) ---");
 }
 
 QStringList S60AudioContainerControl::supportedContainers() const
 {
-    DP0("S60AudioContainerControl::supportedContainers");
-
     return m_session->supportedAudioContainers();
 }
 
 QString S60AudioContainerControl::containerMimeType() const
 {
-    DP0("S60AudioContainerControl::containerMimeType");
-
     return m_session->audioContainer();
 }
 
 void S60AudioContainerControl::setContainerMimeType(const QString &containerMimeType)
 {
-    DP0("S60AudioContainerControl::setContainerMimeType +++");
-
+    TRACE("S60AudioContainerControl::setContainerMimeType" << qtThisPtr()
+          << "mimeType" << containerMimeType);
     m_session->setAudioContainer(containerMimeType);
-
-    DP0("S60AudioContainerControl::setContainerMimeType ---");
 }
 
 QString S60AudioContainerControl::containerDescription(const QString &containerMimeType) const
 {
-    DP0("S60AudioContainerControl::containerDescription");
-
     return m_session->audioContainerDescription(containerMimeType);
 }
 
diff --git a/plugins/multimedia/symbian/mmf/audiosource/s60audioencodercontrol.cpp b/plugins/multimedia/symbian/mmf/audiosource/s60audioencodercontrol.cpp
index 7f359aa3af..19fec7d329 100644
--- a/plugins/multimedia/symbian/mmf/audiosource/s60audioencodercontrol.cpp
+++ b/plugins/multimedia/symbian/mmf/audiosource/s60audioencodercontrol.cpp
@@ -39,19 +39,16 @@
 **
 ****************************************************************************/
 
-#include "DebugMacros.h"
-
 #include "s60audioencodercontrol.h"
 #include "s60audiocapturesession.h"
+#include "s60mmftrace.h"
 
 #include "qaudioformat.h"
 
-#include <QtCore/qdebug.h>
-
 S60AudioEncoderControl::S60AudioEncoderControl(QObject *session, QObject *parent)
     :QAudioEncoderControl(parent), m_quality(QtMultimediaKit::NormalQuality)
 {
-    DP0("S60AudioEncoderControl::S60AudioEncoderControl +++");
+    TRACE("S60AudioEncoderControl::S60AudioEncoderControl" << qtThisPtr());
 
     m_session = qobject_cast<S60AudioCaptureSession*>(session);
     QAudioFormat fmt = m_session->format();
@@ -66,41 +63,31 @@ S60AudioEncoderControl::S60AudioEncoderControl(QObject *session, QObject *parent
     m_settings.setChannelCount(fmt.channels());
     m_settings.setCodec(fmt.codec());
     m_settings.setSampleRate(fmt.sampleRate());
-
-    DP0("S60AudioEncoderControl::S60AudioEncoderControl ---");
 }
 
 S60AudioEncoderControl::~S60AudioEncoderControl()
 {
-    DP0("S60AudioEncoderControl::~S60AudioEncoderControl +++");
-
-    DP0("S60AudioEncoderControl::~S60AudioEncoderControl ---");
+    TRACE("S60AudioEncoderControl::~S60AudioEncoderControl" << qtThisPtr());
 }
 
 QStringList S60AudioEncoderControl::supportedAudioCodecs() const
 {
-    DP0("S60AudioEncoderControl::supportedAudioCodecs");
-
     return m_session->supportedAudioCodecs();
 }
 
 QString S60AudioEncoderControl::codecDescription(const QString &codecName) const
 {
-    DP0("S60AudioEncoderControl::codecDescription");
-
     return m_session->codecDescription(codecName);
 }
 
 QtMultimediaKit::EncodingQuality S60AudioEncoderControl::quality() const
 {
-    DP0("S60AudioEncoderControl::quality");
-
     return m_quality;
 }
 
 void S60AudioEncoderControl::setQuality(QtMultimediaKit::EncodingQuality value, QAudioFormat &fmt)
 {
-    DP0("S60AudioEncoderControl::setQuality +++");
+    TRACE("S60AudioEncoderControl::setQuality" << qtThisPtr() << "value" << value);
 
     switch (value) {
     case QtMultimediaKit::VeryLowQuality:
@@ -129,14 +116,10 @@ void S60AudioEncoderControl::setQuality(QtMultimediaKit::EncodingQuality value,
     default:
         break;
     }
-
-    DP0("S60AudioEncoderControl::setQuality ---");
 }
 
 QStringList S60AudioEncoderControl::supportedEncodingOptions(const QString &codec) const
 {
-    DP0("S60AudioEncoderControl::supportedEncodingOptions");
-
     Q_UNUSED(codec)
     QStringList list;
     if (codec == "PCM") 
@@ -146,8 +129,6 @@ QStringList S60AudioEncoderControl::supportedEncodingOptions(const QString &code
 
 QVariant S60AudioEncoderControl::encodingOption(const QString &codec, const QString &name) const
 {
-    DP0("S60AudioEncoderControl::encodingOption");
-
     if (codec == "PCM") {
         QAudioFormat fmt = m_session->format();
         
@@ -167,7 +148,8 @@ QVariant S60AudioEncoderControl::encodingOption(const QString &codec, const QStr
 void S60AudioEncoderControl::setEncodingOption(
         const QString &codec, const QString &name, const QVariant &value)
 {
-    DP0("S60AudioEncoderControl::setEncodingOption +++");
+    TRACE("S60AudioEncoderControl::setEncodingOption" << qtThisPtr()
+          << "codec" << codec << "name" << name << "value" << value);
 
     if (codec == "PCM") {
         QAudioFormat fmt = m_session->format();
@@ -181,14 +163,10 @@ void S60AudioEncoderControl::setEncodingOption(
         }
         m_session->setFormat(fmt);
     }
-
-    DP0("S60AudioEncoderControl::setEncodingOption ---");
 }
 
 QList<int> S60AudioEncoderControl::supportedSampleRates(const QAudioEncoderSettings &settings, bool *continuous) const
 {
-    DP0("S60AudioEncoderControl::supportedSampleRates");
-
     if (continuous)
         *continuous = false;
     
@@ -197,14 +175,18 @@ QList<int> S60AudioEncoderControl::supportedSampleRates(const QAudioEncoderSetti
 
 QAudioEncoderSettings S60AudioEncoderControl::audioSettings() const
 {
-    DP0("S60AudioEncoderControl::audioSettings");
-
     return m_settings;
 }
 
 void S60AudioEncoderControl::setAudioSettings(const QAudioEncoderSettings &settings)
 {
-    DP0("S60AudioEncoderControl::setAudioSettings +++");
+    TRACE("S60AudioEncoderControl::setAudioSettings" << qtThisPtr()
+          << "encodingMode" << settings.encodingMode()
+          << "codec" << settings.codec()
+          << "bitRate" << settings.bitRate()
+          << "channelCount" << settings.channelCount()
+          << "sampleRate" << settings.sampleRate()
+          << "quality" << settings.quality());
 
     QAudioFormat fmt = m_session->format();
     if (settings.encodingMode() == QtMultimediaKit::ConstantQualityEncoding) {
@@ -230,6 +212,4 @@ void S60AudioEncoderControl::setAudioSettings(const QAudioEncoderSettings &setti
     m_session->setFormat(fmt);
     m_session->setEncoderSettings(settings);
     m_settings = settings;
-
-    DP0("S60AudioEncoderControl::setAudioSettings ---");
 }
diff --git a/plugins/multimedia/symbian/mmf/audiosource/s60audioendpointselector.cpp b/plugins/multimedia/symbian/mmf/audiosource/s60audioendpointselector.cpp
index 3a2fcc32ad..2643d3b14e 100644
--- a/plugins/multimedia/symbian/mmf/audiosource/s60audioendpointselector.cpp
+++ b/plugins/multimedia/symbian/mmf/audiosource/s60audioendpointselector.cpp
@@ -39,62 +39,49 @@
 **
 ****************************************************************************/
 
-#include "DebugMacros.h"
-
 #include "s60audiocapturesession.h"
 #include "s60audioendpointselector.h"
+#include "s60mmftrace.h"
 
 #include <qaudiodeviceinfo.h>
 
 S60AudioEndpointSelector::S60AudioEndpointSelector(QObject *session, QObject *parent)
     :QAudioEndpointSelector(parent)
 {
-    DP0("S60AudioEndpointSelector::S60AudioEndpointSelector +++");
+    TRACE("S60AudioEndpointSelector::S60AudioEndpointSelector" << qtThisPtr());
     m_session = qobject_cast<S60AudioCaptureSession*>(session); 
 
     connect(m_session, SIGNAL(activeEndpointChanged(const QString &)), this, SIGNAL(activeEndpointChanged(const QString &)));
-
-    DP0("S60AudioEndpointSelector::S60AudioEndpointSelector ---");
 }
 
 S60AudioEndpointSelector::~S60AudioEndpointSelector()
 {
-    DP0("S60AudioEndpointSelector::~S60AudioEndpointSelector +++");
-
-    DP0("S60AudioEndpointSelector::~S60AudioEndpointSelector ---");
+    TRACE("S60AudioEndpointSelector::~S60AudioEndpointSelector" << qtThisPtr());
 }
 
 QList<QString> S60AudioEndpointSelector::availableEndpoints() const
 {
-    DP0("S60AudioEndpointSelector::availableEndpoints");
-
     return m_session->availableEndpoints();
 }
 
 QString S60AudioEndpointSelector::endpointDescription(const QString& name) const
 {
-    DP0("S60AudioEndpointSelector::endpointDescription");
-
     return m_session->endpointDescription(name);
 }
 
 QString S60AudioEndpointSelector::defaultEndpoint() const
 {
-    DP0("S60AudioEndpointSelector::defaultEndpoint");
-
     return m_session->defaultEndpoint();
 }
 
 QString S60AudioEndpointSelector::activeEndpoint() const
 {
-    DP0("S60AudioEndpointSelector::activeEndpoint");
-
     return m_session->activeEndpoint();
 }
 
 void S60AudioEndpointSelector::setActiveEndpoint(const QString& name)
 {
-   DP0("S60AudioEndpointSelector::setActiveEndpoint +++");
+    TRACE("S60AudioEndpointSelector::setActiveEndpoint" << qtThisPtr()
+          << "name" << name);
     m_session->setActiveEndpoint(name);
-   DP0("S60AudioEndpointSelector::setActiveEndpoint ---");
 }
diff --git a/plugins/multimedia/symbian/mmf/audiosource/s60audiomediarecordercontrol.cpp b/plugins/multimedia/symbian/mmf/audiosource/s60audiomediarecordercontrol.cpp
index 8f89154f3e..b6ece17d95 100644
--- a/plugins/multimedia/symbian/mmf/audiosource/s60audiomediarecordercontrol.cpp
+++ b/plugins/multimedia/symbian/mmf/audiosource/s60audiomediarecordercontrol.cpp
@@ -39,51 +39,41 @@
 **
 ****************************************************************************/
 
-#include "DebugMacros.h"
-
 #include "s60audiomediarecordercontrol.h"
 #include "s60audiocapturesession.h"
-
-#include <QtCore/qdebug.h>
+#include "s60mmftrace.h"
 
 S60AudioMediaRecorderControl::S60AudioMediaRecorderControl(QObject *session, QObject *parent)
     :QMediaRecorderControl(parent), m_state(QMediaRecorder::StoppedState)
 {
-    DP0("S60AudioMediaRecorderControl::S60AudioMediaRecorderControl +++");
+    TRACE("S60AudioMediaRecorderControl::S60AudioMediaRecorderControl" << qtThisPtr());
 
     m_session = qobject_cast<S60AudioCaptureSession*>(session);
     connect(m_session, SIGNAL(positionChanged(qint64)), this, SIGNAL(durationChanged(qint64)));
     connect(m_session, SIGNAL(stateChanged(S60AudioCaptureSession::TAudioCaptureState)), this, SLOT(updateState(S60AudioCaptureSession::TAudioCaptureState)));
     connect(m_session,SIGNAL(error(int,const QString &)),this,SIGNAL(error(int,const QString &)));
-
-    DP0("S60AudioMediaRecorderControl::S60AudioMediaRecorderControl ---");
 }
 
 S60AudioMediaRecorderControl::~S60AudioMediaRecorderControl()
 {
-    DP0("S60AudioMediaRecorderControl::~S60AudioMediaRecorderControl +++");
-
-    DP0("S60AudioMediaRecorderControl::~S60AudioMediaRecorderControl - - ");
+    TRACE("S60AudioMediaRecorderControl::~S60AudioMediaRecorderControl" << qtThisPtr());
 }
 
 QUrl S60AudioMediaRecorderControl::outputLocation() const
 {
-    DP0("S60AudioMediaRecorderControl::outputLocation");
-
     return m_session->outputLocation();
 }
 
 bool S60AudioMediaRecorderControl::setOutputLocation(const QUrl& sink)
 {
-    DP0("S60AudioMediaRecorderControl::setOutputLocation");
+    TRACE("S60AudioMediaRecorderControl::setOutputLocation" << qtThisPtr()
+          << "sink" << sink);
 
     return m_session->setOutputLocation(sink);
 }
 
 QMediaRecorder::State S60AudioMediaRecorderControl::convertState(S60AudioCaptureSession::TAudioCaptureState aState) const
 {
-    DP0("S60AudioMediaRecorderControl::convertState +++");
-
     QMediaRecorder::State state = QMediaRecorder::StoppedState;;
     switch (aState) {
     case S60AudioCaptureSession::ERecording:
@@ -99,82 +89,60 @@ QMediaRecorder::State S60AudioMediaRecorderControl::convertState(S60AudioCapture
         state = QMediaRecorder::StoppedState;
         break;
     }
-
-    DP1("S60AudioMediaRecorderControl::convertState:", state);
-
-    DP0("S60AudioMediaRecorderControl::convertState ---");
-
     return state;
 }
 
 void S60AudioMediaRecorderControl::updateState(S60AudioCaptureSession::TAudioCaptureState aState)
 {
-    DP0("S60AudioMediaRecorderControl::updateState +++");
-
     QMediaRecorder::State newState = convertState(aState);
     if (m_state != newState) {
         m_state = newState;
+        TRACE("S60AudioMediaRecorderControl::stateChanged" << qtThisPtr()
+              << "state" << m_state);
         emit stateChanged(m_state);
     }
-
-    DP0("S60AudioMediaRecorderControl::updateState ---");
 }
 
 QMediaRecorder::State S60AudioMediaRecorderControl::state() const
 {
-    DP0("S60AudioMediaRecorderControl::state");
-
     return m_state;
 }
 
 qint64 S60AudioMediaRecorderControl::duration() const
 {
-  //  DP0("S60AudioMediaRecorderControl::duration +++");
-
     return m_session->position();
 }
 
 void S60AudioMediaRecorderControl::record()
 {
-    DP0("S60AudioMediaRecorderControl::record +++");
+    TRACE("S60AudioMediaRecorderControl::record" << qtThisPtr());
 
     m_session->record();
-
-    DP0("S60AudioMediaRecorderControl::record ---");
 }
 
 void S60AudioMediaRecorderControl::pause()
 {
-    DP0("S60AudioMediaRecorderControl::pause +++");
+    TRACE("S60AudioMediaRecorderControl::pause" << qtThisPtr());
 
     m_session->pause();
-
-    DP0("S60AudioMediaRecorderControl::pause ---");
 }
 
 void S60AudioMediaRecorderControl::stop()
 {
-    DP0("S60AudioMediaRecorderControl::stop +++");
+    TRACE("S60AudioMediaRecorderControl::stop" << qtThisPtr());
 
     m_session->stop();
-
-    DP0("S60AudioMediaRecorderControl::stop ---");
 }
 
 bool S60AudioMediaRecorderControl::isMuted() const
 {
-    DP0("S60AudioMediaRecorderControl::isMuted");
-
     return m_session->muted();
 }
 
 void S60AudioMediaRecorderControl::setMuted(bool muted)
 {
-    DP0("S60AudioMediaRecorderControl::setMuted +++");
-
-    DP1("S60AudioMediaRecorderControl::setMuted:", muted);
-
-    m_session->mute(muted);
-
-    DP0("S60AudioMediaRecorderControl::setMuted +++");
+    if (muted != isMuted()) {
+        TRACE("S60AudioMediaRecorderControl::setMuted" << qtThisPtr() << "muted" << muted);
+        m_session->mute(muted);
+    }
 }
diff --git a/plugins/multimedia/symbian/mmf/inc/DebugMacros.h b/plugins/multimedia/symbian/mmf/inc/s60mmftrace.h
index 9cffaa4c35..6516c9833f 100644
--- a/plugins/multimedia/symbian/mmf/inc/DebugMacros.h
+++ b/plugins/multimedia/symbian/mmf/inc/s60mmftrace.h
@@ -39,28 +39,34 @@
 **
 ****************************************************************************/
 
-#include <QtCore/qdebug.h>
+#ifndef S60MMFTRACE_H
+#define S60MMFTRACE_H
 
-#ifndef __DEBUGMACROS_H__
-#define __DEBUGMACROS_H__
-
-// MACROS
 #ifdef _DEBUG
-#define DP0(string)                                 qDebug()<<string
-#define DP1(string,arg1)                            qDebug()<<string<<arg1
-#define DP2(string,arg1,arg2)                       qDebug()<<string<<arg1<<arg2
-#define DP3(string,arg1,arg2,arg3)                  qDebug()<<string<<arg1<<arg2<<arg3
-#define DP4(string,arg1,arg2,arg3,arg4)             qDebug()<<string<<arg1<<arg2<<arg3<<arg4
-#define DP5(string,arg1,arg2,arg3,arg4,arg5)        qDebug()<<string<<arg1<<arg2<<arg3<<arg4<<arg5
-#define DP6(string,arg1,arg2,arg3,arg4,arg5,arg6)   qDebug()<<string<<arg1<<arg2<<arg3<<arg4<<arg5<<arg6
-#else
-#define DP0(string)
-#define DP1(string,arg1)
-#define DP2(string,arg1,arg2)
-#define DP3(string,arg1,arg2,arg3)
-#define DP4(string,arg1,arg2,arg3,arg4)
-#define DP5(string,arg1,arg2,arg3,arg4,arg5)
-#define DP6(string,arg1,arg2,arg3,arg4,arg5,arg6)
+#define MMF_ENABLE_TRACE
+#endif
+
+//#define MMF_ENABLE_VERBOSE_TRACE
+
+#ifdef MMF_ENABLE_TRACE
+
+#   include <QtCore/QDebug>
+#   define TRACE(args) qDebug() << "[QtMultimediaKit mmf]" << args
+#   ifdef MMF_ENABLE_VERBOSE_TRACE
+#       define VERBOSE_TRACE(args) TRACE(args)
+#   else // MMF_ENABLE_VERBOSE_TRACE
+#       define VERBOSE_TRACE(args)
+#   endif // MMF_ENABLE_VERBOSE_TRACE
+
+    template <typename T>
+    inline void *qtVoidPtr(T *ptr)
+    { return reinterpret_cast<void *>(ptr); }
+
+#   define qtThisPtr() qtVoidPtr(this)
+
+#else // MMF_ENABLE_TRACE
+#   define TRACE(args)
+#   define VERBOSE_TRACE(args)
 #endif
 
-#endif //__DEBUGMACROS_H__
+#endif // S60MMFTRACE_H
diff --git a/plugins/multimedia/symbian/mmf/mediaplayer/s60audioplayersession.cpp b/plugins/multimedia/symbian/mmf/mediaplayer/s60audioplayersession.cpp
index 49b6cc8627..2b5150e516 100644
--- a/plugins/multimedia/symbian/mmf/mediaplayer/s60audioplayersession.cpp
+++ b/plugins/multimedia/symbian/mmf/mediaplayer/s60audioplayersession.cpp
@@ -39,9 +39,8 @@
 **
 ****************************************************************************/
 
-#include "DebugMacros.h"
-
 #include "s60audioplayersession.h"
+#include "s60mmftrace.h"
 #include <QtCore/qdebug.h>
 #include <QtCore/qvariant.h>
 
@@ -57,15 +56,13 @@ S60AudioPlayerSession::S60AudioPlayerSession(QObject *parent)
     , m_player(0)
     , m_audioEndpoint("Default")
 {
-    DP0("S60AudioPlayerSession::S60AudioPlayerSession +++");
+    TRACE("S60AudioPlayerSession::S60AudioPlayerSession" << qtThisPtr());
 
 #ifdef HAS_AUDIOROUTING
     m_audioOutput = 0;
 #endif //HAS_AUDIOROUTING    
     QT_TRAP_THROWING(m_player = CAudioPlayer::NewL(*this, 0, EMdaPriorityPreferenceNone));
     m_player->RegisterForAudioLoadingNotification(*this);
-
-    DP0("S60AudioPlayerSession::S60AudioPlayerSession ---");
 }
 
 
@@ -78,7 +75,7 @@ S60AudioPlayerSession::S60AudioPlayerSession(QObject *parent)
 
 S60AudioPlayerSession::~S60AudioPlayerSession()
 {
-    DP0("S60AudioPlayerSession::~S60AudioPlayerSession +++");
+    TRACE("S60AudioPlayerSession::~S60AudioPlayerSession" << qtThisPtr());
 #ifdef HAS_AUDIOROUTING
     if (m_audioOutput)
         m_audioOutput->UnregisterObserver(*this);
@@ -86,8 +83,6 @@ S60AudioPlayerSession::~S60AudioPlayerSession()
 #endif
     m_player->Close();
     delete m_player;
-
-    DP0("S60AudioPlayerSession::~S60AudioPlayerSession ---");
 }
 
 /*!
@@ -98,8 +93,6 @@ S60AudioPlayerSession::~S60AudioPlayerSession()
 
 void S60AudioPlayerSession::doLoadL(const TDesC &path)
 {
-    DP0("S60AudioPlayerSession::doLoadL +++");
-
 #ifdef HAS_AUDIOROUTING
     // m_audioOutput needs to be reinitialized after MapcInitComplete
     if (m_audioOutput)
@@ -108,8 +101,6 @@ void S60AudioPlayerSession::doLoadL(const TDesC &path)
     m_audioOutput = NULL;
 #endif //HAS_AUDIOROUTING
     m_player->OpenFileL(path);
-
-    DP0("S60AudioPlayerSession::doLoadL ---");
 }
 
 /*!
@@ -120,8 +111,6 @@ void S60AudioPlayerSession::doLoadL(const TDesC &path)
 
 qint64 S60AudioPlayerSession::doGetDurationL() const
 {
- //  DP0("S60AudioPlayerSession::doGetDurationL");
-
     return m_player->Duration().Int64() / qint64(1000);
 }
 
@@ -132,8 +121,6 @@ qint64 S60AudioPlayerSession::doGetDurationL() const
 
 qint64 S60AudioPlayerSession::doGetPositionL() const
 {
-  //  DP0("S60AudioPlayerSession::doGetPositionL");
-
     TTimeIntervalMicroSeconds ms = 0;
     m_player->GetPosition(ms);
     return ms.Int64() / qint64(1000);
@@ -145,8 +132,6 @@ qint64 S60AudioPlayerSession::doGetPositionL() const
 
 bool S60AudioPlayerSession::isVideoAvailable()
 {
-    DP0("S60AudioPlayerSession::isVideoAvailable");
-
     return false;
 }
 
@@ -155,8 +140,6 @@ bool S60AudioPlayerSession::isVideoAvailable()
  */
 bool S60AudioPlayerSession::isAudioAvailable()
 {
-    DP0("S60AudioPlayerSession::isAudioAvailable");
-
     return true; // this is a bit happy scenario, but we do emit error that we can't play
 }
 
@@ -167,11 +150,9 @@ bool S60AudioPlayerSession::isAudioAvailable()
 
 void S60AudioPlayerSession::MaloLoadingStarted()
 {
-    DP0("S60AudioPlayerSession::MaloLoadingStarted +++");
+    TRACE("S60AudioPlayerSession::MaloLoadingStarted" << qtThisPtr());
 
     buffering();
-
-    DP0("S60AudioPlayerSession::MaloLoadingStarted ---");
 }
 
 
@@ -184,11 +165,9 @@ void S60AudioPlayerSession::MaloLoadingStarted()
 
 void S60AudioPlayerSession::MaloLoadingComplete()
 {
-    DP0("S60AudioPlayerSession::MaloLoadingComplete +++");
+    TRACE("S60AudioPlayerSession::MaloLoadingComplete" << qtThisPtr());
 
     buffered();
-
-    DP0("S60AudioPlayerSession::MaloLoadingComplete ---");
 }
 
 /*!
@@ -197,8 +176,6 @@ void S60AudioPlayerSession::MaloLoadingComplete()
 
 void S60AudioPlayerSession::doPlay()
 {
-    DP0("S60AudioPlayerSession::doPlay +++");
-
     // For some reason loading progress callback are not called on emulator
     // Same is the case with hardware. Will be fixed as part of QTMOBILITY-782.
         
@@ -209,8 +186,6 @@ void S60AudioPlayerSession::doPlay()
     //#ifdef __WINSCW__
         buffered();
     //#endif
-
-    DP0("S60AudioPlayerSession::doPlay ---");
 }
 
 
@@ -221,11 +196,7 @@ void S60AudioPlayerSession::doPlay()
 
 void S60AudioPlayerSession::doPauseL()
 {
-    DP0("S60AudioPlayerSession::doPauseL +++");
-
     m_player->Pause();
-
-    DP0("S60AudioPlayerSession::doPauseL ---");
 }
 
 
@@ -236,11 +207,7 @@ void S60AudioPlayerSession::doPauseL()
 
 void S60AudioPlayerSession::doStop()
 {
-    DP0("S60AudioPlayerSession::doStop +++");
-
     m_player->Stop();
-
-    DP0("S60AudioPlayerSession::doStop ---");
 }
 
 /*!
@@ -249,8 +216,6 @@ void S60AudioPlayerSession::doStop()
 
 void S60AudioPlayerSession::doClose()
 {
-    DP0("S60AudioPlayerSession::doClose +++");
-
 #ifdef HAS_AUDIOROUTING
     if (m_audioOutput) {
         m_audioOutput->UnregisterObserver(*this);
@@ -259,8 +224,6 @@ void S60AudioPlayerSession::doClose()
     }
 #endif
     m_player->Close();
-
-    DP0("S60AudioPlayerSession::doClose ---");
 }
 
 /*!
@@ -270,13 +233,7 @@ void S60AudioPlayerSession::doClose()
 
 void S60AudioPlayerSession::doSetVolumeL(int volume)
 {
-    DP0("S60AudioPlayerSession::doSetVolumeL +++");
-
-    DP1("S60AudioPlayerSession::doSetVolumeL, Volume:", volume);
-
     m_player->SetVolume(volume * m_player->MaxVolume() / 100);
-
-    DP0("S60AudioPlayerSession::doSetVolumeL ---");
 }
 
 /*!
@@ -285,13 +242,7 @@ void S60AudioPlayerSession::doSetVolumeL(int volume)
 
 void S60AudioPlayerSession::doSetPositionL(qint64 microSeconds)
 {
-    DP0("S60AudioPlayerSession::doSetPositionL +++");
-
-    DP1("S60AudioPlayerSession::doSetPositionL, Microseconds:", microSeconds);
-
     m_player->SetPosition(TTimeIntervalMicroSeconds(microSeconds));
-
-    DP0("S60AudioPlayerSession::doSetPositionL ---");
 }
 
 /*!
@@ -301,8 +252,6 @@ void S60AudioPlayerSession::doSetPositionL(qint64 microSeconds)
 
 void S60AudioPlayerSession::updateMetaDataEntriesL()
 {
-    DP0("S60AudioPlayerSession::updateMetaDataEntriesL +++");
-
     metaDataEntries().clear();
     int numberOfMetaDataEntries = 0;
 
@@ -316,8 +265,6 @@ void S60AudioPlayerSession::updateMetaDataEntriesL()
         delete entry;
     }
     emit metaDataChanged();
-
-    DP0("S60AudioPlayerSession::updateMetaDataEntriesL ---");
 }
 
 /*!
@@ -326,8 +273,7 @@ void S60AudioPlayerSession::updateMetaDataEntriesL()
 
 void S60AudioPlayerSession::setPlaybackRate(qreal rate)
 {
-    DP0("S60AudioPlayerSession::setPlaybackRate +++");
-    DP1("S60AudioPlayerSession::setPlaybackRate, Rate:", rate);
+    TRACE("S60AudioPlayerSession::setPlaybackRate" << qtThisPtr() << "rate" << rate);
     /*Since AudioPlayerUtility doesn't support set playback rate hence
      * setPlaybackRate emits playbackRateChanged signal for 1.0x ie normal playback.
      * For all other playBackRates it sets and emits error signal.
@@ -339,7 +285,6 @@ void S60AudioPlayerSession::setPlaybackRate(qreal rate)
         int err = KErrNotSupported;
         setAndEmitError(err);
     }
-    DP0("S60AudioPlayerSession::setPlaybackRate ---");
 }
 
 /*!
@@ -349,13 +294,8 @@ void S60AudioPlayerSession::setPlaybackRate(qreal rate)
 
 int S60AudioPlayerSession::doGetBufferStatusL() const
 {
-    DP0("S60AudioPlayerSession::doGetBufferStatusL +++");
-
     int progress = 0;
     m_player->GetAudioLoadingProgressL(progress);
-
-    DP0("S60AudioPlayerSession::doGetBufferStatusL ---");
-
     return progress;
 }
 
@@ -375,9 +315,7 @@ void S60AudioPlayerSession::MdapcInitComplete(TInt aError, const TTimeIntervalMi
 void S60AudioPlayerSession::MapcInitComplete(TInt aError, const TTimeIntervalMicroSeconds& aDuration)
 #endif
 {
-    DP0("S60AudioPlayerSession::MdapcInitComplete +++");
-
-    DP1("S60AudioPlayerSession::MdapcInitComplete - aError", aError);
+    TRACE("S60AudioPlayerSession::MapcInitComplete" << qtThisPtr() << "error" << aError);
 
     Q_UNUSED(aDuration);
     setError(aError);
@@ -393,8 +331,6 @@ void S60AudioPlayerSession::MapcInitComplete(TInt aError, const TTimeIntervalMic
 #endif //HAS_AUDIOROUTING
     if (KErrNone == aError)
         loaded();
-
-    DP0("S60AudioPlayerSession::MdapcInitComplete ---");
 }
 
 /*!
@@ -411,16 +347,12 @@ void S60AudioPlayerSession::MdapcPlayComplete(TInt aError)
 void S60AudioPlayerSession::MapcPlayComplete(TInt aError)
 #endif
 {
-    DP0("S60AudioPlayerSession::MdapcPlayComplete +++");
-
-    DP1("S60AudioPlayerSession::MdapcPlayComplete", aError);
+    TRACE("S60AudioPlayerSession::MapcPlayComplete" << qtThisPtr() << "error" << aError);
 
     if (KErrNone == aError)
         endOfMedia();
     else
         setError(aError);
-
-    DP0("S60AudioPlayerSession::MdapcPlayComplete ---");
 }
 
 /*!
@@ -431,13 +363,7 @@ void S60AudioPlayerSession::MapcPlayComplete(TInt aError)
 
 void S60AudioPlayerSession::doSetAudioEndpoint(const QString& audioEndpoint)
 {
-    DP0("S60AudioPlayerSession::doSetAudioEndpoint +++");
-
-    DP1("S60AudioPlayerSession::doSetAudioEndpoint - ", audioEndpoint);
-
     m_audioEndpoint = audioEndpoint;
-
-    DP0("S60AudioPlayerSession::doSetAudioEndpoint ---");
 }
 
 /*!
@@ -447,8 +373,6 @@ void S60AudioPlayerSession::doSetAudioEndpoint(const QString& audioEndpoint)
 
 QString S60AudioPlayerSession::activeEndpoint() const
 {
-    DP0("S60AudioPlayerSession::activeEndpoint +++");
-
     QString outputName = QString("Default");
 #ifdef HAS_AUDIOROUTING
     if (m_audioOutput) {
@@ -456,9 +380,6 @@ QString S60AudioPlayerSession::activeEndpoint() const
         outputName = qStringFromTAudioOutputPreference(output);
     }
 #endif
-    DP1("S60AudioPlayerSession::activeEndpoint is :", outputName);
-
-    DP0("S60AudioPlayerSession::activeEndpoint ---");
     return outputName;
 }
 
@@ -468,8 +389,6 @@ QString S60AudioPlayerSession::activeEndpoint() const
 
 QString S60AudioPlayerSession::defaultEndpoint() const
 {
-    DP0("S60AudioPlayerSession::defaultEndpoint +++");
-
     QString outputName = QString("Default");
 #ifdef HAS_AUDIOROUTING
     if (m_audioOutput) {
@@ -477,9 +396,6 @@ QString S60AudioPlayerSession::defaultEndpoint() const
         outputName = qStringFromTAudioOutputPreference(output);
     }
 #endif
-    DP1("S60AudioPlayerSession::defaultEndpoint is :", outputName);
-
-    DP0("S60AudioPlayerSession::defaultEndpoint ---");
     return outputName;
 }
 
@@ -489,9 +405,7 @@ QString S60AudioPlayerSession::defaultEndpoint() const
 
 void S60AudioPlayerSession::setActiveEndpoint(const QString& name)
 {
-    DP0("S60AudioPlayerSession::setActiveEndpoint +++");
-
-    DP1("S60AudioPlayerSession::setActiveEndpoint - ", name);
+    TRACE("S60AudioPlayerSession::setActiveEndpoint" << qtThisPtr() << "name" << name);
 
 #ifdef HAS_AUDIOROUTING
     CAudioOutput::TAudioOutputPreference output = CAudioOutput::ENoPreference;
@@ -512,8 +426,6 @@ void S60AudioPlayerSession::setActiveEndpoint(const QString& name)
         setError(err);
     }
 #endif
-
-    DP0("S60AudioPlayerSession::setActiveEndpoint ---");
 }
 
 /*!
@@ -529,13 +441,11 @@ void S60AudioPlayerSession::setActiveEndpoint(const QString& name)
 void S60AudioPlayerSession::DefaultAudioOutputChanged(CAudioOutput& aAudioOutput,
                                         CAudioOutput::TAudioOutputPreference aNewDefault)
 {
-    DP0("S60AudioPlayerSession::DefaultAudioOutputChanged +++");
+    TRACE("S60AudioPlayerSession::DefaultAudioOutputChanged" << qtThisPtr() << "newDefault" << aNewDefault);
 
     // Emit already implemented in setActiveEndpoint function
     Q_UNUSED(aAudioOutput)
     Q_UNUSED(aNewDefault)
-
-    DP0("S60AudioPlayerSession::DefaultAudioOutputChanged ---");
 }
 
 
@@ -548,8 +458,6 @@ void S60AudioPlayerSession::DefaultAudioOutputChanged(CAudioOutput& aAudioOutput
 
 QString S60AudioPlayerSession::qStringFromTAudioOutputPreference(CAudioOutput::TAudioOutputPreference output) const
 {
-    DP0("S60AudioPlayerSession::qStringFromTAudioOutputPreference");
-
     if (output == CAudioOutput::ENoPreference)
         return QString("Default");
     else if (output == CAudioOutput::EAll)
@@ -570,8 +478,6 @@ QString S60AudioPlayerSession::qStringFromTAudioOutputPreference(CAudioOutput::T
 
 bool S60AudioPlayerSession::getIsSeekable() const
 {
-    DP0("S60AudioPlayerSession::getIsSeekable");
-
     return ETrue;
 }
 
diff --git a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediametadataprovider.cpp b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediametadataprovider.cpp
index fc1bac88f5..9c4c16effa 100644
--- a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediametadataprovider.cpp
+++ b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediametadataprovider.cpp
@@ -39,11 +39,10 @@
 **
 ****************************************************************************/
 
-#include "DebugMacros.h"
-
 #include "s60mediametadataprovider.h"
 #include "s60mediaplayercontrol.h"
 #include "s60mediaplayersession.h"
+#include "s60mmftrace.h"
 #include <QtCore/qdebug.h>
 
 /*!
@@ -53,11 +52,9 @@ S60MediaMetaDataProvider::S60MediaMetaDataProvider(QObject *control, QObject *pa
     : QMetaDataReaderControl(parent)
     , m_control(NULL)
 {
-    DP0("S60MediaMetaDataProvider::S60MediaMetaDataProvider +++");
+    TRACE("S60MediaMetaDataProvider::S60MediaMetaDataProvider" << qtThisPtr());
 
     m_control = qobject_cast<S60MediaPlayerControl*>(control);
-
-    DP0("S60MediaMetaDataProvider::S60MediaMetaDataProvider ---");
 }
 
 /*!
@@ -66,8 +63,7 @@ S60MediaMetaDataProvider::S60MediaMetaDataProvider(QObject *control, QObject *pa
 
 S60MediaMetaDataProvider::~S60MediaMetaDataProvider()
 {
-    DP0("S60MediaMetaDataProvider::~S60MediaMetaDataProvider +++");
-    DP0("S60MediaMetaDataProvider::~S60MediaMetaDataProvider ---");
+    TRACE("S60MediaMetaDataProvider::~S60MediaMetaDataProvider" << qtThisPtr());
 }
 
 /*!
@@ -76,8 +72,6 @@ S60MediaMetaDataProvider::~S60MediaMetaDataProvider()
 
 bool S60MediaMetaDataProvider::isMetaDataAvailable() const
 {
-    DP0("S60MediaMetaDataProvider::isMetaDataAvailable");
-
     if (m_control->session())
        return m_control->session()->isMetadataAvailable();
     return false;
@@ -88,8 +82,6 @@ bool S60MediaMetaDataProvider::isMetaDataAvailable() const
 */
 bool S60MediaMetaDataProvider::isWritable() const
 {
-    DP0("S60MediaMetaDataProvider::isWritable");
-
     return false;
 }
 
@@ -99,8 +91,6 @@ bool S60MediaMetaDataProvider::isWritable() const
 
 QVariant S60MediaMetaDataProvider::metaData(QtMultimediaKit::MetaData key) const
 {
-    DP0("S60MediaMetaDataProvider::metaData");
-
     if (m_control->session())
         return m_control->session()->metaData(key);
     return QVariant();
@@ -112,8 +102,6 @@ QVariant S60MediaMetaDataProvider::metaData(QtMultimediaKit::MetaData key) const
 
 QList<QtMultimediaKit::MetaData> S60MediaMetaDataProvider::availableMetaData() const
 {
-    DP0("S60MediaMetaDataProvider::availableMetaData");
-
     if (m_control->session())
         return m_control->session()->availableMetaData();
     return QList<QtMultimediaKit::MetaData>();
@@ -125,8 +113,6 @@ QList<QtMultimediaKit::MetaData> S60MediaMetaDataProvider::availableMetaData() c
 
 QVariant S60MediaMetaDataProvider::extendedMetaData(const QString &key) const
 {
-    DP0("S60MediaMetaDataProvider::extendedMetaData");
-
     if (m_control->session())
         return m_control->session()->metaData(key);
     return QVariant();
@@ -138,8 +124,6 @@ QVariant S60MediaMetaDataProvider::extendedMetaData(const QString &key) const
 
 QStringList S60MediaMetaDataProvider::availableExtendedMetaData() const
 {
-    DP0("S60MediaMetaDataProvider::availableExtendedMetaData");
-
     if (m_control->session())
         return m_control->session()->availableExtendedMetaData();
     return QStringList();
diff --git a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayeraudioendpointselector.cpp b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayeraudioendpointselector.cpp
index f455e32c69..abe52fd5cc 100644
--- a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayeraudioendpointselector.cpp
+++ b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayeraudioendpointselector.cpp
@@ -39,11 +39,10 @@
 **
 ****************************************************************************/
 
-#include "DebugMacros.h"
-
 #include "s60mediaplayercontrol.h"
 #include "s60mediaplayersession.h"
 #include "s60mediaplayeraudioendpointselector.h"
+#include "s60mmftrace.h"
 
 #include <QtGui/QIcon>
 #include <QtCore/QDebug>
@@ -56,7 +55,7 @@ S60MediaPlayerAudioEndpointSelector::S60MediaPlayerAudioEndpointSelector(QObject
    :QAudioEndpointSelector(parent)
     , m_control(0)
 {
-    DP0("S60MediaPlayerAudioEndpointSelector::S60MediaPlayerAudioEndpointSelector +++");
+    TRACE("S60MediaPlayerAudioEndpointSelector::S60MediaPlayerAudioEndpointSelector" << qtThisPtr());
 
     m_control = qobject_cast<S60MediaPlayerControl*>(control);
     m_audioEndpointNames.append("Default");
@@ -64,8 +63,6 @@ S60MediaPlayerAudioEndpointSelector::S60MediaPlayerAudioEndpointSelector(QObject
     m_audioEndpointNames.append("None");
     m_audioEndpointNames.append("Earphone");
     m_audioEndpointNames.append("Speaker");
-
-    DP0("S60MediaPlayerAudioEndpointSelector::S60MediaPlayerAudioEndpointSelector ---");
 }
 
 /*!
@@ -74,8 +71,7 @@ S60MediaPlayerAudioEndpointSelector::S60MediaPlayerAudioEndpointSelector(QObject
 
 S60MediaPlayerAudioEndpointSelector::~S60MediaPlayerAudioEndpointSelector()
 {
-    DP0("S60MediaPlayerAudioEndpointSelector::~S60MediaPlayerAudioEndpointSelector +++");
-    DP0("S60MediaPlayerAudioEndpointSelector::~S60MediaPlayerAudioEndpointSelector ---");
+    TRACE("S60MediaPlayerAudioEndpointSelector::~S60MediaPlayerAudioEndpointSelector" << qtThisPtr());
 }
 
 /*!
@@ -84,8 +80,6 @@ S60MediaPlayerAudioEndpointSelector::~S60MediaPlayerAudioEndpointSelector()
 
 QList<QString> S60MediaPlayerAudioEndpointSelector::availableEndpoints() const
 {
-    DP0("S60MediaPlayerAudioEndpointSelector::availableEndpoints");
-
     return m_audioEndpointNames;
 }
 
@@ -95,8 +89,6 @@ QList<QString> S60MediaPlayerAudioEndpointSelector::availableEndpoints() const
 
 QString S60MediaPlayerAudioEndpointSelector::endpointDescription(const QString& name) const
 {
-    DP0("S60MediaPlayerAudioEndpointSelector::endpointDescription");
-
     if (name == QString("Default")) //ENoPreference
         return QString("Used to indicate that the playing audio can be routed to"
             "any speaker. This is the default value for audio.");
@@ -122,16 +114,10 @@ QString S60MediaPlayerAudioEndpointSelector::endpointDescription(const QString&
 
 QString S60MediaPlayerAudioEndpointSelector::activeEndpoint() const
 {
-    DP0("S60MediaPlayerAudioEndpointSelector::activeEndpoint");
-
     if (m_control->session()) {
-        DP1("S60MediaPlayerAudioEndpointSelector::activeEndpoint - ",
-                m_control->session()->activeEndpoint());
         return m_control->session()->activeEndpoint();
     }
     else {
-        DP1("S60MediaPlayerAudioEndpointSelector::activeEndpoint - ",
-                m_control->mediaControlSettings().audioEndpoint());
         return m_control->mediaControlSettings().audioEndpoint();
     }
 }
@@ -142,16 +128,10 @@ QString S60MediaPlayerAudioEndpointSelector::activeEndpoint() const
 
 QString S60MediaPlayerAudioEndpointSelector::defaultEndpoint() const
 {
-    DP0("S60MediaPlayerAudioEndpointSelector::defaultEndpoint");
-
     if (m_control->session()) {
-        DP1("S60MediaPlayerAudioEndpointSelector::defaultEndpoint - ",
-                m_control->session()->defaultEndpoint());
         return m_control->session()->defaultEndpoint();
     }
     else {
-        DP1("S60MediaPlayerAudioEndpointSelector::defaultEndpoint - ",
-                m_control->mediaControlSettings().audioEndpoint());
         return m_control->mediaControlSettings().audioEndpoint();
     }
 }
@@ -162,21 +142,16 @@ QString S60MediaPlayerAudioEndpointSelector::defaultEndpoint() const
 
 void S60MediaPlayerAudioEndpointSelector::setActiveEndpoint(const QString& name)
 {
-    DP0("S60MediaPlayerAudioEndpointSelector::setActiveEndpoin +++");
-
-    DP1("S60MediaPlayerAudioEndpointSelector::setActiveEndpoint - ", name);
-
     QString oldEndpoint = m_control->mediaControlSettings().audioEndpoint();
 
     if (name != oldEndpoint && (name == QString("Default") || name == QString("All") ||
         name == QString("None") || name == QString("Earphone") || name == QString("Speaker"))) {
-
+        TRACE("S60MediaPlayerAudioEndpointSelector::setActiveEndpoint" << qtThisPtr()
+              << "name" << name);
         if (m_control->session()) {
             m_control->session()->setActiveEndpoint(name);
             emit activeEndpointChanged(name);
         }
         m_control->setAudioEndpoint(name);
     }
-
-    DP0("S60MediaPlayerAudioEndpointSelector::setActiveEndpoin ---");
 }
diff --git a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayercontrol.cpp b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayercontrol.cpp
index f888a82848..7807c23120 100644
--- a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayercontrol.cpp
+++ b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayercontrol.cpp
@@ -40,10 +40,9 @@
 **
 ****************************************************************************/
 
-#include "DebugMacros.h"
-
 #include "s60mediaplayercontrol.h"
 #include "s60mediaplayersession.h"
+#include "s60mmftrace.h"
 
 #include <QtCore/qdir.h>
 #include <QtCore/qurl.h>
@@ -59,10 +58,7 @@ S60MediaPlayerControl::S60MediaPlayerControl(MS60MediaPlayerResolver& mediaPlaye
       m_session(NULL),
       m_stream(NULL)
 {
-    DP0("S60MediaPlayerControl::S60MediaPlayerControl +++");
-
-    DP0("S60MediaPlayerControl::S60MediaPlayerControl ---");
-
+    TRACE("S60MediaPlayerControl::S60MediaPlayerControl" << qtThisPtr());
 }
 
 /*!
@@ -71,8 +67,7 @@ S60MediaPlayerControl::S60MediaPlayerControl(MS60MediaPlayerResolver& mediaPlaye
 
 S60MediaPlayerControl::~S60MediaPlayerControl()
 {
-    DP0("S60MediaPlayerControl::~S60MediaPlayerControl +++");
-    DP0("S60MediaPlayerControl::~S60MediaPlayerControl ---");
+    TRACE("S60MediaPlayerControl::~S60MediaPlayerControl" << qtThisPtr());
 }
 
 /*!
@@ -81,8 +76,6 @@ S60MediaPlayerControl::~S60MediaPlayerControl()
 
 qint64 S60MediaPlayerControl::position() const
 {
-   // DP0("S60MediaPlayerControl::position");
-
     if (m_session)
         return m_session->position();
     return 0;
@@ -94,8 +87,6 @@ qint64 S60MediaPlayerControl::position() const
 
 qint64 S60MediaPlayerControl::duration() const
 {
-   // DP0("S60MediaPlayerControl::duration");
-
     if (m_session)
         return m_session->duration();
     return -1;
@@ -107,8 +98,6 @@ qint64 S60MediaPlayerControl::duration() const
 
 QMediaPlayer::State S60MediaPlayerControl::state() const
 {
-    DP0("S60MediaPlayerControl::state");
-
     if (m_session)
         return m_session->state();
     return QMediaPlayer::StoppedState;
@@ -120,8 +109,6 @@ QMediaPlayer::State S60MediaPlayerControl::state() const
 
 QMediaPlayer::MediaStatus S60MediaPlayerControl::mediaStatus() const
 {
-    DP0("QMediaPlayer::mediaStatus");
-
     if (m_session)
         return m_session->mediaStatus();
     return m_mediaSettings.mediaStatus();
@@ -134,8 +121,6 @@ QMediaPlayer::MediaStatus S60MediaPlayerControl::mediaStatus() const
 
 int S60MediaPlayerControl::bufferStatus() const
 {
-   // DP0("S60MediaPlayerControl::bufferStatus");
-
     if (m_session)
         return m_session->bufferStatus();
     return 0;
@@ -147,8 +132,6 @@ int S60MediaPlayerControl::bufferStatus() const
 
 int S60MediaPlayerControl::volume() const
 {
-    DP0("S60MediaPlayerControl::volume");
-
     if (m_session)
         return m_session->volume();
     return m_mediaSettings.volume();
@@ -160,8 +143,6 @@ int S60MediaPlayerControl::volume() const
 
 bool S60MediaPlayerControl::isMuted() const
 {
-    DP0("S60MediaPlayerControl::isMuted");
-
    if (m_session)
        return  m_session->isMuted();
    return m_mediaSettings.isMuted();
@@ -175,8 +156,6 @@ bool S60MediaPlayerControl::isMuted() const
 
 bool S60MediaPlayerControl::isSeekable() const
 {
-    DP0("S60MediaPlayerControl::isSeekable");
-
     if (m_session)
        return  m_session->isSeekable();
     return false;
@@ -192,8 +171,6 @@ bool S60MediaPlayerControl::isSeekable() const
 
 QMediaTimeRange S60MediaPlayerControl::availablePlaybackRanges() const
 {
-    DP0("S60MediaPlayerControl::availablePlaybackRanges");
-
     QMediaTimeRange ranges;
 
     if(m_session && m_session->isSeekable())
@@ -208,8 +185,6 @@ QMediaTimeRange S60MediaPlayerControl::availablePlaybackRanges() const
 
 qreal S60MediaPlayerControl::playbackRate() const
 {
-    DP0("S60MediaPlayerControl::playbackRate");
-
     return m_mediaSettings.playbackRate();
 }
 
@@ -219,9 +194,7 @@ qreal S60MediaPlayerControl::playbackRate() const
 
 void S60MediaPlayerControl::setPlaybackRate(qreal rate)
 {
-    DP0("S60MediaPlayerControl::setPlaybackRate +++");
-
-    DP1("S60MediaPlayerControl::setPlaybackRate - ", rate);
+    TRACE("S60MediaPlayerControl::setPlaybackRate" << qtThisPtr() << "rate" << rate);
 
     //getting the current playbackrate
     qreal currentPBrate = m_mediaSettings.playbackRate();
@@ -233,8 +206,6 @@ void S60MediaPlayerControl::setPlaybackRate(qreal rate)
 
         m_mediaSettings.setPlaybackRate(rate);
     }
-
-    DP0("S60MediaPlayerControl::setPlaybackRate ---");
 }
 
 /*!
@@ -244,14 +215,10 @@ void S60MediaPlayerControl::setPlaybackRate(qreal rate)
 
 void S60MediaPlayerControl::setPosition(qint64 pos)
 {
-    DP0("S60MediaPlayerControl::setPosition +++");
-
-    DP1("S60MediaPlayerControl::setPosition, Position:", pos);
+    TRACE("S60MediaPlayerControl::setPosition" << qtThisPtr() << "pos" << pos);
 
     if (m_session)
         m_session->setPosition(pos);
-
-    DP0("S60MediaPlayerControl::setPosition ---");
 }
 
 /*!
@@ -263,12 +230,10 @@ void S60MediaPlayerControl::setPosition(qint64 pos)
 
 void S60MediaPlayerControl::play()
 {
-    DP0("S60MediaPlayerControl::play +++");
+    TRACE("S60MediaPlayerControl::play" << qtThisPtr());
 
     if (m_session)
         m_session->play();
-
-    DP0("S60MediaPlayerControl::play ---");
 }
 
 /*!
@@ -280,12 +245,10 @@ void S60MediaPlayerControl::play()
 
 void S60MediaPlayerControl::pause()
 {
-    DP0("S60MediaPlayerControl::pause +++");
+    TRACE("S60MediaPlayerControl::pause" << qtThisPtr());
 
     if (m_session)
         m_session->pause();
-
-    DP0("S60MediaPlayerControl::pause ---");
 }
 
 /*!
@@ -297,12 +260,10 @@ void S60MediaPlayerControl::pause()
 
 void S60MediaPlayerControl::stop()
 {
-    DP0("S60MediaPlayerControl::stop +++");
+    TRACE("S60MediaPlayerControl::stop" << qtThisPtr());
 
     if (m_session)
         m_session->stop();
-
-    DP0("S60MediaPlayerControl::stop ---");
 }
 
 /*!
@@ -311,20 +272,17 @@ void S60MediaPlayerControl::stop()
 
 void S60MediaPlayerControl::setVolume(int volume)
 {
-    DP0("S60MediaPlayerControl::setVolume +++");
-
-    DP1("S60MediaPlayerControl::setVolume", volume);
-
     int boundVolume = qBound(0, volume, 100);
     if (boundVolume == m_mediaSettings.volume())
         return;
 
+    TRACE("S60MediaPlayerControl::setVolume" << qtThisPtr()
+          << "volume" << volume << "boundVolume" << boundVolume);
+
     m_mediaSettings.setVolume(boundVolume);
 
     if (m_session)
         m_session->setVolume(boundVolume);
-
-    DP0("S60MediaPlayerControl::setVolume ---");
 }
 
 /*!
@@ -333,19 +291,15 @@ void S60MediaPlayerControl::setVolume(int volume)
 
 void S60MediaPlayerControl::setMuted(bool muted)
 {
-    DP0("S60MediaPlayerControl::setMuted +++");
-
-    DP1("S60MediaPlayerControl::setMuted - ", muted);
-
     if (m_mediaSettings.isMuted() == muted)
         return;
 
+    TRACE("S60MediaPlayerControl::setMuted" << qtThisPtr() << "muted" << muted);
+
     m_mediaSettings.setMuted(muted);
 
     if (m_session)
         m_session->setMuted(muted);
-
-    DP0("S60MediaPlayerControl::setMuted ---");
 }
 
 /*!
@@ -354,8 +308,6 @@ void S60MediaPlayerControl::setMuted(bool muted)
 
 QMediaContent S60MediaPlayerControl::media() const
 {
-    DP0("S60MediaPlayerControl::media");
-
     return m_currentResource;
 }
 
@@ -367,8 +319,6 @@ QMediaContent S60MediaPlayerControl::media() const
 
 const QIODevice *S60MediaPlayerControl::mediaStream() const
 {
-    DP0("S60MediaPlayerControl::mediaStream");
-
     return m_stream;
 }
 
@@ -384,7 +334,8 @@ const QIODevice *S60MediaPlayerControl::mediaStream() const
 
 void S60MediaPlayerControl::setMedia(const QMediaContent &source, QIODevice *stream)
 {
-    DP0("S60MediaPlayerControl::setMedia +++");
+    TRACE("S60MediaPlayerControl::setMedia" << qtThisPtr()
+          << "source" << source.canonicalUrl().toString());
 
     Q_UNUSED(stream)
 
@@ -423,8 +374,6 @@ void S60MediaPlayerControl::setMedia(const QMediaContent &source, QIODevice *str
         emit mediaStatusChanged(status);
     }
     emit mediaChanged(m_currentResource);
-
-    DP0("S60MediaPlayerControl::setMedia ---");
 }
 
 /*!
@@ -432,8 +381,6 @@ void S60MediaPlayerControl::setMedia(const QMediaContent &source, QIODevice *str
 */
 S60MediaPlayerSession* S60MediaPlayerControl::session()
 {
-    DP0("S60MediaPlayerControl::session");
-
     return m_session;
 }
 
@@ -443,11 +390,10 @@ S60MediaPlayerSession* S60MediaPlayerControl::session()
 
 void S60MediaPlayerControl::setVideoOutput(QObject *output)
 {
-    DP0("S60MediaPlayerControl::setVideoOutput +++");
+    TRACE("S60MediaPlayerControl::setVideoOutput" << qtThisPtr()
+          << "output" << output);
 
    m_mediaPlayerResolver.VideoPlayerSession()->setVideoRenderer(output);
-
-   DP0("S60MediaPlayerControl::setVideoOutput ---");
 }
 
 /*!
@@ -456,8 +402,6 @@ void S60MediaPlayerControl::setVideoOutput(QObject *output)
 
 bool S60MediaPlayerControl::isAudioAvailable() const
 {
-    DP0("S60MediaPlayerControl::isAudioAvailable");
-
     if (m_session)
         return m_session->isAudioAvailable(); 
     return false;
@@ -469,8 +413,6 @@ bool S60MediaPlayerControl::isAudioAvailable() const
 
 bool S60MediaPlayerControl::isVideoAvailable() const
 {
-    DP0("S60MediaPlayerControl::isVideoAvailable");
-
     if (m_session)
         return m_session->isVideoAvailable();
     return false;
@@ -483,7 +425,6 @@ bool S60MediaPlayerControl::isVideoAvailable() const
 */
 const S60MediaSettings& S60MediaPlayerControl::mediaControlSettings() const
 {
-    DP0("S60MediaPlayerControl::mediaControlSettings");
     return m_mediaSettings;
 }
 
@@ -493,13 +434,10 @@ const S60MediaSettings& S60MediaPlayerControl::mediaControlSettings() const
 
 void S60MediaPlayerControl::setAudioEndpoint(const QString& name)
 {
-    DP0("S60MediaPlayerControl::setAudioEndpoint +++");
-
-    DP1("S60MediaPlayerControl::setAudioEndpoint - ", name);
+    TRACE("S60MediaPlayerControl::setAudioEndpoint" << qtThisPtr()
+          << "name" << name);
 
     m_mediaSettings.setAudioEndpoint(name);
-
-    DP0("S60MediaPlayerControl::setAudioEndpoint ---");
 }
 
 /*!
@@ -508,11 +446,8 @@ void S60MediaPlayerControl::setAudioEndpoint(const QString& name)
 
 void S60MediaPlayerControl::setMediaType(S60MediaSettings::TMediaType type)
 {
-    DP0("S60MediaPlayerControl::setMediaType +++");
-
-    DP1("S60MediaPlayerControl::setMediaType - ", type);
+    TRACE("S60MediaPlayerControl::setMediaType" << qtThisPtr()
+          << "type" << type);
 
     m_mediaSettings.setMediaType(type);
-
-    DP0("S60MediaPlayerControl::setMediaType ---");
 }
diff --git a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayerservice.cpp b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayerservice.cpp
index bf626af350..d623d727ee 100644
--- a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayerservice.cpp
+++ b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayerservice.cpp
@@ -39,8 +39,6 @@
 **
 ****************************************************************************/
 
-#include "DebugMacros.h"
-
 #include <QtCore/qvariant.h>
 #include <QtCore/qdebug.h>
 #include <QtGui/qwidget.h>
@@ -56,6 +54,7 @@
 #include "s60mediaplayeraudioendpointselector.h"
 #include "s60medianetworkaccesscontrol.h"
 #include "s60mediastreamcontrol.h"
+#include "s60mmftrace.h"
 
 #include <qmediaplaylistnavigator.h>
 #include <qmediaplaylist.h>
@@ -75,15 +74,13 @@ S60MediaPlayerService::S60MediaPlayerService(QObject *parent)
     , m_networkAccessControl(NULL)
     , m_videoOutput(NULL)
 {
-    DP0("S60MediaPlayerService::S60MediaPlayerService +++");
+    TRACE("S60MediaPlayerService::S60MediaPlayerService" << qtThisPtr());
 
     m_control = new S60MediaPlayerControl(*this, this);
     m_metaData = new S60MediaMetaDataProvider(m_control, this);
     m_audioEndpointSelector = new S60MediaPlayerAudioEndpointSelector(m_control, this);
     m_streamControl = new S60MediaStreamControl(m_control, this);
     m_networkAccessControl =  new S60MediaNetworkAccessControl(this);
-
-    DP0("S60MediaPlayerService::S60MediaPlayerService ---");
 }
 
 /*!
@@ -92,8 +89,7 @@ S60MediaPlayerService::S60MediaPlayerService(QObject *parent)
 
 S60MediaPlayerService::~S60MediaPlayerService()
 {
-    DP0("S60MediaPlayerService::~S60MediaPlayerService +++");
-    DP0("S60MediaPlayerService::~S60MediaPlayerService ---");
+    TRACE("S60MediaPlayerService::~S60MediaPlayerService" << qtThisPtr());
 }
 
 /*!
@@ -108,22 +104,22 @@ S60MediaPlayerService::~S60MediaPlayerService()
 
 QMediaControl *S60MediaPlayerService::requestControl(const char *name)
 {
-    DP0("S60MediaPlayerService::requestControl");
+    QMediaControl *result = 0;
 
     if (qstrcmp(name, QMediaPlayerControl_iid) == 0)
-        return m_control;
+        result = m_control;
 
     if (qstrcmp(name, QMediaNetworkAccessControl_iid) == 0)
-        return m_networkAccessControl;
+        result = m_networkAccessControl;
 
     if (qstrcmp(name, QMetaDataReaderControl_iid) == 0)
-        return m_metaData;
+        result = m_metaData;
 
     if (qstrcmp(name, QAudioEndpointSelector_iid) == 0)
-        return m_audioEndpointSelector;
+        result = m_audioEndpointSelector;
 
     if (qstrcmp(name, QMediaStreamsControl_iid) == 0)
-        return m_streamControl;
+        result = m_streamControl;
 
     if (!m_videoOutput) {
         if (qstrcmp(name, QVideoWidgetControl_iid) == 0) {
@@ -135,15 +131,17 @@ QMediaControl *S60MediaPlayerService::requestControl(const char *name)
 
         if (m_videoOutput) {
             m_control->setVideoOutput(m_videoOutput);
-            return m_videoOutput;
+            result = m_videoOutput;
         }
     }else {
         if (qstrcmp(name, QVideoWidgetControl_iid) == 0 ||
             qstrcmp(name, QVideoWindowControl_iid) == 0){
-            return m_videoOutput;
+            result = m_videoOutput;
         }
     }
-    return 0;
+    TRACE("S60MediaPlayerService::requestControl" << qtThisPtr()
+          << "name" << name << "result" << result);
+    return result;
 }
 
 /*!
@@ -152,14 +150,13 @@ QMediaControl *S60MediaPlayerService::requestControl(const char *name)
 
 void S60MediaPlayerService::releaseControl(QMediaControl *control)
 {
-    DP0("S60MediaPlayerService::releaseControl ++");
+    TRACE("S60MediaPlayerService::releaseControl" << qtThisPtr()
+          << "control" << control);
 
     if (control == m_videoOutput) {
         m_videoOutput = 0;
         m_control->setVideoOutput(m_videoOutput);
     }
-
-    DP0("S60MediaPlayerService::releaseControl --");
 }
 
 /*!
@@ -168,8 +165,6 @@ void S60MediaPlayerService::releaseControl(QMediaControl *control)
 */
 S60MediaPlayerSession* S60MediaPlayerService::PlayerSession()
 {
-    DP0("S60MediaPlayerService::PlayerSession");
-
     QUrl url = m_control->media().canonicalUrl();
 
     if (url.isEmpty() == true) {
@@ -206,8 +201,6 @@ S60MediaPlayerSession* S60MediaPlayerService::PlayerSession()
 
 S60MediaPlayerSession* S60MediaPlayerService::VideoPlayerSession()
 {
-    DP0("S60MediaPlayerService::VideoPlayerSession +++");
-
     if (!m_videoPlayerSession) {
         m_videoPlayerSession = new S60VideoPlayerSession(this, m_networkAccessControl);
 
@@ -252,8 +245,6 @@ S60MediaPlayerSession* S60MediaPlayerService::VideoPlayerSession()
     m_videoPlayerSession->setMuted(m_control->mediaControlSettings().isMuted());
     m_videoPlayerSession->setAudioEndpoint(m_control->mediaControlSettings().audioEndpoint());
 
-    DP0("S60MediaPlayerService::VideoPlayerSession ---");
-
     return m_videoPlayerSession;
 }
 
@@ -265,8 +256,6 @@ S60MediaPlayerSession* S60MediaPlayerService::VideoPlayerSession()
 
 S60MediaPlayerSession* S60MediaPlayerService::AudioPlayerSession()
 {
-    DP0("S60MediaPlayerService::AudioPlayerSession +++");
-
     if (!m_audioPlayerSession) {
         m_audioPlayerSession = new S60AudioPlayerSession(this);
 
@@ -309,7 +298,5 @@ S60MediaPlayerSession* S60MediaPlayerService::AudioPlayerSession()
     m_audioPlayerSession->setMuted(m_control->mediaControlSettings().isMuted());
     m_audioPlayerSession->setAudioEndpoint(m_control->mediaControlSettings().audioEndpoint());
 
-    DP0("S60MediaPlayerService::AudioPlayerSession ---");
-
     return m_audioPlayerSession;
 }
diff --git a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayersession.cpp b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayersession.cpp
index 4c8c48719a..b004ffdf34 100644
--- a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayersession.cpp
+++ b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayersession.cpp
@@ -39,9 +39,8 @@
 **
 ****************************************************************************/
 
-#include "DebugMacros.h"
-
 #include "s60mediaplayersession.h"
+#include "s60mmftrace.h"
 
 #include <QtCore/qdebug.h>
 #include <QtCore/qdir.h>
@@ -70,12 +69,10 @@ S60MediaPlayerSession::S60MediaPlayerSession(QObject *parent)
     , m_duration(0)
     , m_progressduration(0)
 {
-    DP0("S60MediaPlayerSession::S60MediaPlayerSession +++");
+    TRACE("S60MediaPlayerSession::S60MediaPlayerSession" << qtThisPtr());
 
     connect(m_progressTimer, SIGNAL(timeout()), this, SLOT(tick()));
     connect(m_stalledTimer, SIGNAL(timeout()), this, SLOT(stalled()));
-
-    DP0("S60MediaPlayerSession::S60MediaPlayerSession ---");
 }
 
 /*!
@@ -84,8 +81,7 @@ S60MediaPlayerSession::S60MediaPlayerSession(QObject *parent)
 
 S60MediaPlayerSession::~S60MediaPlayerSession()
 {
-    DP0("S60MediaPlayerSession::~S60MediaPlayerSession +++");
-    DP0("S60MediaPlayerSession::~S60MediaPlayerSession ---");
+    TRACE("S60MediaPlayerSession::~S60MediaPlayerSession" << qtThisPtr());
 }
 
 /*!
@@ -93,8 +89,6 @@ S60MediaPlayerSession::~S60MediaPlayerSession()
 */
 int S60MediaPlayerSession::volume() const
 {
-    DP1("S60MediaPlayerSession::volume", m_volume);
-
     return m_volume;
 }
 
@@ -104,13 +98,11 @@ int S60MediaPlayerSession::volume() const
 
 void S60MediaPlayerSession::setVolume(int volume)
 {
-    DP0("S60MediaPlayerSession::setVolume +++");
-
-    DP1("S60MediaPlayerSession::setVolume - ", volume);
-
     if (m_volume == volume)
         return;
     
+    TRACE("S60MediaPlayerSession::setVolume" << qtThisPtr() << "volume" << volume);
+
     m_volume = volume;
     emit volumeChanged(m_volume);
 
@@ -125,7 +117,6 @@ void S60MediaPlayerSession::setVolume(int volume)
         TRAPD(err, doSetVolumeL(m_volume));
         setError(err);
     }
-    DP0("S60MediaPlayerSession::setVolume ---");
 }
 
 /*!
@@ -134,8 +125,6 @@ void S60MediaPlayerSession::setVolume(int volume)
 
 bool S60MediaPlayerSession::isMuted() const
 {
-    DP1("S60MediaPlayerSession::isMuted", m_muted);
-
     return m_muted;
 }
 
@@ -147,8 +136,6 @@ bool S60MediaPlayerSession::isMuted() const
 
 bool S60MediaPlayerSession::isSeekable() const
 {
-    DP1("S60MediaPlayerSession::isSeekable", m_seekable);
-
     return m_seekable;
 }
 
@@ -158,10 +145,10 @@ bool S60MediaPlayerSession::isSeekable() const
 
 void S60MediaPlayerSession::setMediaStatus(QMediaPlayer::MediaStatus status)
 {
-    DP0("S60MediaPlayerSession::setMediaStatus +++");
-
     if (m_mediaStatus == status)
         return;
+
+    TRACE("S60MediaPlayerSession::setMediaStatus" << qtThisPtr() << "status" << status);
     
     m_mediaStatus = status;
     
@@ -169,8 +156,6 @@ void S60MediaPlayerSession::setMediaStatus(QMediaPlayer::MediaStatus status)
     
     if (m_play_requested && m_mediaStatus == QMediaPlayer::LoadedMedia)
         play();
-
-    DP0("S60MediaPlayerSession::setMediaStatus ---");
 }
 
 /*!
@@ -179,15 +164,13 @@ void S60MediaPlayerSession::setMediaStatus(QMediaPlayer::MediaStatus status)
 
 void S60MediaPlayerSession::setState(QMediaPlayer::State state)
 {
-    DP0("S60MediaPlayerSession::setState +++");
-
     if (m_state == state)
         return;
     
+    TRACE("S60MediaPlayerSession::setMediaStatus" << qtThisPtr() << "state" << state);
+
     m_state = state;
     emit stateChanged(m_state);
-
-    DP0("S60MediaPlayerSession::setState ---");
 }
 
 /*!
@@ -196,8 +179,6 @@ void S60MediaPlayerSession::setState(QMediaPlayer::State state)
 
 QMediaPlayer::State S60MediaPlayerSession::state() const
 {
-    DP1("S60MediaPlayerSession::state", m_state);
-
     return m_state;
 }
 
@@ -207,8 +188,6 @@ QMediaPlayer::State S60MediaPlayerSession::state() const
 
 QMediaPlayer::MediaStatus S60MediaPlayerSession::mediaStatus() const
 {
-    DP1("S60MediaPlayerSession::mediaStatus", m_mediaStatus);
-
     return m_mediaStatus;
 }
 
@@ -220,7 +199,8 @@ QMediaPlayer::MediaStatus S60MediaPlayerSession::mediaStatus() const
 
 void S60MediaPlayerSession::load(const QMediaContent source)
 {
-    DP0("S60MediaPlayerSession::load +++");
+    TRACE("S60MediaPlayerSession::load" << qtThisPtr()
+          << "source" << source.canonicalUrl().toString());
 
     m_source = source;
     setMediaStatus(QMediaPlayer::LoadingMedia);
@@ -234,7 +214,6 @@ void S60MediaPlayerSession::load(const QMediaContent source)
             doLoadL(QString2TPtrC(QDir::toNativeSeparators(source.canonicalUrl().toLocalFile()))));
     setError(err);
     m_isaudiostream = false;
-    DP0("S60MediaPlayerSession::load ---");
 }
 
 TBool S60MediaPlayerSession::isStreaming()
@@ -247,7 +226,8 @@ TBool S60MediaPlayerSession::isStreaming()
 */
 void S60MediaPlayerSession::play()
 {
-    DP0("S60MediaPlayerSession::play +++");
+    TRACE("S60MediaPlayerSession::play" << qtThisPtr()
+          << "state" << state() << "mediaStatus" << mediaStatus());
 
     if ( (state() == QMediaPlayer::PlayingState && m_play_requested == false)
         || mediaStatus() == QMediaPlayer::UnknownMediaStatus
@@ -271,8 +251,6 @@ void S60MediaPlayerSession::play()
     setMuted(m_muted);
     startProgressTimer();
     doPlay();
-
-    DP0("S60MediaPlayerSession::play ---");
 }
 
 /*!
@@ -281,7 +259,7 @@ void S60MediaPlayerSession::play()
 
 void S60MediaPlayerSession::pause()
 {
-    DP0("S60MediaPlayerSession::pause +++");
+    TRACE("S60MediaPlayerSession::pause" << qtThisPtr());
 
     if (state() != QMediaPlayer::PlayingState)
         return;
@@ -294,8 +272,6 @@ void S60MediaPlayerSession::pause()
     stopProgressTimer();
     TRAP_IGNORE(doPauseL());
     m_play_requested = false;
-
-    DP0("S60MediaPlayerSession::pause ---");
 }
 
 /*!
@@ -304,7 +280,7 @@ void S60MediaPlayerSession::pause()
 
 void S60MediaPlayerSession::stop()
 {
-    DP0("S60MediaPlayerSession::stop +++");
+    TRACE("S60MediaPlayerSession::stop" << qtThisPtr());
 
     if (state() == QMediaPlayer::StoppedState)
         return;
@@ -322,8 +298,6 @@ void S60MediaPlayerSession::stop()
     doStop();
     emit positionChanged(0);
     emit stateChanged(m_state);
-
-    DP0("S60MediaPlayerSession::stop ---");
 }
 
 /*!
@@ -333,7 +307,7 @@ void S60MediaPlayerSession::stop()
 
 void S60MediaPlayerSession::reset()
 {
-    DP0("S60MediaPlayerSession::reset +++");
+    TRACE("S60MediaPlayerSession::reset" << qtThisPtr());
 
     m_play_requested = false;
     setError(KErrNone, QString(), true);
@@ -344,8 +318,6 @@ void S60MediaPlayerSession::reset()
     setState(QMediaPlayer::StoppedState);
     setMediaStatus(QMediaPlayer::UnknownMediaStatus);
     setPosition(0);
-
-    DP0("S60MediaPlayerSession::reset ---");
 }
 
 /*!
@@ -354,11 +326,10 @@ void S60MediaPlayerSession::reset()
 
 void S60MediaPlayerSession::setVideoRenderer(QObject *renderer)
 {
-    DP0("S60MediaPlayerSession::setVideoRenderer +++");
+    TRACE("S60MediaPlayerSession::setVideoRenderer" << qtThisPtr()
+          << "videoRenderer" << renderer);
 
     Q_UNUSED(renderer);
-
-    DP0("S60MediaPlayerSession::setVideoRenderer ---");
 }
 
 /*!
@@ -374,8 +345,6 @@ void S60MediaPlayerSession::setVideoRenderer(QObject *renderer)
 
 int S60MediaPlayerSession::bufferStatus()
 {
-    DP0("S60MediaPlayerSession::bufferStatus");
-
     if (state() ==QMediaPlayer::StoppedState)
         return 0;
 
@@ -402,8 +371,6 @@ int S60MediaPlayerSession::bufferStatus()
 
 bool S60MediaPlayerSession::isMetadataAvailable() const
 {
-    DP0("S60MediaPlayerSession::isMetadataAvailable");
-
     return !m_metaDataMap.isEmpty();
 }
 
@@ -412,8 +379,6 @@ bool S60MediaPlayerSession::isMetadataAvailable() const
 */
 QVariant S60MediaPlayerSession::metaData(const QString &key) const
 {
-    DP0("S60MediaPlayerSession::metaData (const QString &key) const");
-
     return m_metaDataMap.value(key);
 }
 
@@ -423,8 +388,6 @@ QVariant S60MediaPlayerSession::metaData(const QString &key) const
 
 QVariant S60MediaPlayerSession::metaData(QtMultimediaKit::MetaData key) const
 {
-    DP0("S60MediaPlayerSession::metaData (QtMultimediaKit::MetaData key) const");
-
     return metaData(metaDataKeyAsString(key));
 }
 
@@ -434,8 +397,6 @@ QVariant S60MediaPlayerSession::metaData(QtMultimediaKit::MetaData key) const
 
 QList<QtMultimediaKit::MetaData> S60MediaPlayerSession::availableMetaData() const
 {
-    DP0("S60MediaPlayerSession::availableMetaData +++");
-
     QList<QtMultimediaKit::MetaData> metaDataTags;
     if (isMetadataAvailable()) {
         for (int i = QtMultimediaKit::Title; i <= QtMultimediaKit::ThumbnailImage; i++) {
@@ -448,8 +409,6 @@ QList<QtMultimediaKit::MetaData> S60MediaPlayerSession::availableMetaData() cons
         }
     }
 
-    DP0("S60MediaPlayerSession::availableMetaData ---");
-
     return metaDataTags;
 }
 
@@ -459,8 +418,6 @@ QList<QtMultimediaKit::MetaData> S60MediaPlayerSession::availableMetaData() cons
 
 QStringList S60MediaPlayerSession::availableExtendedMetaData() const
 {
-    DP0("S60MediaPlayerSession::availableExtendedMetaData");
-
     return m_metaDataMap.keys();
 }
 
@@ -470,8 +427,6 @@ QStringList S60MediaPlayerSession::availableExtendedMetaData() const
 
 QString S60MediaPlayerSession::metaDataKeyAsString(QtMultimediaKit::MetaData key) const
 {
-    DP1("S60MediaPlayerSession::metaDataKeyAsString", key);
-
     switch(key) {
     case QtMultimediaKit::Title: return "title";
     case QtMultimediaKit::AlbumArtist: return "artist";
@@ -537,21 +492,20 @@ QString S60MediaPlayerSession::metaDataKeyAsString(QtMultimediaKit::MetaData key
 
 void S60MediaPlayerSession::setMuted(bool muted)
 {
-    DP0("S60MediaPlayerSession::setMuted +++");
-    DP1("S60MediaPlayerSession::setMuted - ", muted);
-
-    m_muted = muted;
-    emit mutedChanged(m_muted);
-
-    if(   m_mediaStatus == QMediaPlayer::LoadedMedia 
-       || (m_mediaStatus == QMediaPlayer::StalledMedia && state() != QMediaPlayer::StoppedState)
-       || m_mediaStatus == QMediaPlayer::BufferingMedia
-       || m_mediaStatus == QMediaPlayer::BufferedMedia
-       || m_mediaStatus == QMediaPlayer::EndOfMedia) {
-        TRAPD(err, doSetVolumeL((m_muted)?0:m_volume));
-        setError(err);
+    if (muted != m_muted) {
+        TRACE("S60MediaPlayerSession::setMuted" << qtThisPtr() << "muted" << muted);
+        m_muted = muted;
+        emit mutedChanged(m_muted);
+
+        if(   m_mediaStatus == QMediaPlayer::LoadedMedia
+           || (m_mediaStatus == QMediaPlayer::StalledMedia && state() != QMediaPlayer::StoppedState)
+           || m_mediaStatus == QMediaPlayer::BufferingMedia
+           || m_mediaStatus == QMediaPlayer::BufferedMedia
+           || m_mediaStatus == QMediaPlayer::EndOfMedia) {
+            TRAPD(err, doSetVolumeL((m_muted)?0:m_volume));
+            setError(err);
+        }
     }
-    DP0("S60MediaPlayerSession::setMuted ---");
 }
 
 /*!
@@ -560,8 +514,6 @@ void S60MediaPlayerSession::setMuted(bool muted)
 
 qint64 S60MediaPlayerSession::duration() const
 {
-  //  DP0("S60MediaPlayerSession::duration");
-
     if(   mediaStatus() == QMediaPlayer::LoadingMedia
        || mediaStatus() == QMediaPlayer::UnknownMediaStatus
        || mediaStatus() == QMediaPlayer::NoMedia
@@ -580,8 +532,6 @@ qint64 S60MediaPlayerSession::duration() const
 
 qint64 S60MediaPlayerSession::position() const
 {
- //   DP0("S60MediaPlayerSession::position");
-
     if(   mediaStatus() == QMediaPlayer::LoadingMedia
        || mediaStatus() == QMediaPlayer::UnknownMediaStatus
        || mediaStatus() == QMediaPlayer::NoMedia
@@ -605,13 +555,11 @@ qint64 S60MediaPlayerSession::position() const
 
 void S60MediaPlayerSession::setPosition(qint64 pos)
 {
-    DP0("S60MediaPlayerSession::setPosition +++");
-
-    DP1("S60MediaPlayerSession::setPosition - ", pos);
-
     if (position() == pos)
         return;
 
+    TRACE("S60MediaPlayerSession::setPosition" << qtThisPtr() << "pos" << pos);
+
     QMediaPlayer::State originalState = state();
 
     if (originalState == QMediaPlayer::PlayingState)
@@ -634,8 +582,6 @@ void S60MediaPlayerSession::setPosition(qint64 pos)
 
     TRAP_IGNORE(m_progressduration = doGetPositionL());
     emit positionChanged(m_progressduration);
-
-    DP0("S60MediaPlayerSession::setPosition ---");
 }
 
 /*!
@@ -644,13 +590,10 @@ void S60MediaPlayerSession::setPosition(qint64 pos)
 
 void S60MediaPlayerSession::setAudioEndpoint(const QString& audioEndpoint)
 {
-    DP0("S60MediaPlayerSession::setAudioEndpoint +++");
-
-    DP1("S60MediaPlayerSession::setAudioEndpoint - ", audioEndpoint);
+    TRACE("S60MediaPlayerSession::setAudioEndpoint" << qtThisPtr()
+          << "audioEndpoint" << audioEndpoint);
 
     doSetAudioEndpoint(audioEndpoint);
-
-    DP0("S60MediaPlayerSession::setAudioEndpoint ---");
 }
 
 /*!
@@ -661,7 +604,7 @@ void S60MediaPlayerSession::setAudioEndpoint(const QString& audioEndpoint)
 
 void S60MediaPlayerSession::loaded()
 {
-    DP0("S60MediaPlayerSession::loaded +++");
+    TRACE("S60MediaPlayerSession::loaded" << qtThisPtr());
 
     stopStalledTimer();
     if (m_error == KErrNone || m_error == KErrMMPartialPlayback) {
@@ -676,8 +619,6 @@ void S60MediaPlayerSession::loaded()
 
         m_seekable = getIsSeekable();
     }
-
-    DP0("S60MediaPlayerSession::loaded ---");
 }
 
 /*!
@@ -685,7 +626,7 @@ void S60MediaPlayerSession::loaded()
 */
 void S60MediaPlayerSession::endOfMedia()
 {
-    DP0("S60MediaPlayerSession::endOfMedia +++");
+    TRACE("S60MediaPlayerSession::endOfMedia" << qtThisPtr());
 
     m_state = QMediaPlayer::StoppedState;
     setMediaStatus(QMediaPlayer::EndOfMedia);
@@ -694,8 +635,6 @@ void S60MediaPlayerSession::endOfMedia()
     if(m_state == QMediaPlayer::StoppedState)
         emit stateChanged(QMediaPlayer::StoppedState);
     emit positionChanged(m_duration);
-
-    DP0("S60MediaPlayerSession::endOfMedia ---");
 }
 
 /*!
@@ -711,7 +650,7 @@ void S60MediaPlayerSession::endOfMedia()
 
 void S60MediaPlayerSession::buffering()
 {
-    DP0("S60MediaPlayerSession::buffering +++");
+    TRACE("S60MediaPlayerSession::buffering" << qtThisPtr());
 
     startStalledTimer();
     setMediaStatus(QMediaPlayer::BufferingMedia);
@@ -719,8 +658,6 @@ void S60MediaPlayerSession::buffering()
 //Buffering cannot happen in stopped state. Hence update the state
     if (state() == QMediaPlayer::StoppedState)
         setState(QMediaPlayer::PausedState);
-
-    DP0("S60MediaPlayerSession::buffering ---");
 }
 
 /*!
@@ -729,12 +666,10 @@ void S60MediaPlayerSession::buffering()
 
 void S60MediaPlayerSession::buffered()
 {
-    DP0("S60MediaPlayerSession::buffered +++");
+    TRACE("S60MediaPlayerSession::buffered" << qtThisPtr());
 
     stopStalledTimer();
     setMediaStatus(QMediaPlayer::BufferedMedia);
-
-    DP0("S60MediaPlayerSession::buffered ---");
 }
 
 /*!
@@ -743,11 +678,9 @@ void S60MediaPlayerSession::buffered()
 
 void S60MediaPlayerSession::stalled()
 {
-    DP0("S60MediaPlayerSession::stalled +++");
+    TRACE("S60MediaPlayerSession::stalled" << qtThisPtr());
 
     setMediaStatus(QMediaPlayer::StalledMedia);
-
-    DP0("S60MediaPlayerSession::stalled ---");
 }
 
 /*!
@@ -756,8 +689,6 @@ void S60MediaPlayerSession::stalled()
 
 QMap<QString, QVariant>& S60MediaPlayerSession::metaDataEntries()
 {
-    DP0("S60MediaPlayerSession::metaDataEntries");
-
     return m_metaDataMap;
 }
 
@@ -767,10 +698,6 @@ QMap<QString, QVariant>& S60MediaPlayerSession::metaDataEntries()
 
 QMediaPlayer::Error S60MediaPlayerSession::fromSymbianErrorToMultimediaError(int error)
 {
-    DP0("S60MediaPlayerSession::fromSymbianErrorToMultimediaError");
-
-    DP1("S60MediaPlayerSession::fromSymbianErrorToMultimediaError - ", error);
-
     switch(error) {
         case KErrNoMemory:
         case KErrNotFound:
@@ -837,8 +764,6 @@ QMediaPlayer::Error S60MediaPlayerSession::fromSymbianErrorToMultimediaError(int
 
 int S60MediaPlayerSession::error() const
 {
-    DP1("S60MediaPlayerSession::error", m_error);
-
     return m_error;
 }
 
@@ -850,11 +775,8 @@ int S60MediaPlayerSession::error() const
 
 void S60MediaPlayerSession::setError(int error, const QString &errorString, bool forceReset)
 {
-    DP0("S60MediaPlayerSession::setError +++");
-
-    DP5("S60MediaPlayerSession::setError - error:", error,"errorString:", errorString, "forceReset:", forceReset);
-
     if( forceReset ) {
+        TRACE("S60MediaPlayerSession::setError" << qtThisPtr() << "forceReset");
         m_error = KErrNone;
         emit this->error(QMediaPlayer::NoError, QString());
         return;
@@ -865,6 +787,9 @@ void S60MediaPlayerSession::setError(int error, const QString &errorString, bool
         (m_error != KErrNone && error == KErrNone))
         return;
 
+    TRACE("S60MediaPlayerSession::setError" << qtThisPtr()
+          << "error" << error << "errorString" << errorString);
+
     m_error = error;
     QMediaPlayer::Error mediaError = fromSymbianErrorToMultimediaError(m_error);
     QString symbianError = QString(errorString);
@@ -895,8 +820,6 @@ void S60MediaPlayerSession::setAndEmitError(int error)
     symbianError.append("Symbian:");
     symbianError.append(QString::number(error));
     emit this->error(rateError, symbianError);
-
-    DP0("S60MediaPlayerSession::setError ---");
 }
 
 /*!
@@ -905,15 +828,11 @@ void S60MediaPlayerSession::setAndEmitError(int error)
 
 void S60MediaPlayerSession::tick()
 {
-    DP0("S60MediaPlayerSession::tick +++");
-
     m_progressduration = position();
     emit positionChanged(m_progressduration);
 
     if (bufferStatus() < 100)
         emit bufferStatusChanged(bufferStatus());
-
-    DP0("S60MediaPlayerSession::tick ---");
 }
 
 /*!
@@ -922,11 +841,9 @@ void S60MediaPlayerSession::tick()
 
 void S60MediaPlayerSession::startProgressTimer()
 {
-    DP0("S60MediaPlayerSession::startProgressTimer +++");
+    TRACE("S60MediaPlayerSession::startProgressTimer" << qtThisPtr());
 
     m_progressTimer->start(500);
-
-    DP0("S60MediaPlayerSession::startProgressTimer ---");
 }
 
 /*!
@@ -935,12 +852,10 @@ void S60MediaPlayerSession::startProgressTimer()
 
 void S60MediaPlayerSession::stopProgressTimer()
 {
-    DP0("S60MediaPlayerSession::stopProgressTimer +++");
+    TRACE("S60MediaPlayerSession::stopProgressTimer" << qtThisPtr());
 
     m_progressduration = 0;
     m_progressTimer->stop();
-
-    DP0("S60MediaPlayerSession::stopProgressTimer ---");
 }
 
 /*!
@@ -950,11 +865,9 @@ void S60MediaPlayerSession::stopProgressTimer()
 
 void S60MediaPlayerSession::startStalledTimer()
 {
-    DP0("S60MediaPlayerSession::startStalledTimer +++");
+    TRACE("S60MediaPlayerSession::startStalledTimer" << qtThisPtr());
 
     m_stalledTimer->start(30000);
-
-    DP0("S60MediaPlayerSession::startStalledTimer ---");
 }
 
 /*!
@@ -964,11 +877,9 @@ void S60MediaPlayerSession::startStalledTimer()
 
 void S60MediaPlayerSession::stopStalledTimer()
 {
-    DP0("S60MediaPlayerSession::stopStalledTimer +++");
+    TRACE("S60MediaPlayerSession::stopStalledTimer" << qtThisPtr());
 
     m_stalledTimer->stop();
-
-    DP0("S60MediaPlayerSession::stopStalledTimer ---");
 }
 
 /*!
@@ -977,8 +888,6 @@ void S60MediaPlayerSession::stopStalledTimer()
 
 QString S60MediaPlayerSession::TDesC2QString(const TDesC& aDescriptor)
 {
-    DP0("S60MediaPlayerSession::TDesC2QString");
-
     return QString::fromUtf16(aDescriptor.Ptr(), aDescriptor.Length());
 }
 
@@ -988,8 +897,6 @@ QString S60MediaPlayerSession::TDesC2QString(const TDesC& aDescriptor)
 
 TPtrC S60MediaPlayerSession::QString2TPtrC( const QString& string )
 {
-    DP0("S60MediaPlayerSession::QString2TPtrC");
-
 	// Returned TPtrC is valid as long as the given parameter is valid and unmodified
     return TPtrC16(static_cast<const TUint16*>(string.utf16()), string.length());
 }
@@ -1000,8 +907,6 @@ TPtrC S60MediaPlayerSession::QString2TPtrC( const QString& string )
 
 QRect S60MediaPlayerSession::TRect2QRect(const TRect& tr)
 {
-    DP0("S60MediaPlayerSession::TRect2QRect");
-
     return QRect(tr.iTl.iX, tr.iTl.iY, tr.Width(), tr.Height());
 }
 
@@ -1011,8 +916,6 @@ QRect S60MediaPlayerSession::TRect2QRect(const TRect& tr)
 
 TRect S60MediaPlayerSession::QRect2TRect(const QRect& qr)
 {
-    DP0("S60MediaPlayerSession::QRect2TRect");
-
     return TRect(TPoint(qr.left(), qr.top()), TSize(qr.width(), qr.height()));
 }
 
diff --git a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediarecognizer.cpp b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediarecognizer.cpp
index d517f0e917..314b797d10 100644
--- a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediarecognizer.cpp
+++ b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediarecognizer.cpp
@@ -39,9 +39,8 @@
 **
 ****************************************************************************/
 
-#include "DebugMacros.h"
-
 #include "s60mediarecognizer.h"
+#include "s60mmftrace.h"
 #include <e32def.h>
 #include <e32cmn.h>
 #include <QtCore/qurl.h>
@@ -62,8 +61,7 @@ _LIT(KMimeTypeRingingTone, "application/vnd.nokia.ringing-tone");
 
 S60MediaRecognizer::S60MediaRecognizer(QObject *parent) : QObject(parent)
 {
-    DP0("S60MediaRecognizer::S60MediaRecognizer +++");
-    DP0("S60MediaRecognizer::S60MediaRecognizer ---");
+    TRACE("S60MediaRecognizer::S60MediaRecognizer" << qtThisPtr());
 }
 
 /*!
@@ -72,13 +70,11 @@ S60MediaRecognizer::S60MediaRecognizer(QObject *parent) : QObject(parent)
 
 S60MediaRecognizer::~S60MediaRecognizer()
 {
-    DP0("S60MediaRecognizer::~S60MediaRecognizer +++");
+    TRACE("S60MediaRecognizer::~S60MediaRecognizer" << qtThisPtr());
 
     m_file.Close();
     m_fileServer.Close();
     m_recognizer.Close();
-
-    DP0("S60MediaRecognizer::~S60MediaRecognizer ---");
 }
 
 /*!
@@ -89,14 +85,14 @@ S60MediaRecognizer::~S60MediaRecognizer()
 
 S60MediaRecognizer::MediaType S60MediaRecognizer::mediaType(const QUrl &url)
 {
-    DP0("S60MediaRecognizer::mediaType");
-
-    bool isStream = (url.scheme() == "file")?false:true;
-
-    if (isStream)
-        return Url;
+    S60MediaRecognizer::MediaType result;
+    if (url.scheme() == "file")
+        result = identifyMediaType(QDir::cleanPath(url.toLocalFile()));
     else
-        return identifyMediaType(QDir::cleanPath(url.toLocalFile()));
+        result = Url;
+    TRACE("S60MediaRecognizer::mediaType" << qtThisPtr()
+          << "url" << url.toString() << "result" << result);
+    return result;
 }
 
 /*!
@@ -105,9 +101,6 @@ S60MediaRecognizer::MediaType S60MediaRecognizer::mediaType(const QUrl &url)
 
 S60MediaRecognizer::MediaType S60MediaRecognizer::identifyMediaType(const QString& fileName)
 {
-    DP0("S60MediaRecognizer::identifyMediaType +++");
-
-    DP1("S60MediaRecognizer::identifyMediaType - ", fileName);
 
     S60MediaRecognizer::MediaType result = Video; // default to videoplayer
     bool recognizerOpened = false;
@@ -149,8 +142,6 @@ S60MediaRecognizer::MediaType S60MediaRecognizer::identifyMediaType(const QStrin
         }
     }
 
-    DP0("S60MediaRecognizer::identifyMediaType ---");
-
     return result;
 }
 
@@ -160,8 +151,6 @@ S60MediaRecognizer::MediaType S60MediaRecognizer::identifyMediaType(const QStrin
 
 TPtrC S60MediaRecognizer::QString2TPtrC( const QString& string )
 {
-    DP1("S60MediaRecognizer::QString2TPtrC - ", string);
-
     // Returned TPtrC is valid as long as the given parameter is valid and unmodified
     return TPtrC16(static_cast<const TUint16*>(string.utf16()), string.length());
 }
diff --git a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediastreamcontrol.cpp b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediastreamcontrol.cpp
index e6de442bd3..f222e0a0c0 100644
--- a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediastreamcontrol.cpp
+++ b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediastreamcontrol.cpp
@@ -39,11 +39,10 @@
 **
 ****************************************************************************/
 
-#include "DebugMacros.h"
-
 #include "s60mediastreamcontrol.h"
 #include "s60mediaplayersession.h"
 #include "s60mediaplayercontrol.h"
+#include "s60mmftrace.h"
 #include <qmediastreamscontrol.h>
 
 #include <QtCore/qdir.h>
@@ -59,12 +58,10 @@ S60MediaStreamControl::S60MediaStreamControl(QObject *control, QObject *parent)
     , m_control(NULL)
     , m_mediaType(S60MediaSettings::Unknown)
 {
-    DP0("S60MediaStreamControl::S60MediaStreamControl +++");
+    TRACE("S60MediaStreamControl::S60MediaStreamControl" << qtThisPtr());
 
     m_control = qobject_cast<S60MediaPlayerControl*>(control);
     m_mediaType = m_control->mediaControlSettings().mediaType();
-
-    DP0("S60MediaStreamControl::S60MediaStreamControl ---");
 }
 
 /*!
@@ -73,8 +70,7 @@ S60MediaStreamControl::S60MediaStreamControl(QObject *control, QObject *parent)
 
 S60MediaStreamControl::~S60MediaStreamControl()
 {
-    DP0("S60MediaStreamControl::~S60MediaStreamControl +++");
-    DP0("S60MediaStreamControl::~S60MediaStreamControl ---");
+    TRACE("S60MediaStreamControl::~S60MediaStreamControl" << qtThisPtr());
 }
 
 /*!
@@ -83,15 +79,11 @@ S60MediaStreamControl::~S60MediaStreamControl()
 
 int S60MediaStreamControl::streamCount()
 {
-    DP0("S60MediaStreamControl::streamCount");
-
     int streamCount = 0;
     if (m_control->isAudioAvailable())
         streamCount++;
     if (m_control->isVideoAvailable())
         streamCount++;
-    DP1("S60MediaStreamControl::streamCount", streamCount);
-
     return streamCount;
 }
 
@@ -101,10 +93,6 @@ int S60MediaStreamControl::streamCount()
 
 QMediaStreamsControl::StreamType S60MediaStreamControl::streamType(int streamNumber)
 {
-    DP0("S60MediaStreamControl::streamType +++");
-
-    DP1("S60MediaStreamControl::streamType - ", streamNumber);
-
     Q_UNUSED(streamNumber);
 
     QMediaStreamsControl::StreamType type = QMediaStreamsControl::UnknownStream;
@@ -114,8 +102,6 @@ QMediaStreamsControl::StreamType S60MediaStreamControl::streamType(int streamNum
     else
         type = QMediaStreamsControl::AudioStream;
 
-    DP0("S60MediaStreamControl::streamType ---");
-
     return type;
 }
 
@@ -127,8 +113,6 @@ QMediaStreamsControl::StreamType S60MediaStreamControl::streamType(int streamNum
 
 QVariant S60MediaStreamControl::metaData(int streamNumber, QtMultimediaKit::MetaData key)
 {
-    DP0("S60MediaStreamControl::metaData");
-
     Q_UNUSED(streamNumber);
 
     if (m_control->session()) {
@@ -144,10 +128,6 @@ QVariant S60MediaStreamControl::metaData(int streamNumber, QtMultimediaKit::Meta
 
 bool S60MediaStreamControl::isActive(int streamNumber)
 {
-    DP0("S60MediaStreamControl::isActive +++");
-
-    DP1("S60MediaStreamControl::isActive - ", streamNumber);
-
     if (m_control->mediaControlSettings().mediaType() ==  S60MediaSettings::Video) {
         switch (streamNumber) {
         case 1:
@@ -159,8 +139,6 @@ bool S60MediaStreamControl::isActive(int streamNumber)
         }
     }
 
-    DP0("S60MediaStreamControl::isActive ---");
-
     return m_control->isAudioAvailable();
 }
 
@@ -176,15 +154,12 @@ bool S60MediaStreamControl::isActive(int streamNumber)
 
 void S60MediaStreamControl::setActive(int streamNumber, bool state)
 {
-    DP0("S60MediaStreamControl::setActive +++");
-
-    DP2("S60MediaStreamControl::setActive - ", streamNumber, state);
+    TRACE("S60MediaStreamControl::setActive" << qtThisPtr()
+          << "streamNumber" << streamNumber << "state" << state);
 
     Q_UNUSED(streamNumber);
     Q_UNUSED(state);
     // Symbian MMF does not support enabling or disabling specific media streams
-
-    DP0("S60MediaStreamControl::setActive ---");
 }
 
 /*!
@@ -193,9 +168,7 @@ void S60MediaStreamControl::setActive(int streamNumber, bool state)
 
 void S60MediaStreamControl::handleStreamsChanged()
 {
-    DP0("S60MediaStreamControl::handleStreamsChanged +++");
+    TRACE("S60MediaStreamControl::handleStreamsChanged" << qtThisPtr());
 
     emit streamsChanged();
-
-    DP0("S60MediaStreamControl::handleStreamsChanged ---");
 }
diff --git a/plugins/multimedia/symbian/mmf/mediaplayer/s60videoplayersession.cpp b/plugins/multimedia/symbian/mmf/mediaplayer/s60videoplayersession.cpp
index effe1c729c..f7731c9da0 100644
--- a/plugins/multimedia/symbian/mmf/mediaplayer/s60videoplayersession.cpp
+++ b/plugins/multimedia/symbian/mmf/mediaplayer/s60videoplayersession.cpp
@@ -39,14 +39,13 @@
 **
 ****************************************************************************/
 
-#include "DebugMacros.h"
-
 #include "s60videoplayersession.h"
 #include "s60mediaplayerservice.h"
 #include "s60videowidgetcontrol.h"
 #include "s60videowidgetdisplay.h"
 #include "s60videowindowcontrol.h"
 #include "s60videowindowdisplay.h"
+#include "s60mmftrace.h"
 
 #include <QtCore/QTimer>
 #include <QtGui/QApplication>
@@ -177,7 +176,7 @@ S60VideoPlayerSession::S60VideoPlayerSession(QMediaService *service, S60MediaNet
     , m_destinationPckg(KUidInterfaceMMFControllerSessionInfo)
 #endif
 {
-    DP0("S60VideoPlayerSession::S60VideoPlayerSession +++");
+    TRACE("S60VideoPlayerSession::S60VideoPlayerSession" << qtThisPtr());
 
     m_networkAccessControl = object;
 #ifdef VIDEOOUTPUT_GRAPHICS_SURFACES
@@ -215,7 +214,6 @@ S60VideoPlayerSession::S60VideoPlayerSession(QMediaService *service, S60MediaNet
     m_player->RegisterForVideoLoadingNotification(*this);
 #endif // VIDEOOUTPUT_GRAPHICS_SURFACES
     S60VideoPlayerEventHandler::instance()->addApplicationFocusObserver(this);
-    DP0("S60VideoPlayerSession::S60VideoPlayerSession ---");
 }
 
 /*!
@@ -226,7 +224,7 @@ S60VideoPlayerSession::S60VideoPlayerSession(QMediaService *service, S60MediaNet
 
 S60VideoPlayerSession::~S60VideoPlayerSession()
 {
-    DP0("S60VideoPlayerSession::~S60VideoPlayerSession +++");
+    TRACE("S60VideoPlayerSession::~S60VideoPlayerSession" << qtThisPtr());
     S60VideoPlayerEventHandler::instance()->removeApplicationFocusObserver(this);
 #ifdef HAS_AUDIOROUTING_IN_VIDEOPLAYER
     if (m_audioOutput)
@@ -235,12 +233,11 @@ S60VideoPlayerSession::~S60VideoPlayerSession()
 #endif
     m_player->Close();
     delete m_player;
-
-    DP0("S60VideoPlayerSession::~S60VideoPlayerSession ---");
 }
 
 void S60VideoPlayerSession::applicationGainedFocus()
 {
+    TRACE("S60VideoPlayerSession::applicationGainedFocus" << qtThisPtr());
     if (m_backendInitiatedPause) {
         m_backendInitiatedPause = false;
         play();
@@ -253,6 +250,7 @@ void S60VideoPlayerSession::applicationGainedFocus()
 
 void S60VideoPlayerSession::applicationLostFocus()
 {
+    TRACE("S60VideoPlayerSession::applicationLostFocus" << qtThisPtr());
     if (QMediaPlayer::PlayingState == state()) {
         if (!m_isaudiostream) {
         m_backendInitiatedPause = true;
@@ -268,8 +266,6 @@ void S60VideoPlayerSession::applicationLostFocus()
 
 void S60VideoPlayerSession::doLoadL(const TDesC &path)
 {
-    DP0("S60VideoPlayerSession::doLoadL +++");
-
 #ifdef HAS_AUDIOROUTING_IN_VIDEOPLAYER
     // m_audioOutput needs to be reinitialized after MapcInitComplete
     if (m_audioOutput)
@@ -278,8 +274,6 @@ void S60VideoPlayerSession::doLoadL(const TDesC &path)
     m_audioOutput = NULL;
 #endif
     m_player->OpenFileL(path, KHelixUID);
-
-    DP0("S60VideoPlayerSession::doLoadL ---");
 }
 
 /*!
@@ -288,15 +282,15 @@ void S60VideoPlayerSession::doLoadL(const TDesC &path)
 
 void S60VideoPlayerSession::setPlaybackRate(qreal rate)
 {
-    DP0("S60VideoPlayerSession::setPlaybackRate +++");
-
-    DP1("S60VideoPlayerSession::setPlaybackRate - ", rate);
-
     /*
      * setPlaybackRate is not supported in S60 3.1 and 3.2
      * This flag will be defined for 3.1 and 3.2
     */
-#ifndef PLAY_RATE_NOT_SUPPORTED
+#ifdef PLAY_RATE_NOT_SUPPORTED
+    TRACE("S60VideoPlayerSession::setPlaybackRate" << qtThisPtr()
+          << "rate" << rate << "not supported");
+#else
+    TRACE("S60VideoPlayerSession::setPlaybackRate" << qtThisPtr() << "rate" << rate);
     //setPlayVelocity requires rate in the form of
     //50 = 0.5x ;100 = 1.x ; 200 = 2.x ; 300 = 3.x
     //so multiplying rate with 100
@@ -306,8 +300,6 @@ void S60VideoPlayerSession::setPlaybackRate(qreal rate)
     else
         setError(err);
 #endif
-
-    DP0("S60VideoPlayerSession::setPlaybackRate ---");
 }
 
 /*!
@@ -317,8 +309,6 @@ void S60VideoPlayerSession::setPlaybackRate(qreal rate)
 
 void S60VideoPlayerSession::doLoadUrlL(const TDesC &path)
 {
-    DP0("S60VideoPlayerSession::doLoadUrlL +++");
-
 #ifdef HAS_AUDIOROUTING_IN_VIDEOPLAYER
     // m_audioOutput needs to be reinitialized after MapcInitComplete
     if (m_audioOutput)
@@ -328,8 +318,6 @@ void S60VideoPlayerSession::doLoadUrlL(const TDesC &path)
 #endif
     m_accessPointId = m_networkAccessControl->accessPointId();
     m_player->OpenUrlL(path, m_accessPointId, KNullDesC8, KHelixUID);
-
-    DP0("S60VideoPlayerSession::doLoadUrlL ---");
 }
 
 /*!
@@ -339,13 +327,8 @@ void S60VideoPlayerSession::doLoadUrlL(const TDesC &path)
 
 int S60VideoPlayerSession::doGetBufferStatusL() const
 {
- //   DP0("S60VideoPlayerSession::doGetBufferStatusL +++");
-
     int progress = 0;
     m_player->GetVideoLoadingProgressL(progress);
-
-  //  DP0("S60VideoPlayerSession::doGetBufferStatusL ---");
-
     return progress;
 }
 
@@ -355,8 +338,6 @@ int S60VideoPlayerSession::doGetBufferStatusL() const
 
 qint64 S60VideoPlayerSession::doGetDurationL() const
 {
-  //  DP0("S60VideoPlayerSession::doGetDurationL");
-
     return m_player->DurationL().Int64() / qint64(1000);
 }
 
@@ -366,7 +347,8 @@ qint64 S60VideoPlayerSession::doGetDurationL() const
 
 void S60VideoPlayerSession::setVideoRenderer(QObject *videoOutput)
 {
-    DP0("S60VideoPlayerSession::setVideoRenderer +++");
+    TRACE("S60VideoPlayerSession::setVideoRenderer" << qtThisPtr()
+          << "output" << videoOutput);
     if (videoOutput != m_videoOutputControl) {
         if (m_videoOutputDisplay) {
             m_videoOutputDisplay->setHasContent(false);
@@ -394,8 +376,6 @@ void S60VideoPlayerSession::setVideoRenderer(QObject *videoOutput)
         m_videoOutputControl = videoOutput;
         windowHandleChanged();
     }
-
-    DP0("S60VideoPlayerSession::setVideoRenderer ---");
 }
 
 /*!
@@ -403,7 +383,9 @@ void S60VideoPlayerSession::setVideoRenderer(QObject *videoOutput)
 */
 void S60VideoPlayerSession::applyPendingChanges(bool force)
 {
-    DP0("S60VideoPlayerSession::applyPendingChanges +++");
+    TRACE("S60VideoPlayerSession::applyPendingChanges" << qtThisPtr()
+          << "mediaStatus" << mediaStatus() << "force" << force
+          << "pendingChanges" << m_pendingChanges);
 
     if (   force
         || QMediaPlayer::LoadedMedia == mediaStatus()
@@ -486,8 +468,6 @@ void S60VideoPlayerSession::applyPendingChanges(bool force)
         }
         setError(error);
     }
-
-    DP0("S60VideoPlayerSession::applyPendingChanges ---");
 }
 
 /*!
@@ -496,8 +476,6 @@ void S60VideoPlayerSession::applyPendingChanges(bool force)
 
 bool S60VideoPlayerSession::isVideoAvailable()
 {
-    DP0("S60VideoPlayerSession::isVideoAvailable");
-
 #ifdef PRE_S60_50_PLATFORM
     return true; // this is not supported in pre 5th platforms
 #else
@@ -526,8 +504,6 @@ bool S60VideoPlayerSession::isVideoAvailable()
 
 bool S60VideoPlayerSession::isAudioAvailable()
 {
-    DP0("S60VideoPlayerSession::isAudioAvailable");
-
     if ( mediaStatus() == QMediaPlayer::LoadingMedia
         || mediaStatus() == QMediaPlayer::UnknownMediaStatus
         || mediaStatus() == QMediaPlayer::NoMedia
@@ -551,11 +527,7 @@ bool S60VideoPlayerSession::isAudioAvailable()
 
 void S60VideoPlayerSession::doPlay()
 {
-    DP0("S60VideoPlayerSession::doPlay +++");
-
     m_player->Play();
-
-    DP0("S60VideoPlayerSession::doPlay ---");
 }
 
 /*!
@@ -564,11 +536,7 @@ void S60VideoPlayerSession::doPlay()
 
 void S60VideoPlayerSession::doPauseL()
 {
-    DP0("S60VideoPlayerSession::doPauseL +++");
-
     m_player->PauseL();
-
-    DP0("S60VideoPlayerSession::doPauseL ---");
 }
 
 /*!
@@ -578,8 +546,6 @@ void S60VideoPlayerSession::doPauseL()
 
 void S60VideoPlayerSession::doStop()
 {
-    DP0("S60VideoPlayerSession::doStop +++");
-
     if (m_stream)
         m_networkAccessControl->resetIndex();
 
@@ -587,8 +553,6 @@ void S60VideoPlayerSession::doStop()
         m_videoOutputDisplay->setHasContent(false);
 
     m_player->Stop();
-
-    DP0("S60VideoPlayerSession::doStop ---");
 }
 
 /*!
@@ -597,8 +561,6 @@ void S60VideoPlayerSession::doStop()
 
 void S60VideoPlayerSession::doClose()
 {
-    DP0("S60VideoPlayerSession::doClose +++");
-
 #ifdef HAS_AUDIOROUTING_IN_VIDEOPLAYER
     if (m_audioOutput) {
         m_audioOutput->UnregisterObserver(*this);
@@ -612,8 +574,6 @@ void S60VideoPlayerSession::doClose()
 // close will remove the window handle in media clint video.
 // So mark it in pending changes.
     m_pendingChanges |= WindowHandle;
-
-    DP0("S60VideoPlayerSession::doClose ---");
 }
 
 /*!
@@ -623,8 +583,6 @@ void S60VideoPlayerSession::doClose()
 
 qint64 S60VideoPlayerSession::doGetPositionL() const
 {
-  //  DP0("S60VideoPlayerSession::doGetPositionL");
-
     return m_player->PositionL().Int64() / qint64(1000);
 }
 
@@ -634,8 +592,6 @@ qint64 S60VideoPlayerSession::doGetPositionL() const
 
 void S60VideoPlayerSession::doSetPositionL(qint64 microSeconds)
 {
- //   DP0("S60VideoPlayerSession::doSetPositionL");
-
     m_player->SetPositionL(TTimeIntervalMicroSeconds(microSeconds));
 }
 
@@ -646,13 +602,7 @@ void S60VideoPlayerSession::doSetPositionL(qint64 microSeconds)
 
 void S60VideoPlayerSession::doSetVolumeL(int volume)
 {
-    DP0("S60VideoPlayerSession::doSetVolumeL +++");
-
-    DP1("S60VideoPlayerSession::doSetVolumeL - ", volume);
-
     m_player->SetVolumeL(volume * m_player->MaxVolume() / 100);
-
-    DP0("S60VideoPlayerSession::doSetVolumeL ---");
 }
 
 /*!
@@ -662,9 +612,8 @@ void S60VideoPlayerSession::doSetVolumeL(int volume)
 
 void S60VideoPlayerSession::MvpuoOpenComplete(TInt aError)
 {
-    DP0("S60VideoPlayerSession::MvpuoOpenComplete +++");
-
-    DP1("S60VideoPlayerSession::MvpuoOpenComplete - aError:", aError);
+    TRACE("S60VideoPlayerSession::MvpuoOpenComplete" << qtThisPtr()
+          << "error" << aError);
 
     setError(aError);
 #ifdef HTTP_COOKIES_ENABLED
@@ -708,8 +657,6 @@ void S60VideoPlayerSession::MvpuoOpenComplete(TInt aError)
 #endif
     const TMMFMessageDestinationPckg dest( KUidInterfaceMMFROPController );
     TRAP_IGNORE(m_player->CustomCommandSync(dest, KMMFROPControllerEnablePausedLoadingStatus, KNullDesC8, KNullDesC8));
-
-    DP0("S60VideoPlayerSession::MvpuoOpenComplete ---");
 }
 
 /*!
@@ -719,9 +666,8 @@ void S60VideoPlayerSession::MvpuoOpenComplete(TInt aError)
 
 void S60VideoPlayerSession::MvpuoPrepareComplete(TInt aError)
 {
-    DP0("S60VideoPlayerSession::MvpuoPrepareComplete +++");
-
-    DP1("S60VideoPlayerSession::MvpuoPrepareComplete - aError:", aError);
+    TRACE("S60VideoPlayerSession::MvpuoPrepareComplete" << qtThisPtr()
+          << "error" << aError);
 
     if (KErrNone == aError && m_stream) {
         emit accessPointChanged(m_accessPointId);
@@ -764,8 +710,6 @@ void S60VideoPlayerSession::MvpuoPrepareComplete(TInt aError)
     } else {
         setError(error);
     }
-
-    DP0("S60VideoPlayerSession::MvpuoPrepareComplete ---");
 }
 
 /*!
@@ -774,12 +718,8 @@ void S60VideoPlayerSession::MvpuoPrepareComplete(TInt aError)
 
 void S60VideoPlayerSession::MvpuoFrameReady(CFbsBitmap &aFrame, TInt aError)
 {
-    DP0("S60VideoPlayerSession::MvpuoFrameReady +++");
-
     Q_UNUSED(aFrame);
     Q_UNUSED(aError);
-
-    DP0("S60VideoPlayerSession::MvpuoFrameReady ---");
 }
 
 /*!
@@ -790,9 +730,8 @@ void S60VideoPlayerSession::MvpuoFrameReady(CFbsBitmap &aFrame, TInt aError)
 
 void S60VideoPlayerSession::MvpuoPlayComplete(TInt aError)
 {
-    DP0("S60VideoPlayerSession::MvpuoPlayComplete +++");
-
-    DP1("S60VideoPlayerSession::MvpuoPlayComplete - aError", aError);
+    TRACE("S60VideoPlayerSession::MvpuoPlayComplete" << qtThisPtr()
+          << "error" << aError);
 
     if (m_stream)
     m_networkAccessControl->resetIndex();
@@ -803,8 +742,6 @@ void S60VideoPlayerSession::MvpuoPlayComplete(TInt aError)
     } else {
         endOfMedia();
     }
-
-    DP0("S60VideoPlayerSession::MvpuoPlayComplete ---");
 }
 
 
@@ -815,11 +752,7 @@ void S60VideoPlayerSession::MvpuoPlayComplete(TInt aError)
 
 void S60VideoPlayerSession::MvpuoEvent(const TMMFEvent &aEvent)
 {
-    DP0("S60VideoPlayerSession::MvpuoEvent +++");
-
     Q_UNUSED(aEvent);
-
-    DP0("S60VideoPlayerSession::MvpuoEvent ---");
 }
 
 /*!
@@ -829,8 +762,6 @@ void S60VideoPlayerSession::MvpuoEvent(const TMMFEvent &aEvent)
 
 void S60VideoPlayerSession::updateMetaDataEntriesL()
 {
-    DP0("S60VideoPlayerSession::updateMetaDataEntriesL +++");
-
     metaDataEntries().clear();
     int numberOfMetaDataEntries = 0;
     numberOfMetaDataEntries = m_player->NumberOfMetaDataEntriesL();
@@ -841,8 +772,6 @@ void S60VideoPlayerSession::updateMetaDataEntriesL()
         delete entry;
     }
     emit metaDataChanged();
-
-    DP0("S60VideoPlayerSession::updateMetaDataEntriesL ---");
 }
 
 /*!
@@ -851,12 +780,10 @@ void S60VideoPlayerSession::updateMetaDataEntriesL()
 
 void S60VideoPlayerSession::windowHandleChanged()
 {
-    DP0("S60VideoPlayerSession::windowHandleChanged +++");
+    TRACE("S60VideoPlayerSession::windowHandleChanged" << qtThisPtr());
 
     m_pendingChanges |= WindowHandle;
     applyPendingChanges();
-
-    DP0("S60VideoPlayerSession::windowHandleChanged ---");
 }
 
 /*!
@@ -865,12 +792,10 @@ void S60VideoPlayerSession::windowHandleChanged()
 
 void S60VideoPlayerSession::displayRectChanged()
 {
-    DP0("S60VideoPlayerSession::displayRectChanged +++");
+    TRACE("S60VideoPlayerSession::displayRectChanged" << qtThisPtr());
 
     m_pendingChanges |= DisplayRect;
     applyPendingChanges();
-
-    DP0("S60VideoPlayerSession::displayRectChanged ---");
 }
 
 /*!
@@ -879,16 +804,16 @@ void S60VideoPlayerSession::displayRectChanged()
 
 void S60VideoPlayerSession::aspectRatioChanged()
 {
-    DP0("S60VideoPlayerSession::aspectRatioChanged +++");
+    TRACE("S60VideoPlayerSession::aspectRatioChanged" << qtThisPtr());
 
     m_pendingChanges |= ScaleFactors;
     applyPendingChanges();
-
-    DP0("S60VideoPlayerSession::aspectRatioChanged ---");
 }
 
 void S60VideoPlayerSession::rotationChanged()
 {
+    TRACE("S60VideoPlayerSession::rotationChanged" << qtThisPtr());
+
     m_pendingChanges |= ScaleFactors;
     m_pendingChanges |= Rotation;
     applyPendingChanges();
@@ -897,28 +822,24 @@ void S60VideoPlayerSession::rotationChanged()
 #ifndef VIDEOOUTPUT_GRAPHICS_SURFACES
 void S60VideoPlayerSession::suspendDirectScreenAccess()
 {
-    DP0("S60VideoPlayerSession::suspendDirectScreenAccess +++");
+    TRACE("S60VideoPlayerSession::suspendDirectScreenAccess" << qtThisPtr());
 
     m_dsaStopped = stopDirectScreenAccess();
-
-    DP0("S60VideoPlayerSession::suspendDirectScreenAccess ---");
 }
 
 void S60VideoPlayerSession::resumeDirectScreenAccess()
 {
-    DP0("S60VideoPlayerSession::resumeDirectScreenAccess +++");
+    TRACE("S60VideoPlayerSession::resumeDirectScreenAccess" << qtThisPtr());
 
     if (!m_dsaStopped)
         return;
     startDirectScreenAccess();
     m_dsaStopped = false;
-
-    DP0("S60VideoPlayerSession::resumeDirectScreenAccess ---");
 }
 
 void S60VideoPlayerSession::startDirectScreenAccess()
 {
-    DP0("S60VideoPlayerSession::startDirectScreenAccess +++");
+    TRACE("S60VideoPlayerSession::startDirectScreenAccess" << qtThisPtr());
 
     if (m_dsaActive)
         return;
@@ -926,13 +847,11 @@ void S60VideoPlayerSession::startDirectScreenAccess()
     if (err == KErrNone)
         m_dsaActive = true;
     setError(err);
-
-    DP0("S60VideoPlayerSession::startDirectScreenAccess ---");
 }
 
 bool S60VideoPlayerSession::stopDirectScreenAccess()
 {
-    DP0("S60VideoPlayerSession::stopDirectScreenAccess");
+    TRACE("S60VideoPlayerSession::stopDirectScreenAccess" << qtThisPtr());
 
     if (!m_dsaActive)
         return false;
@@ -950,11 +869,9 @@ bool S60VideoPlayerSession::stopDirectScreenAccess()
 
 void S60VideoPlayerSession::MvloLoadingStarted()
 {
-    DP0("S60VideoPlayerSession::MvloLoadingStarted +++");
+    TRACE("S60VideoPlayerSession::MvloLoadingStarted" << qtThisPtr());
 
     buffering();
-
-    DP0("S60VideoPlayerSession::MvloLoadingStarted ---");
 }
 
 /*!
@@ -963,13 +880,11 @@ void S60VideoPlayerSession::MvloLoadingStarted()
 
 void S60VideoPlayerSession::MvloLoadingComplete()
 {
-    DP0("S60VideoPlayerSession::MvloLoadingComplete +++");
+    TRACE("S60VideoPlayerSession::MvloLoadingComplete" << qtThisPtr());
 
     buffered();
     if (m_videoOutputDisplay)
         m_videoOutputDisplay->setHasContent(true);
-
-    DP0("S60VideoPlayerSession::MvloLoadingComplete ---");
 }
 
 /*!
@@ -980,13 +895,7 @@ void S60VideoPlayerSession::MvloLoadingComplete()
 
 void S60VideoPlayerSession::doSetAudioEndpoint(const QString& audioEndpoint)
 {
-    DP0("S60VideoPlayerSession::doSetAudioEndpoint +++");
-
-    DP1("S60VideoPlayerSession::doSetAudioEndpoint - ", audioEndpoint);
-
     m_audioEndpoint = audioEndpoint;
-
-    DP0("S60VideoPlayerSession::doSetAudioEndpoint ---");
 }
 
 /*!
@@ -996,8 +905,6 @@ void S60VideoPlayerSession::doSetAudioEndpoint(const QString& audioEndpoint)
 
 QString S60VideoPlayerSession::activeEndpoint() const
 {
-    DP0("S60VideoPlayerSession::activeEndpoint +++");
-
     QString outputName = m_audioEndpoint;
 #ifdef HAS_AUDIOROUTING_IN_VIDEOPLAYER
     if (m_audioOutput) {
@@ -1005,9 +912,6 @@ QString S60VideoPlayerSession::activeEndpoint() const
         outputName = qStringFromTAudioOutputPreference(output);
     }
 #endif
-
-    DP1("S60VideoPlayerSession::activeEndpoint- outputName:", outputName);
-    DP0("S60VideoPlayerSession::activeEndpoint ---");
     return outputName;
 }
 
@@ -1017,8 +921,6 @@ QString S60VideoPlayerSession::activeEndpoint() const
 
 QString S60VideoPlayerSession::defaultEndpoint() const
 {
-    DP0("S60VideoPlayerSession::defaultEndpoint +++");
-
     QString outputName = DefaultAudioEndpoint;
 #ifdef HAS_AUDIOROUTING_IN_VIDEOPLAYER
     if (m_audioOutput) {
@@ -1026,10 +928,6 @@ QString S60VideoPlayerSession::defaultEndpoint() const
         outputName = qStringFromTAudioOutputPreference(output);
     }
 #endif
-
-    DP1("S60VideoPlayerSession::defaultEndpoint, outputName:", outputName);
-    DP0("S60VideoPlayerSession::defaultEndpoint ---");
-
     return outputName;
 }
 
@@ -1039,9 +937,7 @@ QString S60VideoPlayerSession::defaultEndpoint() const
 
 void S60VideoPlayerSession::setActiveEndpoint(const QString& name)
 {
-    DP0("S60VideoPlayerSession::setActiveEndpoint +++");
-
-    DP1("S60VideoPlayerSession::setActiveEndpoint - ", name);
+    TRACE("S60VideoPlayerSession::setActiveEndpoint" << qtThisPtr() << "name" << name);
 
 #ifdef HAS_AUDIOROUTING_IN_VIDEOPLAYER
     CAudioOutput::TAudioOutputPreference output = CAudioOutput::ENoPreference;
@@ -1060,8 +956,6 @@ void S60VideoPlayerSession::setActiveEndpoint(const QString& name)
         setError(err);
     }
 #endif
-
-    DP0("S60VideoPlayerSession::setActiveEndpoint ---");
 }
 
 /*!
@@ -1076,13 +970,12 @@ void S60VideoPlayerSession::setActiveEndpoint(const QString& name)
 void S60VideoPlayerSession::DefaultAudioOutputChanged( CAudioOutput& aAudioOutput,
                                         CAudioOutput::TAudioOutputPreference aNewDefault)
 {
-    DP0("S60VideoPlayerSession::DefaultAudioOutputChanged +++");
+    TRACE("S60VideoPlayerSession::DefaultAudioOutputChanged" << qtThisPtr()
+          << "newDefault" << aNewDefault);
 
     // Emit already implemented in setActiveEndpoint function
     Q_UNUSED(aAudioOutput)
     Q_UNUSED(aNewDefault)
-
-    DP0("S60VideoPlayerSession::DefaultAudioOutputChanged ---");
 }
 
 /*!
@@ -1091,8 +984,6 @@ void S60VideoPlayerSession::DefaultAudioOutputChanged( CAudioOutput& aAudioOutpu
 
 QString S60VideoPlayerSession::qStringFromTAudioOutputPreference(CAudioOutput::TAudioOutputPreference output) const
 {
-    DP0("S60VideoPlayerSession::qStringFromTAudioOutputPreference");
-
     if (output == CAudioOutput::ENoPreference)
         return QString("Default");
     else if (output == CAudioOutput::EAll)
@@ -1113,8 +1004,6 @@ QString S60VideoPlayerSession::qStringFromTAudioOutputPreference(CAudioOutput::T
 
 bool S60VideoPlayerSession::getIsSeekable() const
 {
-    DP0("S60VideoPlayerSession::getIsSeekable +++");
-
     bool seekable = ETrue;
     int numberOfMetaDataEntries = 0;
 
@@ -1135,7 +1024,6 @@ bool S60VideoPlayerSession::getIsSeekable() const
             break;
         }
     }
-    DP0("S60VideoPlayerSession::getIsSeekable ---");
 
     return seekable;
 }
author	Gareth Stockwell <gareth.stockwell@accenture.com>	2011-10-06 14:59:42 +0100
committer	Gareth Stockwell <gareth.stockwell@accenture.com>	2011-10-06 15:50:00 +0100
commit	3dc5b580ba8bc8fb489c88975bb03cfee7013ed9 (patch)
tree	807a703f744b7542d5e7feabc6cfe0ca830cfd87
parent	2829240beca99d57e94b52b7b3efab3c328f0d8e (diff)