Merge remote-tracking branch 'origin/5.5' into 5.6

Change-Id: I6d88b17f44479a522d181374023648dd007112bd

2 files changed, 16 insertions, 11 deletions

diff --git a/src/plugins/gstreamer/audiodecoder/qgstreameraudiodecodersession.cpp b/src/plugins/gstreamer/audiodecoder/qgstreameraudiodecodersession.cpp
index efa8dcb47..3360583c4 100644
--- a/src/plugins/gstreamer/audiodecoder/qgstreameraudiodecodersession.cpp
+++ b/src/plugins/gstreamer/audiodecoder/qgstreameraudiodecodersession.cpp
@@ -142,9 +142,6 @@ void QGstreamerAudioDecoderSession::configureAppSrcElement(GObject* object, GObj
     if (!self->appsrc())
         return;
 
-    if (self->appsrc()->isReady())
-        return;
-
     GstElement *appsrc;
     g_object_get(orig, "source", &appsrc, NULL);
 
@@ -350,9 +347,8 @@ void QGstreamerAudioDecoderSession::start()
             return;
         }
 
-        if (m_appSrc)
-            m_appSrc->deleteLater();
-        m_appSrc = new QGstAppSrc(this);
+        if (!m_appSrc)
+            m_appSrc = new QGstAppSrc(this);
         m_appSrc->setStream(mDevice);
 
         g_object_set(G_OBJECT(m_playbin), "uri", "appsrc://", NULL);
diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp b/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp
index c3d20e790..a1eee0166 100644
--- a/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp
+++ b/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp
@@ -241,6 +241,10 @@ QGstreamerPlayerSession::QGstreamerPlayerSession(QObject *parent)
         g_signal_connect(G_OBJECT(m_playbin), "video-changed", G_CALLBACK(handleStreamsChange), this);
         g_signal_connect(G_OBJECT(m_playbin), "audio-changed", G_CALLBACK(handleStreamsChange), this);
         g_signal_connect(G_OBJECT(m_playbin), "text-changed", G_CALLBACK(handleStreamsChange), this);
+
+#if defined(HAVE_GST_APPSRC)
+        g_signal_connect(G_OBJECT(m_playbin), "deep-notify::source", G_CALLBACK(configureAppSrcElement), this);
+#endif
     }
 }
 
@@ -274,7 +278,7 @@ void QGstreamerPlayerSession::configureAppSrcElement(GObject* object, GObject *o
     Q_UNUSED(object);
     Q_UNUSED(pspec);
 
-    if (self->appsrc()->isReady())
+    if (!self->appsrc())
         return;
 
     GstElement *appsrc;
@@ -298,16 +302,14 @@ void QGstreamerPlayerSession::loadFromStream(const QNetworkRequest &request, QIO
     m_lastPosition = 0;
     m_isPlaylist = false;
 
-    if (m_appSrc)
-        m_appSrc->deleteLater();
-    m_appSrc = new QGstAppSrc(this);
+    if (!m_appSrc)
+        m_appSrc = new QGstAppSrc(this);
     m_appSrc->setStream(appSrcStream);
 
     if (m_playbin) {
         m_tags.clear();
         emit tagsChanged();
 
-        g_signal_connect(G_OBJECT(m_playbin), "deep-notify::source", (GCallback) &QGstreamerPlayerSession::configureAppSrcElement, (gpointer)this);
         g_object_set(G_OBJECT(m_playbin), "uri", "appsrc://", NULL);
 
         if (!m_streamTypes.isEmpty()) {
@@ -330,6 +332,13 @@ void QGstreamerPlayerSession::loadFromUri(const QNetworkRequest &request)
     m_lastPosition = 0;
     m_isPlaylist = false;
 
+#if defined(HAVE_GST_APPSRC)
+    if (m_appSrc) {
+        m_appSrc->deleteLater();
+        m_appSrc = 0;
+    }
+#endif
+
     if (m_playbin) {
         m_tags.clear();
         emit tagsChanged();