lp://staging/~phablet-team/qtubuntu-media/background-playlist-plugin-vivid

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/qtubuntu-media/stable at revision 84

Alfonso Sanchez-Beato: Approve on 2015-08-11

Ubuntu Phablet Team: Pending requested 2015-08-03

Diff: 3322 lines (+2576/-174)

30 files modified

aalMediaPlayer.pro (+1/-1)
debian/changelog (+11/-5)
debian/control (+6/-1)
src/aal/aal.pro (+8/-4)
src/aal/aalmediaplayercontrol.cpp (+16/-66)
src/aal/aalmediaplayercontrol.h (+0/-2)
src/aal/aalmediaplayerservice.cpp (+234/-73)
src/aal/aalmediaplayerservice.h (+16/-4)
src/aal/aalmediaplayerserviceplugin.cpp (+0/-1)
src/aal/aalmediaplaylistcontrol.cpp (+293/-0)
src/aal/aalmediaplaylistcontrol.h (+82/-0)
src/aal/aalmediaplaylistprovider.cpp (+346/-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)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

118. By Jim Hodapp on 2015-08-18

Merge with Simon's branch to fix EOS signal issue

117. By Jim Hodapp on 2015-08-18

Cleanup of all controls and services more robustly

116. By Jim Hodapp on 2015-08-14

Disable media-hub player session attach/detach for now since it currently is not needed and causes signals to no longer function after reattach

115. By Jim Hodapp on 2015-08-14

Disconnect and reconnect the end_of_stream signal with attach/dettach of Player session. Also re-emit the status to the client app.

114. By Jim Hodapp on 2015-08-13

Some minor fixes for when a client instance goes out of scope

113. By Jim Hodapp on 2015-08-11

Fix compile issue

112. By Jim Hodapp on 2015-08-11

Delete unnecessary debug statements that snuck in to the last commit

111. By Jim Hodapp on 2015-08-11

Make sure is initialized to nullptr when the service instance is created

110. By Jim Hodapp on 2015-08-11

Address code review comments

109. By Jim Hodapp on 2015-08-04

Fix the qtubuntu-media-signals version that qtubuntu-media depends on