Merge lp:~ted/mediaplayer-app/video-uri-support into lp:mediaplayer-app

[Ted Gould]

Register for video:/// URLs in URL dispatcher

Make this use a custom URL format so that we can know who to route the videos to. Registers the scheme with URL dispatcher and handles it in the startup code.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:271
http://jenkins.qa.ubuntu.com/job/mediaplayer-app-ci/218/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3992
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3072
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-utopic-amd64-ci/26
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-utopic-armhf-ci/26
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-utopic-armhf-ci/26/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-utopic-i386-ci/26
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3837
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5242
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5242/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12039
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2506
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3357
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3357/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mediaplayer-app-ci/218/rebuild

review: Approve (continuous-integration)

[Jim Hodapp (jhodapp)]

Looks good, thanks.

review: Approve (code)

[Bill Filler (bfiller)]

don't think you need to update the debian/changelog file.
Also, what is best way to test this? Does it depend on anything else landing?

[Bill Filler (bfiller)]

tested, works

=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2013-06-11 15:54:49 +0000
+++ data/CMakeLists.txt	2014-08-25 13:58:07 +0000
@@ -1,5 +1,6 @@
 set(MEDIAPLAYER_DESKTOP_FILE mediaplayer-app.desktop)
 set(MEDIAPLAYER_APP_ICON mediaplayer-app.svg)
+set(MEDIAPLAYER_URL_DISPATCHER mediaplayer-app.url-dispatcher)
 
 file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/${MEDIAPLAYER_DESKTOP_FILE})
 file(STRINGS ${MEDIAPLAYER_DESKTOP_FILE}.in DESKTOP_FILE_CONTENTS)
@@ -15,3 +16,7 @@
 install(FILES ${MEDIAPLAYER_APP_ICON}
     DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps
     )
+
+install(FILES ${MEDIAPLAYER_URL_DISPATCHER}
+    DESTINATION ${CMAKE_INSTALL_DATADIR}/url-dispatcher/urls
+    )
 
=== added file 'data/mediaplayer-app.url-dispatcher'
--- data/mediaplayer-app.url-dispatcher	1970-01-01 00:00:00 +0000
+++ data/mediaplayer-app.url-dispatcher	2014-08-25 13:58:07 +0000
@@ -0,0 +1,5 @@
+[
+	{
+		"protocol": "video"
+	}
+]
 
=== modified file 'debian/changelog'
--- debian/changelog	2014-08-20 14:01:52 +0000
+++ debian/changelog	2014-08-25 13:58:07 +0000
@@ -1,3 +1,9 @@
+mediaplayer-app (0.20.5+14.10.20140820-0ubuntu2) UNRELEASED; urgency=medium
+
+  * Register for video:/// URLs in URL dispatcher
+
+ -- Ted Gould <[e-mail]>  Mon, 25 Aug 2014 08:43:25 -0500
+
 mediaplayer-app (0.20.5+14.10.20140820-0ubuntu1) utopic; urgency=low
 
   [ Martin Pitt ]
 
=== modified file 'debian/mediaplayer-app.install'
--- debian/mediaplayer-app.install	2014-02-13 18:26:52 +0000
+++ debian/mediaplayer-app.install	2014-08-25 13:58:07 +0000
@@ -4,3 +4,4 @@
 /usr/share/mediaplayer-app/qml/*
 /usr/share/icons
 /usr/share/locale/*/LC_MESSAGES/mediaplayer-app.mo
+/usr/share/url-dispatcher/urls/*
 
=== modified file 'src/mediaplayer.cpp'
--- src/mediaplayer.cpp	2014-03-27 22:46:07 +0000
+++ src/mediaplayer.cpp	2014-08-25 13:58:07 +0000
@@ -90,6 +90,11 @@
     QUrl playUri;
     if (args.count() >= 2) {
         QUrl uri(args[1]);
+
+        if (uri.scheme() == "video") {
+            uri.setScheme("file");
+        }
+
         if (uri.isRelative()) {
             uri = QUrl::fromLocalFile(QDir::current().absoluteFilePath(args[1]));
         }