Indicator Date and Time

Merge lp://staging/~charlesk/indicator-datetime/lp-1337348-use-gstreamer-api into lp://staging/indicator-datetime/13.10

lp-1337348-use-gstreamer-api
Merge into trunk.14.10

Proposed by Charles Kerr on 2014-07-07

Status:

Merged

Approved by:

Ted Gould on 2014-07-10

Approved revision:

357

Merged at revision:

353

Proposed branch:

lp://staging/~charlesk/indicator-datetime/lp-1337348-use-gstreamer-api

Merge into:

lp://staging/indicator-datetime/13.10

Diff against target:

441 lines (+118/-149)

5 files modified

CMakeLists.txt (+1/-1)
debian/control (+1/-1)
src/snap.cpp (+106/-146)
tests/manual (+10/-0)
tests/test-locations.cpp (+0/-1)

To merge this branch:

bzr merge lp://staging/~charlesk/indicator-datetime/lp-1337348-use-gstreamer-api

Related bugs:

Bug #1283065: Use the existing audio stack to play event sounds	High	Fix Released
Bug #1337348: Dismissing the alarm dialog doesn't stop playing the alarm sound	High	Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Ted Gould (community)		2014-07-07	Approve on 2014-07-10
PS Jenkins bot (community)	continuous-integration		Approve on 2014-07-08
Review via email: mp+225835@code.staging.launchpad.net

Commit message

Use GStreamer's API directly to play sound instead of using libcanberra.

Description of the change

== Description

use GStreamer's API directly to play sound instead of using libcanberra.

This lets us drop the canberra requirement and also fixes the alarm-sound-doesn't-stop-immediately-when-snap-is-dismissed phone issue.

== MP Submission Checklist

* Are there any related MPs required for this MP to build/function as expected? Please list.

* Is your branch in sync with latest trunk? (e.g. bzr pull lp:trunk -> no changes)

Yes

* Did the code build without warnings?

Yes

* Did the tests run successfully?

Yes

* Did you perform an exploratory manual test run of your code change and any related functionality?

Yes

* Has your component test plan been executed successfully on emulator, N4?

Yes

* Please list which manual tests are germane for the reviewer in this MP.

The new manual test included in this MP: tell-snap-decision-to-dismiss

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-07:

PASSED: Continuous integration, rev:354
http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/243/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-utopic-amd64-ci/17
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-utopic-armhf-ci/17
        deb: http://jenkins.qa.ubuntu.com/job/indicator-datetime-utopic-armhf-ci/17/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-datetime-ci/243/rebuild

review: Approve (continuous-integration)

Revision history for this message

Ted Gould (ted) on 2014-07-07:

lp://staging/~charlesk/indicator-datetime/lp-1337348-use-gstreamer-api updated on 2014-07-08

355. By Charles Kerr on 2014-07-08: use GStreamer's full volume range.
356. By Charles Kerr on 2014-07-08: copyedit the new manual test for clarity.
357. By Charles Kerr on 2014-07-08: in snap.cpp, use std::call_once() as suggested by tedg