Merge lp:~nik90/ubuntu-clock-app/play-sound-preview into lp:ubuntu-clock-app

[Nekhelesh Ramananthan]

Plays the alarm sound when you select it in the alarm sound page. This will help users decide if they want to choose that ringtone or not.

Plays the alarm sound when you select it in the alarm sound page. This will help users decide if they want to choose that ringtone or not.

Requires image #199 and higher to test on phone.

[Nekhelesh Ramananthan (nik90)]

#blocked due to some apparmor issues I think. Need to talk to jdhopp and jdstrand about this. The audio playback works on the desktop and not on device.

root@ubuntu-phablet:~# grep DEN /var/log/syslog
Aug 15 11:16:58 ubuntu-phablet kernel: [ 3968.875354] type=1400 audit(1408094218.079:104): apparmor="DENIED" operation="file_mmap" profile="/usr/bin/media-hub-server" name="/tmp/orcexec.CLp5yf" pid=5825 comm="aqueue:src" requested_mask="m" denied_mask="m" fsuid=32011 ouid=32011
Aug 15 11:16:58 ubuntu-phablet kernel: [ 3968.875506] type=1400 audit(1408094218.079:105): apparmor="DENIED" operation="mknod" profile="/usr/bin/media-hub-server" name="/run/user/32011/orcexec.cntnWk" pid=5825 comm="aqueue:src" requested_mask="c" denied_mask="c" fsuid=32011 ouid=32011

review: Needs Fixing

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

FAILED: Continuous integration, rev:54
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/206/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/44
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/44/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-ci/206

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/206/rebuild

review: Needs Fixing (continuous-integration)

[Nekhelesh Ramananthan (nik90)]

Update 1: https://bugs.launchpad.net/media-hub/+bug/1357348 is the bug reported after talking to jdstrand. He suggested a fix that I could, however it didnt seem to fix it. May be there is a second issue we are facing. Will talk to jdhopp and update this MP.

[Nekhelesh Ramananthan (nik90)]

2:03 PM <jhodapp> nik90, yeah I have a pretty good guess of what it is, one sec
2:03 PM <nik90> jhodapp: yay :)
2:03 PM <sergiusens> nik90: is the tone in part of the clock apps directory space
2:04 PM → zoopster joined
2:04 PM <sergiusens> jhodapp: might be the same issue we had with paths?
2:04 PM <jhodapp> sergiusens, exactly
2:04 PM <nik90> sergiusens: directory space? as in does clock have permission to read that folder?
2:05 PM <nik90> jhodapp, sergiusens: Btw the ringtones i am playing are in /usr/share/sounds/ubuntu/ringtones
2:05 PM <jhodapp> nik90, no, as in media-hub won't play that sound for clock-app because of permission policy within media-hub
2:05 PM <nik90> jhodapp: but wasn't it fixed in https://bugs.launchpad.net/media-hub/+bug/1357348
2:05 PM <ubot5> Ubuntu bug 1357348 in mediascanner2 (Ubuntu) "Cannot play sound files due to apparmor permission issue" [Critical,In progress]
2:05 PM <jhodapp> nik90, yep, I can almost guarantee that's the issue now...technically an app is only allowed to play something from its own click *home dir*
2:06 PM <nik90> jhodapp: so how do I fix that in the clock app?
2:06 PM <sergiusens> nik90: click pkgdir com.ubuntu.clock that is
2:07 PM <nik90> sergiusens: ah no we don't ship that folder with the clock app
2:08 PM <jhodapp> nik90, you can check what's going on with media-hub by tailing the log while it tries to play that sound: "tail -f /home/phablet/.cache/upstart/media-hub.log"
2:09 PM — nik90 checks that now
2:09 PM <jhodapp> you should see a line like "client pkgname: com.ubuntu.music
2:09 PM <jhodapp> uri: file:///home/phablet/Music/01 - Gobbledigook.mp3
2:09 PM <jhodapp> Client can access content in ~/Music or ~/Videos""
2:09 PM <jhodapp> nik90, but it should say client not allow access...
2:10 PM <nik90> jhodapp: yup http://paste.ubuntu.com/8079472/
2:11 PM alan_g|lunch → alan_g
2:11 PM <nik90> jhodapp: so what would you advice me to do? Ship that folder internally with the clock app?
2:11 PM <jhodapp> nik90, so please ping jdstrand about this and if he is ok with adding another app exception to the media-hub policy

[Nekhelesh Ramananthan (nik90)]

