Merge lp:~jhodapp/qtubuntu-media/fix-1381930 into lp:qtubuntu-media

[Jim Hodapp]

Fix URI encoding issue related to playing remote URIs like from 7digital

Fix URI encoding issue related to playing remote URIs like from 7digital

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:53
http://jenkins.qa.ubuntu.com/job/qtubuntu-media-ci/69/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-utopic-amd64-ci/20/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-utopic-armhf-ci/20/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-utopic-i386-ci/20/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-media-ci/69/rebuild

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

Code looks good, please top-ack after testing.

We could use unit tests! ;)

review: Approve (code)

[Ricardo Salveti (rsalveti)]

LGTM

review: Approve

=== modified file 'src/aal/aalmediaplayercontrol.cpp'
--- src/aal/aalmediaplayercontrol.cpp	2014-09-02 23:32:08 +0000
+++ src/aal/aalmediaplayercontrol.cpp	2014-10-31 19:45:41 +0000
@@ -291,7 +291,14 @@
     if (media.isNull())
         return QUrl();
 
-    return QUrl::fromPercentEncoding(media.canonicalUrl().toString().toUtf8());
+    if (media.canonicalUrl().isLocalFile()) {
+        qDebug() << "Local file URI: " << QUrl::fromPercentEncoding(media.canonicalUrl().toString().toUtf8());
+        return QUrl::fromPercentEncoding(media.canonicalUrl().toString().toUtf8());
+    }
+    else {
+        qDebug() << "Remote stream URI: " << QUrl::fromEncoded(media.canonicalUrl().toString().toUtf8());
+        return QUrl::fromEncoded(media.canonicalUrl().toString().toUtf8());
+    }
 }
 
 void AalMediaPlayerControl::setMediaStatus(QMediaPlayer::MediaStatus status)