Merge remote branch 'origin/master'

Conflicts:
	configure
	src/plugins/mediaservices/mediaservices.pro

5 files changed, 9 insertions, 11 deletions

diff --git a/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp b/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp
index 49eeb23..4d0ffe4 100644
--- a/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp
+++ b/src/plugins/mediaservices/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp
@@ -41,7 +41,7 @@
 
 #include "qgstreamermetadataprovider.h"
 #include "qgstreamerplayersession.h"
-#include <QDebug>
+#include <QtCore/qdebug.h>
 
 #include <gst/gstversion.h>
 
diff --git a/src/plugins/mediaservices/gstreamer/qgstreamerserviceplugin.cpp b/src/plugins/mediaservices/gstreamer/qgstreamerserviceplugin.cpp
index 9e5f425..589d2b5 100644
--- a/src/plugins/mediaservices/gstreamer/qgstreamerserviceplugin.cpp
+++ b/src/plugins/mediaservices/gstreamer/qgstreamerserviceplugin.cpp
@@ -43,7 +43,6 @@
 #include <QtCore/qdebug.h>
 #include <QtGui/QIcon>
 #include <QtCore/QDir>
-#include <QtCore/QDebug>
 
 #include "qgstreamerserviceplugin.h"
 
@@ -99,7 +98,7 @@ QMediaService* QGstreamerServicePlugin::create(const QString &key)
         return new QGstreamerCaptureService(key);
 #endif
 
-    qDebug() << "unsupported key:" << key;
+    qWarning() << "GStreamer service plugin: unsupported service -" << key;
     return 0;
 }
 
@@ -145,7 +144,7 @@ void QGstreamerServicePlugin::updateDevices() const
     QFileInfoList entries = devDir.entryInfoList(QStringList() << "video*");
 
     foreach( const QFileInfo &entryInfo, entries ) {
-        qDebug() << "Try" << entryInfo.filePath();
+//        qDebug() << "Try" << entryInfo.filePath();
 
         int fd = ::open(entryInfo.filePath().toLatin1().constData(), O_RDWR );
         if (fd == -1)
@@ -172,7 +171,7 @@ void QGstreamerServicePlugin::updateDevices() const
                 name = entryInfo.fileName();
             else
                 name = QString((const char*)vcap.card);
-            qDebug() << "found camera: " << name;
+//            qDebug() << "found camera: " << name;
 
             m_cameraDevices.append(entryInfo.filePath().toLocal8Bit());
             m_cameraDescriptions.append(name);
diff --git a/src/plugins/mediaservices/gstreamer/qgstreamervideoinputdevicecontrol.cpp b/src/plugins/mediaservices/gstreamer/qgstreamervideoinputdevicecontrol.cpp
index ac9a1e3..94ae847 100644
--- a/src/plugins/mediaservices/gstreamer/qgstreamervideoinputdevicecontrol.cpp
+++ b/src/plugins/mediaservices/gstreamer/qgstreamervideoinputdevicecontrol.cpp
@@ -120,7 +120,7 @@ void QGstreamerVideoInputDeviceControl::update()
     QFileInfoList entries = devDir.entryInfoList(QStringList() << "video*");
 
     foreach( const QFileInfo &entryInfo, entries ) {
-        qDebug() << "Try" << entryInfo.filePath();
+//        qDebug() << "Try" << entryInfo.filePath();
 
         int fd = ::open(entryInfo.filePath().toLatin1().constData(), O_RDWR );
         if (fd == -1)
@@ -147,7 +147,7 @@ void QGstreamerVideoInputDeviceControl::update()
                 name = entryInfo.fileName();
             else
                 name = QString((const char*)vcap.card);
-            qDebug() << "found camera: " << name;
+//            qDebug() << "found camera: " << name;
 
             m_names.append(entryInfo.filePath());
             m_descriptions.append(name);
diff --git a/src/plugins/mediaservices/gstreamer/qgstxvimagebuffer.cpp b/src/plugins/mediaservices/gstreamer/qgstxvimagebuffer.cpp
index 0e47c98..5b99817 100644
--- a/src/plugins/mediaservices/gstreamer/qgstxvimagebuffer.cpp
+++ b/src/plugins/mediaservices/gstreamer/qgstxvimagebuffer.cpp
@@ -182,7 +182,7 @@ void QGstXvImageBufferPool::queuedAlloc()
             );
 
     if (!xvBuffer->xvImage) {
-        qDebug() << "QGstXvImageBufferPool: XvShmCreateImage failed";
+//        qDebug() << "QGstXvImageBufferPool: XvShmCreateImage failed";
         m_allocWaitCondition.wakeOne();
         return;
     }
@@ -192,7 +192,7 @@ void QGstXvImageBufferPool::queuedAlloc()
     xvBuffer->shmInfo.readOnly = False;
 
     if (!XShmAttach(QX11Info::display(), &xvBuffer->shmInfo)) {
-        qDebug() << "QGstXvImageBufferPool: XShmAttach failed";
+//        qDebug() << "QGstXvImageBufferPool: XShmAttach failed";
         m_allocWaitCondition.wakeOne();
         return;
     }
diff --git a/src/plugins/mediaservices/gstreamer/qvideosurfacegstsink.cpp b/src/plugins/mediaservices/gstreamer/qvideosurfacegstsink.cpp
index 9e3807b..402a225 100644
--- a/src/plugins/mediaservices/gstreamer/qvideosurfacegstsink.cpp
+++ b/src/plugins/mediaservices/gstreamer/qvideosurfacegstsink.cpp
@@ -41,9 +41,8 @@
 
 #include <QtMultimedia/QAbstractVideoSurface>
 #include <QtMultimedia/QVideoFrame>
-#include <QDebug>
+#include <QtCore/qdebug.h>
 #include <QMap>
-#include <QDebug>
 #include <QThread>
 #include <QtGui/qx11info_x11.h>