From: Thomas McGuire <thomas.mcguire.qnx@kdab.com>
Date: Wed, 5 Sep 2012 11:45:05 +0000 (+0200)
Subject: Blackberry: Use debug output for errors by default
X-Git-Tag: upstream/5.2.95+rc1~199
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=06302999da91d6e32ddf9c65171994e375f739ed;p=platform%2Fupstream%2Fqtmultimedia.git

Blackberry: Use debug output for errors by default

This makes diagnosing problems remotely a lot easier.

Change-Id: I23434af5e88fb8dcdb154be34f12276eba652d4f
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
---

diff --git a/src/plugins/blackberry/bbmediaplayercontrol.cpp b/src/plugins/blackberry/bbmediaplayercontrol.cpp
index 28a84c2..4ea42c7 100644
--- a/src/plugins/blackberry/bbmediaplayercontrol.cpp
+++ b/src/plugins/blackberry/bbmediaplayercontrol.cpp
@@ -53,14 +53,6 @@
 #include <sys/strm.h>
 #include <sys/stat.h>
 
-//#define QBBMEDIA_DEBUG
-
-#ifdef QBBMEDIA_DEBUG
-#define qBbMediaDebug qDebug
-#else
-#define qBbMediaDebug QT_NO_QDEBUG_MACRO
-#endif
-
 QT_BEGIN_NAMESPACE
 
 static int idCounter = 0;
@@ -119,7 +111,7 @@ void BbMediaPlayerControl::openConnection()
 
     m_eventMonitor = mmrenderer_request_events(m_contextName.toLatin1(), 0, m_id);
     if (!m_eventMonitor) {
-        qBbMediaDebug() << "Unable to request multimedia events";
+        qDebug() << "Unable to request multimedia events";
         emit error(0, "Unable to request multimedia events");
     }
 }
@@ -167,7 +159,7 @@ QString BbMediaPlayerControl::resourcePathForUrl(const QUrl &url)
         if (!QFile::copy(qrcPath, m_tempMediaFileName)) {
             const QString errorMsg =
                 QString("Failed to copy resource file to temporary file %1 for playback").arg(m_tempMediaFileName);
-            qBbMediaDebug() << errorMsg;
+            qDebug() << errorMsg;
             emit error(0, errorMsg);
             return QString();
         }
@@ -610,14 +602,14 @@ void BbMediaPlayerControl::emitMmError(const QString &msg)
 {
     int errorCode = MMR_ERROR_NONE;
     const QString errorMessage = mmErrorMessage(msg, m_context, &errorCode);
-    qBbMediaDebug() << errorMessage;
+    qDebug() << errorMessage;
     emit error(errorCode, errorMessage);
 }
 
 void BbMediaPlayerControl::emitPError(const QString &msg)
 {
     const QString errorMessage = QString("%1: %2").arg(msg).arg(strerror(errno));
-    qBbMediaDebug() << errorMessage;
+    qDebug() << errorMessage;
     emit error(errno, errorMessage);
 }