Merge lp://qastaging/~stolowski/unity-scope-mediascanner/fix-1340952 into lp://qastaging/unity-scope-mediascanner
Proposed by
Paweł Stołowski
| Status: | Merged |
|---|---|
| Approved by: | James Henstridge |
| Approved revision: | 168 |
| Merged at revision: | 169 |
| Proposed branch: | lp://qastaging/~stolowski/unity-scope-mediascanner/fix-1340952 |
| Merge into: | lp://qastaging/unity-scope-mediascanner |
| Diff against target: |
114 lines (+27/-11) 4 files modified
src/music-scope.cpp (+8/-2) src/video-scope.cpp (+12/-2) tests/test-music-scope.cpp (+4/-4) tests/test-video-scope.cpp (+3/-3) |
| To merge this branch: | bzr merge lp://qastaging/~stolowski/unity-scope-mediascanner/fix-1340952 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| James Henstridge | Approve | ||
| PS Jenkins bot (community) | continuous-integration | Approve | |
|
Review via email:
|
|||
Commit message
Use music:// for individual song files and video:// uris for video files in medisanner music/video scopes.
Description of the change
Use music:// for individual song files and video:// uris for video files in medisanner music/video scopes. This change also required minor adjustement to the image uri for these types for results.
NOTE: requires handler for video:// schema (a MP for this is coming soon).
To post a comment you must log in.
PASSED: Continuous integration, rev:168 jenkins. qa.ubuntu. com/job/ unity-scope- mediascanner- ci/141/ jenkins. qa.ubuntu. com/job/ unity-scope- mediascanner- utopic- amd64-ci/ 43 jenkins. qa.ubuntu. com/job/ unity-scope- mediascanner- utopic- armhf-ci/ 43 jenkins. qa.ubuntu. com/job/ unity-scope- mediascanner- utopic- i386-ci/ 43
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/unity- scope-mediascan ner-ci/ 141/rebuild
http://