Unity Media Scanner Scope

Merge lp://staging/~stolowski/unity-scope-mediascanner/reenable-video-uri into lp://staging/unity-scope-mediascanner

  1. reenable-video-uri
  2. Merge into trunk
Proposed by Paweł Stołowski
Status: Merged
Approved by: James Henstridge
Approved revision: 176
Merged at revision: 183
Proposed branch: lp://staging/~stolowski/unity-scope-mediascanner/reenable-video-uri
Merge into: lp://staging/unity-scope-mediascanner
Diff against target: 64 lines (+10/-11)
2 files modified
src/video-scope.cpp (+8/-9)
tests/test-video-scope.cpp (+2/-2)
To merge this branch: bzr merge lp://staging/~stolowski/unity-scope-mediascanner/reenable-video-uri
Reviewer Review Type Date Requested Status
James Henstridge Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+233485@code.staging.launchpad.net

Commit message

Enable video:// uris back.

Description of the change

Enable video:// uris back. Needs https://code.launchpad.net/~ted/mediaplayer-app/video-uri-support to land at the same time.

To post a comment you must log in.
Revision history for this message
James Henstridge (jamesh) wrote :

Looks good!

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:173
http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-ci/143/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-utopic-amd64-ci/45
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-utopic-armhf-ci/45
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-utopic-i386-ci/45

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-mediascanner-ci/143/rebuild

review: Approve (continuous-integration)
Revision history for this message
James Henstridge (jamesh) wrote :

We ran into a bug in the switch to music:// URIs for the local music scope that will probably be a problem for this branch too:

https://bugs.launchpad.net/ubuntu/+source/unity-scope-mediascanner/+bug/1367334

In short, only the URI of the "Play" action button should use the video:// URI, and everything else should stick to file:/// URIs.

review: Needs Fixing
lp://staging/~stolowski/unity-scope-mediascanner/reenable-video-uri updated
174. By Paweł Stołowski

Merge trunk

175. By Paweł Stołowski

Use video:// uri only for the Play button.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:175
http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-ci/149/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-utopic-amd64-ci/51
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-utopic-armhf-ci/51
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-utopic-i386-ci/51

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-mediascanner-ci/149/rebuild

review: Approve (continuous-integration)
lp://staging/~stolowski/unity-scope-mediascanner/reenable-video-uri updated
176. By Paweł Stołowski

Use video:// uri also for 'source' attribute in the preview.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:176
http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-ci/150/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-utopic-amd64-ci/52
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-utopic-armhf-ci/52
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-mediascanner-utopic-i386-ci/52

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-mediascanner-ci/150/rebuild

review: Approve (continuous-integration)
Revision history for this message
James Henstridge (jamesh) wrote :

Looks good.

review: Approve
lp://staging/~stolowski/unity-scope-mediascanner/reenable-video-uri updated
177. By Paweł Stołowski

Merged trunk

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: