diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-10 10:27:27 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-03-10 10:51:09 +0100 |
| commit | e964e89331f2cfef99a3f63172a127b6c02a9727 (patch) | |
| tree | 4c7d78573d17e523e4278027cee8fa88494366c8 /src/plugins/gstreamer/audiodecoder/qgstreameraudiodecodersession.cpp | |
| parent | f09d36708fdab70ad51af374a65ddded64525f67 (diff) | |
| parent | 6f7192a048432e4792330244b74a2a39ccd8d515 (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Conflicts:
src/plugins/gstreamer/camerabin/camerabincontainer.h
Change-Id: I4942d41d69112335fe0c994002f1b32ef3aad051
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"); |