You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
60 lines
2.1 KiB
60 lines
2.1 KiB
Index: gstreamer/mediaobject.h
|
|
===================================================================
|
|
--- gstreamer/mediaobject.h (revision 932755)
|
|
+++ gstreamer/mediaobject.h (revision 932756)
|
|
@@ -185,7 +185,7 @@
|
|
/*
|
|
* @param encodedUrl percent-encoded QString for source compat reasons. Should change to QUrl
|
|
*/
|
|
- bool createPipefromURL(const QString &encodedUrl);
|
|
+ bool createPipefromURL(const QUrl &url);
|
|
bool createPipefromStream(const MediaSource &);
|
|
|
|
private Q_SLOTS:
|
|
Index: gstreamer/mediaobject.cpp
|
|
===================================================================
|
|
--- gstreamer/mediaobject.cpp (revision 932755)
|
|
+++ gstreamer/mediaobject.cpp (revision 932756)
|
|
@@ -347,11 +347,8 @@
|
|
*
|
|
* returns true if successful
|
|
*/
|
|
-bool MediaObject::createPipefromURL(const QString &encodedUrl)
|
|
+bool MediaObject::createPipefromURL(const QUrl &url)
|
|
{
|
|
- // Convert back to URL
|
|
- QUrl url(encodedUrl, QUrl::StrictMode);
|
|
-
|
|
// Remove any existing data source
|
|
if (m_datasource) {
|
|
gst_bin_remove(GST_BIN(m_pipeline), m_datasource);
|
|
@@ -361,7 +358,7 @@
|
|
|
|
// Verify that the uri can be parsed
|
|
if (!url.isValid()) {
|
|
- m_backend->logMessage(QString("%1 is not a valid URI").arg(encodedUrl));
|
|
+ m_backend->logMessage(QString("%1 is not a valid URI").arg(url.toString()));
|
|
return false;
|
|
}
|
|
|
|
@@ -875,8 +872,7 @@
|
|
|
|
switch (source.type()) {
|
|
case MediaSource::Url: {
|
|
- QString urlString = source.url().toEncoded();
|
|
- if (createPipefromURL(urlString))
|
|
+ if (createPipefromURL(source.url()))
|
|
m_loading = true;
|
|
else
|
|
setError(tr("Could not open media source."));
|
|
@@ -884,8 +880,7 @@
|
|
break;
|
|
|
|
case MediaSource::LocalFile: {
|
|
- QString urlString = QUrl::fromLocalFile(source.fileName()).toString();
|
|
- if (createPipefromURL(urlString))
|
|
+ if (createPipefromURL(QUrl::fromLocalFile(source.fileName())))
|
|
m_loading = true;
|
|
else
|
|
setError(tr("Could not open media source."));
|