slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove nonfunctional mediaDownloadEnabled property

Browse Source 
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 <zeno.albisser@digia.com>
This commit is contained in:
Andras Becsi
2012-11-19 16:21:50 +01:00
committed by The Qt Project
parent c671cf25b2
commit 78ce69d3dd
3 changed files with 3 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/gstreamer/mediaplayer/qgstreamerplayercontrol.cpp
View File

@@ -614,16 +614,6 @@ void QGstreamerPlayerControl::handleResourcesDenied()
popAndNotifyState(); popAndNotifyState();
} }
bool QGstreamerPlayerControl::isMediaDownloadEnabled() const
{
return m_session->property("mediaDownloadEnabled").toBool();
}
void QGstreamerPlayerControl::setMediaDownloadEnabled(bool enabled)
{
m_session->setProperty("mediaDownloadEnabled", enabled);
}
void QGstreamerPlayerControl::pushState() void QGstreamerPlayerControl::pushState()
{ {
m_stateStack.push(m_currentState); m_stateStack.push(m_currentState);

4
src/plugins/gstreamer/mediaplayer/qgstreamerplayercontrol.h
View File

@@ -64,7 +64,6 @@ class QGstreamerPlayerService;
class QGstreamerPlayerControl : public QMediaPlayerControl class QGstreamerPlayerControl : public QMediaPlayerControl
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY(bool mediaDownloadEnabled READ isMediaDownloadEnabled WRITE setMediaDownloadEnabled)
public: public:
QGstreamerPlayerControl(QGstreamerPlayerSession *session, QObject *parent = 0); QGstreamerPlayerControl(QGstreamerPlayerSession *session, QObject *parent = 0);
@@ -95,9 +94,6 @@ public:
const QIODevice *mediaStream() const; const QIODevice *mediaStream() const;
void setMedia(const QMediaContent&, QIODevice *); void setMedia(const QMediaContent&, QIODevice *);
bool isMediaDownloadEnabled() const;
void setMediaDownloadEnabled(bool enabled);
QMediaPlayerResourceSetInterface* resources() const; QMediaPlayerResourceSetInterface* resources() const;
public Q_SLOTS: public Q_SLOTS:

11
src/plugins/gstreamer/mediaplayer/qgstreamerplayersession.cpp
View File

@@ -1614,16 +1614,9 @@ void QGstreamerPlayerSession::handleElementAdded(GstBin *bin, GstElement *elemen
if (g_str_has_prefix(elementName, "queue2")) { if (g_str_has_prefix(elementName, "queue2")) {
session->m_haveQueueElement = true; session->m_haveQueueElement = true;
if (session->property("mediaDownloadEnabled").toBool()) { // Disable on-disk buffering.
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); g_object_set(G_OBJECT(element), "temp-template", NULL, NULL);
}
} else if (g_str_has_prefix(elementName, "uridecodebin") || } else if (g_str_has_prefix(elementName, "uridecodebin") ||
g_str_has_prefix(elementName, "decodebin2")) { g_str_has_prefix(elementName, "decodebin2")) {