From 78ce69d3dd26ed54f2aa3d86a8d5575d29711fd5 Mon Sep 17 00:00:00 2001 From: Andras Becsi Date: Mon, 19 Nov 2012 16:21:50 +0100 Subject: [PATCH] Remove nonfunctional mediaDownloadEnabled property I suppose this was introduced after an API freeze to try to support on-disk buffering but since the code does not set the GST_PLAY_FLAG_DOWNLOAD flag on the player element the feature is not only undocumented but also nonfunctional. If on-disk buffering is needed we should add proper API to enable/disable it for all backends which might be possible with Qt 5.1 the earliest. Change-Id: I6b42a06166509db0023a3e0263ecc3a36f0d2bdb Reviewed-by: Zeno Albisser --- .../mediaplayer/qgstreamerplayercontrol.cpp | 10 ---------- .../gstreamer/mediaplayer/qgstreamerplayercontrol.h | 4 ---- .../mediaplayer/qgstreamerplayersession.cpp | 13 +++---------- 3 files changed, 3 insertions(+), 24 deletions(-) diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamerplayercontrol.cpp b/src/plugins/gstreamer/mediaplayer/qgstreamerplayercontrol.cpp index 399425a5..4b730818 100644 --- a/src/plugins/gstreamer/mediaplayer/qgstreamerplayercontrol.cpp +++ b/src/plugins/gstreamer/mediaplayer/qgstreamerplayercontrol.cpp @@ -614,16 +614,6 @@ void QGstreamerPlayerControl::handleResourcesDenied() popAndNotifyState(); } -bool QGstreamerPlayerControl::isMediaDownloadEnabled() const -{ - return m_session->property("mediaDownloadEnabled").toBool(); -} - -void QGstreamerPlayerControl::setMediaDownloadEnabled(bool enabled) -{ - m_session->setProperty("mediaDownloadEnabled", enabled); -} - void QGstreamerPlayerControl::pushState() { m_stateStack.push(m_currentState); diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamerplayercontrol.h b/src/plugins/gstreamer/mediaplayer/qgstreamerplayercontrol.h index 9fae769b..095ea23f 100644 --- a/src/plugins/gstreamer/mediaplayer/qgstreamerplayercontrol.h +++ b/src/plugins/gstreamer/mediaplayer/qgstreamerplayercontrol.h @@ -64,7 +64,6 @@ class QGstreamerPlayerService; class QGstreamerPlayerControl : public QMediaPlayerControl { Q_OBJECT - Q_PROPERTY(bool mediaDownloadEnabled READ isMediaDownloadEnabled WRITE setMediaDownloadEnabled) public: QGstreamerPlayerControl(QGstreamerPlayerSession *session, QObject *parent = 0); @@ -95,9 +94,6 @@ public: const QIODevice *mediaStream() const; void setMedia(const QMediaContent&, QIODevice *); - bool isMediaDownloadEnabled() const; - void setMediaDownloadEnabled(bool enabled); - QMediaPlayerResourceSetInterface* resources() const; public Q_SLOTS: diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp b/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp index a45b2cd0..e51531c9 100644 --- a/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp +++ b/src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp @@ -1614,16 +1614,9 @@ void QGstreamerPlayerSession::handleElementAdded(GstBin *bin, GstElement *elemen if (g_str_has_prefix(elementName, "queue2")) { session->m_haveQueueElement = true; - if (session->property("mediaDownloadEnabled").toBool()) { - QDir cacheDir(QStandardPaths::writableLocation(QStandardPaths::CacheLocation)); - QString cacheLocation = cacheDir.absoluteFilePath("gstmedia__XXXXXX"); -#ifdef DEBUG_PLAYBIN - qDebug() << "set queue2 temp-location" << cacheLocation; -#endif - g_object_set(G_OBJECT(element), "temp-template", cacheLocation.toUtf8().constData(), NULL); - } else { - g_object_set(G_OBJECT(element), "temp-template", NULL, NULL); - } + // Disable on-disk buffering. + g_object_set(G_OBJECT(element), "temp-template", NULL, NULL); + } else if (g_str_has_prefix(elementName, "uridecodebin") || g_str_has_prefix(elementName, "decodebin2")) {