Merge lp://staging/~thomas-voss/qtubuntu-media/merge-stable-into-trunk into lp://staging/qtubuntu-media
| Status: | Merged |
|---|---|
| Approved by: | Jim Hodapp |
| Approved revision: | 93 |
| Merged at revision: | 93 |
| Proposed branch: | lp://staging/~thomas-voss/qtubuntu-media/merge-stable-into-trunk |
| Merge into: | lp://staging/qtubuntu-media |
| Diff against target: |
1766 lines (+1041/-143) 14 files modified
debian/changelog (+35/-0) debian/control (+1/-1) src/aal/aalmediaplayercontrol.cpp (+20/-11) src/aal/aalmediaplayerservice.cpp (+27/-46) src/aal/aalmediaplayerservice.h (+2/-1) src/aal/aalmediaplaylistcontrol.cpp (+73/-4) src/aal/aalmediaplaylistcontrol.h (+4/-0) src/aal/aalmediaplaylistprovider.cpp (+327/-60) src/aal/aalmediaplaylistprovider.h (+20/-4) src/aal/private/qmediaplaylistprovider_p.h (+1/-0) tests/integration/integration.pro (+1/-1) tests/integration/tst_mediaplaylist.cpp (+499/-13) tests/integration/tst_mediaplaylist.h (+31/-0) tests/unit/tst_mediaplaylistcontrol.cpp (+0/-2) |
| To merge this branch: | bzr merge lp://staging/~thomas-voss/qtubuntu-media/merge-stable-into-trunk |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| PS Jenkins bot | continuous-integration | Approve | |
| Jim Hodapp (community) | code | Approve | |
|
Review via email:
|
|||
Commit message
[ phablet ]
* Bump version for new TrackList related API changes.
[ Alfonso Sanchez-Beato ]
* Emit onPlaybackModeC
so that a client can move a track into a new position by first
calling removeTrack(). Do proper clean-up when switching between
playlist and playing a single URI (LP: #1511029). (LP: #1511073,
#1511034, #1510219, #1511029)
[ CI Train Bot ]
* New rebuild forced.
[ Jim Hodapp ]
* Emit onPlaybackModeC
so that a client can move a track into a new position by first
calling removeTrack(). Do proper clean-up when switching between
playlist and playing a single URI (LP: #1511029). (LP: #1511073,
#1511034, #1510219, #1511029)
[ CI Train Bot ]
* New rebuild forced.
[ Jim Hodapp ]
* Added addTracks support for batch track adding. Improved the
robustness of the QMediaPlaylist integration tests.
Description of the change
[ phablet ]
* Bump version for new TrackList related API changes.
[ Alfonso Sanchez-Beato ]
* Emit onPlaybackModeC
so that a client can move a track into a new position by first
calling removeTrack(). Do proper clean-up when switching between
playlist and playing a single URI (LP: #1511029). (LP: #1511073,
#1511034, #1510219, #1511029)
[ CI Train Bot ]
* New rebuild forced.
[ Jim Hodapp ]
* Emit onPlaybackModeC
so that a client can move a track into a new position by first
calling removeTrack(). Do proper clean-up when switching between
playlist and playing a single URI (LP: #1511029). (LP: #1511073,
#1511034, #1510219, #1511029)
[ CI Train Bot ]
* New rebuild forced.
[ Jim Hodapp ]
* Added addTracks support for batch track adding. Improved the
robustness of the QMediaPlaylist integration tests.
| PS Jenkins bot (ps-jenkins) wrote | # |
LGTM.