Merge lp:~vthompson/dropping-letters/fix-1366586-dropping-letters into lp:dropping-letters

Proposed by Victor Thompson on 2014-09-12
Status: Merged
Approved by: Alan Pope 🍺🐧🐱 πŸ¦„ on 2014-09-13
Approved revision: 60
Merged at revision: 61
Proposed branch: lp:~vthompson/dropping-letters/fix-1366586-dropping-letters
Merge into: lp:dropping-letters
Diff against target: 35 lines (+4/-0)
1 file modified
dropping-letters.qml (+4/-0)
To merge this branch: bzr merge lp:~vthompson/dropping-letters/fix-1366586-dropping-letters
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve on 2014-09-13
Nekhelesh Ramananthan (community) Approve on 2014-09-13
Alan Pope 🍺🐧🐱 πŸ¦„ 2014-09-12 Approve on 2014-09-13
Review via email: mp+234559@code.launchpad.net

Commit message

Categorize Audio type

Description of the change

Dropping letters does not currently play audio (see lp:1368998) but once that is fixed, the audio category of the sound effects will need to be set.

To post a comment you must log in.

Tests pass fine on desktop here...

alan@deep-thought:/tmp/fix-1366586-dropping-letters/tests/autopilot$ autopilot run dropping_letters_app
Loading tests from: /tmp/fix-1366586-dropping-letters/tests/autopilot

Tests running...

Ran 3 tests in 16.515s
OK

review: Approve

Not quite sure what's going on here..

The following packages have unmet dependencies:
 dropping-letters : Depends: qtdeclarative5-hud1.0 but it is not installable
E: Unable to correct problems, you have held broken packages.

Later..

could not import package dropping_letters_app: No module named 'dropping_letters_app'

Nekhelesh Ramananthan (nik90) wrote :

lgtm!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'dropping-letters.qml'
--- dropping-letters.qml 2014-05-07 01:12:05 +0000
+++ dropping-letters.qml 2014-09-12 23:46:11 +0000
@@ -316,6 +316,7 @@
316 source: "407__tictacshutup__click-1-off-click.ogg"316 source: "407__tictacshutup__click-1-off-click.ogg"
317 autoLoad: volume.supportsMedia317 autoLoad: volume.supportsMedia
318 muted: !volume.audible318 muted: !volume.audible
319 audioRole: MediaPlayer.alert
319 }320 }
320321
321 Audio {322 Audio {
@@ -323,6 +324,7 @@
323 source: "80921__justinbw__buttonchime02up.ogg"324 source: "80921__justinbw__buttonchime02up.ogg"
324 autoLoad: volume.supportsMedia325 autoLoad: volume.supportsMedia
325 muted: !volume.audible326 muted: !volume.audible
327 audioRole: MediaPlayer.alert
326 }328 }
327329
328 Audio {330 Audio {
@@ -330,6 +332,7 @@
330 source: "106727__kantouth__cartoon-bing-low.ogg"332 source: "106727__kantouth__cartoon-bing-low.ogg"
331 autoLoad: volume.supportsMedia333 autoLoad: volume.supportsMedia
332 muted: !volume.audible334 muted: !volume.audible
335 audioRole: MediaPlayer.alert
333 }336 }
334337
335 Audio {338 Audio {
@@ -340,6 +343,7 @@
340 flipable.flipped = false343 flipable.flipped = false
341 }344 }
342 muted: !volume.audible345 muted: !volume.audible
346 audioRole: MediaPlayer.alert
343 }347 }
344348
345 Rectangle {349 Rectangle {

Subscribers

People subscribed via source and target branches