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

1 files changed, 52 insertions, 148 deletions

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;
 }