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

[Victor Thompson]

Only play sound if sound is on

Currently, it seems as though the Audio.muted property is not allowing the app to actually mute the playback. In either case, it would be smarter to not even play the sound effects if sound is off anyway.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:68
http://91.189.93.70:8080/job/dropping-letters-ci/42/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/dropping-letters-utopic-amd64-ci/20
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/575
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/575/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/dropping-letters-ci/42/rebuild

review: Approve (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

LGTM!

review: Approve

=== modified file 'dropping-letters.qml'
--- dropping-letters.qml	2014-09-20 10:24:29 +0000
+++ dropping-letters.qml	2014-09-26 22:56:59 +0000
@@ -320,11 +320,10 @@
                     source: "Easy_Lemon_60_second.ogg"
                     autoPlay: volume.supportsMedia
                     onStopped: {
-                        if (volume.supportsMedia) {
+                        if (volume.supportsMedia && volume.audible) {
                             music.play();
                         }
                     }
-                    muted: !volume.audible
                 }
                 */
 
@@ -332,7 +331,6 @@
                     id: click
                     source: "407__tictacshutup__click-1-off-click.ogg"
                     autoLoad: volume.supportsMedia
-                    muted: !volume.audible
                     audioRole: MediaPlayer.alert
                 }
 
@@ -340,7 +338,6 @@
                     id: success
                     source: "80921__justinbw__buttonchime02up.ogg"
                     autoLoad: volume.supportsMedia
-                    muted: !volume.audible
                     audioRole: MediaPlayer.alert
                 }
 
@@ -348,7 +345,6 @@
                     id: failure
                     source: "106727__kantouth__cartoon-bing-low.ogg"
                     autoLoad: volume.supportsMedia
-                    muted: !volume.audible
                     audioRole: MediaPlayer.alert
                 }
 
@@ -359,7 +355,6 @@
                     onStopped: {
                         flipable.flipped = false
                     }
-                    muted: !volume.audible
                     audioRole: MediaPlayer.alert
                 }
 
@@ -455,7 +450,7 @@
                         }
                         function processSuggestedWord() {
                             if (accum.isValid) {
-                                if (volume.supportsMedia) {
+                                if (volume.supportsMedia && volume.audible) {
                                     success.play();
                                 }
                                 var thisscore = 0, wordlength = accum.text.length;
@@ -471,7 +466,7 @@
                                 scoredisplay.text = "" + (thisscore * wordlength);
                                 showscoredisplay.start();
                             } else {
-                                if (volume.supportsMedia) {
+                                if (volume.supportsMedia && volume.audible) {
                                     failure.play();
                                 }
                                 accum.text = "";
@@ -547,7 +542,7 @@
                         if (lm.get(idx).letters.count >= 10) {
                             droptimer.stop();
                             game.ended = true;
-                            if (volume.supportsMedia) {
+                            if (volume.supportsMedia && volume.audible) {
                                 gameover.play();
                             }
                             bestscore.updateScore(main.score);
@@ -631,7 +626,7 @@
                                                 if (!box.selected) {
                                                     box.selected = true;
                                                     accum.text += letter;
-                                                    if (volume.supportsMedia) {
+                                                    if (volume.supportsMedia && volume.audible) {
                                                         click.play();
                                                     }
                                                     main.selectedItems[main.selectedItems.length] = box;