diff options
author | Lars Knoll <lars.knoll@qt.io> | 2016-11-21 10:44:47 +0100 |
---|---|---|
committer | Yoann Lopes <yoann.lopes@qt.io> | 2017-02-27 10:30:55 +0000 |
commit | 95de9e6154d75688e81a3b79007dfe6c56d3b65b (patch) | |
tree | a9effd19086e8b29651414fd657d963e8de47cba /src/plugins/gstreamer/audiodecoder/qgstreameraudiodecodersession.cpp | |
parent | 8d0e08e96ffd8cd78fbb4a01f250dfb46117c636 (diff) |
Use QT_CONFIG macro to check for features
And remove many custom defines.
Change-Id: I658cc8430d1d99ed3c0aafe03a77adce76621a29
Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
Diffstat (limited to 'src/plugins/gstreamer/audiodecoder/qgstreameraudiodecodersession.cpp')
-rw-r--r-- | src/plugins/gstreamer/audiodecoder/qgstreameraudiodecodersession.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
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"); |