Merge lp://staging/~phablet-team/qtubuntu-media/background-playlist-plugin into lp://staging/qtubuntu-media
Proposed by
Jim Hodapp
Status: | Merged |
---|---|
Merged at revision: | 84 |
Proposed branch: | lp://staging/~phablet-team/qtubuntu-media/background-playlist-plugin |
Merge into: | lp://staging/qtubuntu-media |
Diff against target: |
3109 lines (+2477/-141) 29 files modified
aalMediaPlayer.pro (+1/-1) debian/control (+5/-0) src/aal/aal.pro (+8/-4) src/aal/aalmediaplayercontrol.cpp (+16/-60) src/aal/aalmediaplayercontrol.h (+0/-2) src/aal/aalmediaplayerservice.cpp (+142/-52) src/aal/aalmediaplayerservice.h (+11/-4) src/aal/aalmediaplayerserviceplugin.cpp (+0/-1) src/aal/aalmediaplaylistcontrol.cpp (+299/-0) src/aal/aalmediaplaylistcontrol.h (+82/-0) src/aal/aalmediaplaylistprovider.cpp (+350/-0) src/aal/aalmediaplaylistprovider.h (+83/-0) src/aal/aalutility.cpp (+39/-0) src/aal/aalutility.h (+35/-0) src/aal/private/qmediaplaylistnavigator_p.h (+112/-0) src/aal/private/qmediaplaylistprovider_p.h (+115/-0) src/aal/qmediaplaylistcontrol_p.h (+96/-0) tests/integration/integration.pro (+23/-0) tests/integration/tst_mediaplaylist.cpp (+396/-0) tests/integration/tst_mediaplaylist.h (+75/-0) tests/tests.pro (+9/-0) tests/unit/player.cpp (+6/-0) tests/unit/player.h (+1/-0) tests/unit/player_mock.cpp (+313/-0) tests/unit/player_mock.h (+104/-0) tests/unit/tst_mediaplayerplugin.cpp (+10/-2) tests/unit/tst_mediaplaylistcontrol.cpp (+66/-0) tests/unit/tst_mediaplaylistcontrol.h (+59/-0) tests/unit/unit.pro (+21/-15) |
To merge this branch: | bzr merge lp://staging/~phablet-team/qtubuntu-media/background-playlist-plugin |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu Phablet Team | Pending | ||
Review via email: mp+263647@code.staging.launchpad.net |
Commit message
Added background playlist support connecting qtmultimedia with media-hub.
Description of the change
Added background playlist support connecting qtmultimedia with media-hub.
To post a comment you must log in.