Blocked due to https://bugs.launchpad.net/media-hub/+bug/1358278. However jhodapp said he will fix it quickly today itself.

[Nekhelesh Ramananthan (nik90)]

This has been fixed in https://code.launchpad.net/~jhodapp/media-hub/allow-shared-sounds/+merge/231242 which should be in #199. Hence this is no longer blocked. I confirm that this works on the phone. Just needs a code review.

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

FAILED: Continuous integration, rev:57
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/227/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/72
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/72/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-ci/227

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/227/rebuild

review: Needs Fixing (continuous-integration)

[Nekhelesh Ramananthan (nik90)]

#unblocked

[twstd (twstd-dev)]

review: Approve

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

FAILED: Continuous integration, rev:58
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/228/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/73
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/73/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-ci/228

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/228/rebuild

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:58
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/229/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/74
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/74/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-ci/229

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/229/rebuild

review: Needs Fixing (continuous-integration)

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-autolanding/26/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/75
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/75/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-autolanding/26

review: Needs Fixing (continuous-integration)

[lp:~nik90/ubuntu-clock-app/play-sound-preview]

60. By Nekhelesh Ramananthan on 2014-08-19

uncommenting all code in alarm sound to test jenkins

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

PASSED: Continuous integration, rev:60
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/230/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/76
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/76/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-ci/230

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/230/rebuild

review: Approve (continuous-integration)

[lp:~nik90/ubuntu-clock-app/play-sound-preview]

61. By Nekhelesh Ramananthan on 2014-08-19

Uncommented multimedia library import and audio component declaration

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

FAILED: Continuous integration, rev:61
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/231/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/77
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/77/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-ci/231

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/231/rebuild

review: Needs Fixing (continuous-integration)

[lp:~nik90/ubuntu-clock-app/play-sound-preview]

62. By Nekhelesh Ramananthan on 2014-08-19

replace audio with media player

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

FAILED: Continuous integration, rev:62
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/232/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/78
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/78/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-ci/232

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/232/rebuild

review: Needs Fixing (continuous-integration)

[lp:~nik90/ubuntu-clock-app/play-sound-preview]

63. By Nekhelesh Ramananthan on 2014-08-19

Added qtdeclarative5-qtmultimedia-plugin dependency to debian control

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

PASSED: Continuous integration, rev:63
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/233/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/79
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/79/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-ci/233

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/233/rebuild

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:62
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/234/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/80
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/80/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-ci/234

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/234/rebuild

review: Approve (continuous-integration)

=== modified file 'app/alarm/AlarmSound.qml'
--- app/alarm/AlarmSound.qml	2014-08-14 23:47:42 +0000
+++ app/alarm/AlarmSound.qml	2014-08-19 19:14:22 +0000
@@ -17,6 +17,7 @@
  */
 
 import QtQuick 2.0
+import QtMultimedia 5.0
 import Ubuntu.Components 1.1
 import Ubuntu.Components.ListItems 1.0 as ListItem
 
@@ -43,6 +44,10 @@
         }
     }
 
+    Audio {
+        id: previewAlarmSound
+    }
+
     Flickable {
         id: _pageFlickable
 
@@ -91,6 +96,9 @@
                                                                         : false
                         onClicked: {
                             if (checked) {
+                                previewAlarmSound.source = fileURL
+                                previewAlarmSound.play()
+
                                 alarmSound.subText = _soundName.text
                                 alarm.sound = fileURL
 

=== modified file 'debian/changelog'
--- debian/changelog	2014-08-18 12:55:49 +0000
+++ debian/changelog	2014-08-19 19:14:22 +0000
@@ -9,6 +9,8 @@
   * Added support for custom alarm sounds as per the design spec.
   * Added UI support for searching cities online from geoname-lookup.ubuntu.com
   * Improved error handling of jsontimezone model.
+  * Added support to play alarm sound preview when selecting them in the alarm
+    sound page. (LP: #1355410)
 
   [David Planella]
   * Added internationalization support (LP: #1354522)

=== modified file 'debian/control'
--- debian/control	2014-08-13 11:57:57 +0000
+++ debian/control	2014-08-19 19:14:22 +0000
@@ -24,6 +24,8 @@
          qtdeclarative5-u1db1.0,
          qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,
          qtdeclarative5-xmllistmodel-plugin,
+          qtdeclarative5-qtmultimedia-plugin,
+         ubuntu-touch-sounds,
          suru-icon-theme | ubuntu-mobile-icons,
          ${misc:Depends},
          ${shlibs:Depends},