Merge lp://staging/~phablet-team/qtubuntu-media/adjust-to-media-hub-interface-changes into lp://staging/qtubuntu-media
Proposed by
Ricardo Salveti
Status: | Merged |
---|---|
Merged at revision: | 66 |
Proposed branch: | lp://staging/~phablet-team/qtubuntu-media/adjust-to-media-hub-interface-changes |
Merge into: | lp://staging/qtubuntu-media |
Diff against target: |
367 lines (+55/-112) 7 files modified
debian/control (+1/-1) src/aal/aalmediaplayerservice.cpp (+11/-68) src/aal/aalmediaplayerservice.h (+7/-6) src/aal/aalvideorenderercontrol.cpp (+22/-5) src/aal/aalvideorenderercontrol.h (+4/-1) unittests/player.cpp (+5/-25) unittests/player.h (+5/-6) |
To merge this branch: | bzr merge lp://staging/~phablet-team/qtubuntu-media/adjust-to-media-hub-interface-changes |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot | continuous-integration | Needs Fixing | |
Ubuntu Phablet Team | Pending | ||
Review via email: mp+252947@code.staging.launchpad.net |
This proposal supersedes a proposal from 2015-01-12.
Commit message
Adjust to interface changes in media-hub with version 3.0.0.
Description of the change
Adjust to interface changes in media-hub with version 3.0.0.
To post a comment you must log in.
FAILED: Continuous integration, rev:62 jenkins. qa.ubuntu. com/job/ qtubuntu- media-ci/ 78/ jenkins. qa.ubuntu. com/job/ qtubuntu- media-vivid- amd64-ci/ 3/console jenkins. qa.ubuntu. com/job/ qtubuntu- media-vivid- armhf-ci/ 3/console jenkins. qa.ubuntu. com/job/ qtubuntu- media-vivid- i386-ci/ 3/console
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/qtubuntu- media-ci/ 78/rebuild
http://