Merge lp://staging/~phablet-team/qtubuntu-media/mediascanner-dependency-removal into lp://staging/qtubuntu-media
Proposed by
Jim Hodapp
| Status: | Merged |
|---|---|
| Approved by: | Alfonso Sanchez-Beato |
| Approved revision: | 89 |
| Merged at revision: | 87 |
| Proposed branch: | lp://staging/~phablet-team/qtubuntu-media/mediascanner-dependency-removal |
| Merge into: | lp://staging/qtubuntu-media |
| Diff against target: |
694 lines (+11/-541) 14 files modified
debian/control (+1/-11) src/aal/aal.pro (+2/-4) src/aal/aalmediaplayerservice.cpp (+0/-1) src/aal/aalmediaplayerserviceplugin.cpp (+0/-1) src/aal/aalmetadatareadercontrol.cpp (+0/-148) src/aal/aalmetadatareadercontrol.h (+0/-70) tests/unit/service.cpp (+4/-0) tests/unit/service.h (+1/-0) tests/unit/setup_mediascanner.sh (+0/-46) tests/unit/tst_mediaplayerplugin.cpp (+1/-12) tests/unit/tst_mediaplaylistcontrol.cpp (+0/-1) tests/unit/tst_metadatareadercontrol.cpp (+0/-168) tests/unit/tst_metadatareadercontrol.h (+0/-72) tests/unit/unit.pro (+2/-7) |
| To merge this branch: | bzr merge lp://staging/~phablet-team/qtubuntu-media/mediascanner-dependency-removal |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Alfonso Sanchez-Beato | Approve | ||
|
Review via email:
|
|||
Commit message
* Get rid of the unnecessary dependency on libmediascanner.
* Update mock service interface with changes from media-hub.
Description of the change
* Get rid of the unnecessary dependency on libmediascanner.
* Update mock service interface with changes from media-hub.
To post a comment you must log in.
Revision history for this message
| Alfonso Sanchez-Beato (alfonsosanchezbeato) wrote | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
LGTM