qtubuntu-media

Merge lp://qastaging/~phablet-team/qtubuntu-media/audio_role into lp://qastaging/qtubuntu-media

  1. audio_role
  2. Merge into trunk
Proposed by Jim Hodapp
Status: Merged
Approved by: Simon Fels
Approved revision: 111
Merged at revision: 103
Proposed branch: lp://qastaging/~phablet-team/qtubuntu-media/audio_role
Merge into: lp://qastaging/qtubuntu-media
Diff against target: 1123 lines (+550/-146)
18 files modified
debian/changelog (+6/-0)
src/aal/aal.pro (+2/-0)
src/aal/aalaudiorolecontrol.cpp (+106/-0)
src/aal/aalaudiorolecontrol.h (+48/-0)
src/aal/aalmediaplayercontrol.cpp (+0/-8)
src/aal/aalmediaplayercontrol.h (+1/-5)
src/aal/aalmediaplayerservice.cpp (+127/-92)
src/aal/aalmediaplayerservice.h (+6/-6)
tests/integration/audiorole/audiorole.pro (+23/-0)
tests/integration/audiorole/tst_audiorole.cpp (+138/-0)
tests/integration/audiorole/tst_audiorole.h (+54/-0)
tests/integration/integration.pro (+1/-0)
tests/tests.pro (+3/-0)
tests/unit/player.cpp (+12/-23)
tests/unit/player.h (+11/-7)
tests/unit/service.cpp (+7/-2)
tests/unit/tst_mediaplayerplugin.cpp (+3/-3)
tests/unit/unit.pro (+2/-0)
To merge this branch: bzr merge lp://qastaging/~phablet-team/qtubuntu-media/audio_role
Reviewer Review Type Date Requested Status
Alfonso Sanchez-Beato Approve
Simon Fels Needs Fixing
PS Jenkins bot continuous-integration Needs Fixing
Review via email: mp+287368@code.qastaging.launchpad.net

Commit message

Only use the new QAudio based audio role type. No need for the old QMediaPlayer audio role type.

Description of the change

Only use the new QAudio based audio role type. No need for the old QMediaPlayer audio role type.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:103
http://jenkins.qa.ubuntu.com/job/qtubuntu-media-ci/142/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-vivid-amd64-ci/67/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-vivid-armhf-ci/67/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-vivid-i386-ci/67/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-media-ci/142/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:104
http://jenkins.qa.ubuntu.com/job/qtubuntu-media-ci/143/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-vivid-amd64-ci/68/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-vivid-armhf-ci/68/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-vivid-i386-ci/68/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-media-ci/143/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:105
http://jenkins.qa.ubuntu.com/job/qtubuntu-media-ci/144/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-vivid-amd64-ci/69/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-vivid-armhf-ci/69/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-vivid-i386-ci/69/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-media-ci/144/rebuild

review: Needs Fixing (continuous-integration)
lp://qastaging/~phablet-team/qtubuntu-media/audio_role updated
108. By Jim Hodapp

Unify two redudant case statements

Revision history for this message
Alfonso Sanchez-Beato (alfonsosanchezbeato) wrote :

See comments.

review: Needs Fixing
Revision history for this message
Simon Fels (morphis) wrote :

See comments

review: Needs Fixing
Revision history for this message
Alfonso Sanchez-Beato (alfonsosanchezbeato) :
Revision history for this message
Jim Hodapp (jhodapp) wrote :

Addressed review comments.

lp://qastaging/~phablet-team/qtubuntu-media/audio_role updated
109. By Jim Hodapp

Addressed review comments

Revision history for this message
Alfonso Sanchez-Beato (alfonsosanchezbeato) wrote :

LGTM

review: Approve
lp://qastaging/~phablet-team/qtubuntu-media/audio_role updated
110. By Jim Hodapp

Make sure to not break the indicator-sound controls

Revision history for this message
Simon Fels (morphis) wrote :

LGTM but tests are still failing.

Revision history for this message
Jim Hodapp (jhodapp) wrote :

What tests are failing? Nothing is failing for me.

On Tue, Mar 22, 2016 at 12:47 PM, Simon Fels <email address hidden>
wrote:

> LGTM but tests are still failing.
> --
>
> https://code.launchpad.net/~phablet-team/qtubuntu-media/audio_role/+merge/287368
> Your team Ubuntu Phablet Team is subscribed to branch lp:qtubuntu-media.
>

lp://qastaging/~phablet-team/qtubuntu-media/audio_role updated
111. By Jim Hodapp

Include missing qaudio.h header so that unit tests compile

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: