From 95de9e6154d75688e81a3b79007dfe6c56d3b65b Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@qt.io>
Date: Mon, 21 Nov 2016 10:44:47 +0100
Subject: Use QT_CONFIG macro to check for features

And remove many custom defines.

Change-Id: I658cc8430d1d99ed3c0aafe03a77adce76621a29
Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
---
 .../gstreamer/audiodecoder/qgstreameraudiodecodersession.cpp | 12 ++++++------
 .../gstreamer/audiodecoder/qgstreameraudiodecodersession.h   |  7 ++++---
 2 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'src/plugins/gstreamer/audiodecoder')

diff --git a/src/plugins/gstreamer/audiodecoder/qgstreameraudiodecodersession.cpp b/src/plugins/gstreamer/audiodecoder/qgstreameraudiodecodersession.cpp
index 5e00dab6f..779978e70 100644
--- a/src/plugins/gstreamer/audiodecoder/qgstreameraudiodecodersession.cpp
+++ b/src/plugins/gstreamer/audiodecoder/qgstreameraudiodecodersession.cpp
@@ -81,7 +81,7 @@ QGstreamerAudioDecoderSession::QGstreamerAudioDecoderSession(QObject *parent)
      m_outputBin(0),
      m_audioConvert(0),
      m_appSink(0),
-#if defined(HAVE_GST_APPSRC)
+#if QT_CONFIG(gstreamer_app)
      m_appSrc(0),
 #endif
      mDevice(0),
@@ -114,7 +114,7 @@ QGstreamerAudioDecoderSession::QGstreamerAudioDecoderSession(QObject *parent)
         gst_object_unref(GST_OBJECT(pad));
 
         g_object_set(G_OBJECT(m_playbin), "audio-sink", m_outputBin, NULL);
-#if defined(HAVE_GST_APPSRC)
+#if QT_CONFIG(gstreamer_app)
         g_signal_connect(G_OBJECT(m_playbin), "deep-notify::source", (GCallback) &QGstreamerAudioDecoderSession::configureAppSrcElement, (gpointer)this);
 #endif
 
@@ -130,7 +130,7 @@ QGstreamerAudioDecoderSession::~QGstreamerAudioDecoderSession()
         stop();
 
         delete m_busHelper;
-#if defined(HAVE_GST_APPSRC)
+#if QT_CONFIG(gstreamer_app)
         delete m_appSrc;
 #endif
         gst_object_unref(GST_OBJECT(m_bus));
@@ -138,7 +138,7 @@ QGstreamerAudioDecoderSession::~QGstreamerAudioDecoderSession()
     }
 }
 
-#if defined(HAVE_GST_APPSRC)
+#if QT_CONFIG(gstreamer_app)
 void QGstreamerAudioDecoderSession::configureAppSrcElement(GObject* object, GObject *orig, GParamSpec *pspec, QGstreamerAudioDecoderSession* self)
 {
     Q_UNUSED(object);
@@ -307,7 +307,7 @@ void QGstreamerAudioDecoderSession::setSourceFilename(const QString &fileName)
 {
     stop();
     mDevice = 0;
-#if defined(HAVE_GST_APPSRC)
+#if QT_CONFIG(gstreamer_app)
     if (m_appSrc)
         m_appSrc->deleteLater();
     m_appSrc = 0;
@@ -346,7 +346,7 @@ void QGstreamerAudioDecoderSession::start()
     if (!mSource.isEmpty()) {
         g_object_set(G_OBJECT(m_playbin), "uri", QUrl::fromLocalFile(mSource).toEncoded().constData(), NULL);
     } else if (mDevice) {
-#if defined(HAVE_GST_APPSRC)
+#if QT_CONFIG(gstreamer_app)
         // make sure we can read from device
         if (!mDevice->isOpen() || !mDevice->isReadable()) {
             processInvalidMedia(QAudioDecoder::AccessDeniedError, "Unable to read from specified device");
diff --git a/src/plugins/gstreamer/audiodecoder/qgstreameraudiodecodersession.h b/src/plugins/gstreamer/audiodecoder/qgstreameraudiodecodersession.h
index 991ac0043..3d0e9a2b0 100644
--- a/src/plugins/gstreamer/audiodecoder/qgstreameraudiodecodersession.h
+++ b/src/plugins/gstreamer/audiodecoder/qgstreameraudiodecodersession.h
@@ -40,13 +40,14 @@
 #ifndef QGSTREAMERPLAYERSESSION_H
 #define QGSTREAMERPLAYERSESSION_H
 
+#include <QtMultimedia/private/qtmultimediaglobal_p.h>
 #include <QObject>
 #include <QtCore/qmutex.h>
 #include "qgstreameraudiodecodercontrol.h"
 #include <private/qgstreamerbushelper_p.h>
 #include "qaudiodecoder.h"
 
-#if defined(HAVE_GST_APPSRC)
+#if QT_CONFIG(gstreamer_app)
 #include <private/qgstappsrc_p.h>
 #endif
 
@@ -75,7 +76,7 @@ public:
 
     bool processBusMessage(const QGstreamerMessage &message);
 
-#if defined(HAVE_GST_APPSRC)
+#if QT_CONFIG(gstreamer_app)
     QGstAppSrc *appsrc() const { return m_appSrc; }
     static void configureAppSrcElement(GObject*, GObject*, GParamSpec*,QGstreamerAudioDecoderSession* _this);
 #endif
@@ -134,7 +135,7 @@ private:
     GstElement *m_audioConvert;
     GstAppSink *m_appSink;
 
-#if defined(HAVE_GST_APPSRC)
+#if QT_CONFIG(gstreamer_app)
     QGstAppSrc *m_appSrc;
 #endif
 
-- 
cgit v1.2.3