Merge lp:~gang65/ubuntu-clock-app/ubuntu-clock-volume-preview into lp:ubuntu-clock-app

[Bartosz Kosiorek]

Play background sound during volume slider changes (LP: #1362078)

Play background sound during volume slider changes (LP: #1362078)

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

PASSED: Continuous integration, rev:298
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/691/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-vivid-amd64-ci/37
        deb: http://91.189.93.70:8080/job/ubuntu-clock-app-vivid-amd64-ci/37/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/691/rebuild

review: Approve (continuous-integration)

[Riccardo Padovani (rpadovani)]

48 + previewAlarmVolume.source = "/usr/share/sounds/ubuntu/ringtones/Suru arpeggio.ogg"

The preview should be with the actual ringtone, now with an hardcoded one

review: Needs Fixing

[Bartosz Kosiorek (gang65)]

In the clock app you cannot set alarm ringtone globally, but the volume of alarms is set globally. You could customize ringtone for every alarm, and not globally.
So:
1. The alarm volume is global (for all alarms) - you cannot set different volume for every alarm.
2. The alarm ringtone is per alarm.
That's why I selected default ringtone for volume preview

[Victor Thompson (vthompson)]

I agree with Bartosz.

I'm not sure the alarm tone preview is varying with the value of the slider, however. When I move it from one end to the other the volume does not seem to change.

review: Needs Information

[Riccardo Padovani (rpadovani)]

Indeed, sorry for the wrong review.

+ alarmSettings.volume = value
+ previewAlarmVolume.volume = value/100

Why you set the volume of the preview at 1/100 of the actual volume?
Also, why did you drop the call to formatValue()?

review: Needs Information

[Victor Thompson (vthompson)]

The reason he is dividing by 100 is because the slider value is 1 to 100
and the volume variable is from 0 to 1.

On Sun, Jul 19, 2015 at 12:40 PM, Riccardo Padovani <email address hidden>
wrote:

> Review: Needs Information
>
> Indeed, sorry for the wrong review.
>
> + alarmSettings.volume = value
> + previewAlarmVolume.volume = value/100
>
> Why you set the volume of the preview at 1/100 of the actual volume?
> Also, why did you drop the call to formatValue()?
> --
>
> https://code.launchpad.net/~gang65/ubuntu-clock-app/ubuntu-clock-volume-preview/+merge/264783
> You are reviewing the proposed merge of
> lp:~gang65/ubuntu-clock-app/ubuntu-clock-volume-preview into
> lp:ubuntu-clock-app.
>

[Riccardo Padovani (rpadovani)]

I need an holiday.

[Bartosz Kosiorek (gang65)]

Hello Ricardo Salveti.

Could you please take a look at this MR and give your advice how to resolve this issue.
I suspect wrong Volume which I'm using.

Thanks in advance
Bartosz

review: Needs Information

[Victor Thompson (vthompson)]

Actually, I wonder if you need to cast the division so you get a decimal value. Could you try changing "value/100" to "1.0*value/100"?

[Ricardo Salveti (rsalveti)]

review: Needs Fixing

[lp:~gang65/ubuntu-clock-app/ubuntu-clock-volume-preview]

299. By Bartosz Kosiorek on 2015-07-29

Merge with trunk

300. By Bartosz Kosiorek on 2015-07-29

Change audio role for volume preview to alarm

301. By Bartosz Kosiorek on 2015-07-29

Fix manifest file

302. By Bartosz Kosiorek on 2015-07-29

Updated translation template

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

PASSED: Continuous integration, rev:302
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/708/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-vivid-amd64-ci/53

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/708/rebuild

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

One thing to note is that when I make the following change, any value from the slider results in "VOLUME: 0"

=== modified file 'app/alarm/AlarmSettingsPage.qml'
--- app/alarm/AlarmSettingsPage.qml 2015-07-29 19:35:00 +0000
+++ app/alarm/AlarmSettingsPage.qml 2015-08-07 22:35:02 +0000
@@ -35,7 +35,7 @@

     Audio {
         id: previewAlarmVolume
         audioRole: MediaPlayer.alarm
+ onVolumeChanged: console.log("VOLUME: ", volume)
     }

[lp:~gang65/ubuntu-clock-app/ubuntu-clock-volume-preview]

303. By Bartosz Kosiorek on 2015-10-22

Merge with trunk

304. By Bartosz Kosiorek on 2015-10-22

Play background sound during volume slider changes (LP: #1362078)

Unmerged revisions

304. By Bartosz Kosiorek on 2015-10-22

Play background sound during volume slider changes (LP: #1362078)

303. By Bartosz Kosiorek on 2015-10-22

Merge with trunk

302. By Bartosz Kosiorek on 2015-07-29

Updated translation template

301. By Bartosz Kosiorek on 2015-07-29

Fix manifest file

300. By Bartosz Kosiorek on 2015-07-29

Change audio role for volume preview to alarm

299. By Bartosz Kosiorek on 2015-07-29

Merge with trunk

298. By Bartosz Kosiorek on 2015-07-15

Play background sound during volume slider changes (LP: #1362078)

=== modified file 'app/alarm/AlarmSettingsPage.qml'
--- app/alarm/AlarmSettingsPage.qml	2015-10-06 21:22:34 +0000
+++ app/alarm/AlarmSettingsPage.qml	2015-10-22 12:06:37 +0000
@@ -16,11 +16,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 import QtQuick 2.4
 import QtQuick.Layouts 1.1
+import QtMultimedia 5.0
 import WorldClock 1.0
 import Alarm 1.0
 import Ubuntu.Components 1.2
+import Ubuntu.Settings.Menus 0.1 as Menus
 import "../components"
 
 Page {
@@ -30,6 +33,11 @@
     visible: false
     flickable: settingsPlugin
 
+    Audio {
+        id: previewAlarmVolume
+        audioRole: MediaPlayer.alarm
+    }
+
     Connections {
         target: clockApp
         onApplicationStateChanged: {
@@ -100,7 +108,7 @@
                     }
                 }
 
-                Slider {
+                Menus.SliderMenu {
                     anchors {
                         left: parent.left
                         right: parent.right
@@ -110,10 +118,14 @@
 
                     minimumValue: 1
                     maximumValue: 100
+                    live: true
                     value: alarmSettings.volume
 
                     onValueChanged: {
-                        alarmSettings.volume = formatValue(value)
+                        alarmSettings.volume = value
+                        previewAlarmVolume.volume = value/100
+                        previewAlarmVolume.source = "/usr/share/sounds/ubuntu/ringtones/Suru arpeggio.ogg"
+                        previewAlarmVolume.play()
                     }
                 }
             }

=== modified file 'debian/changelog'
--- debian/changelog	2015-10-16 05:58:01 +0000
+++ debian/changelog	2015-10-22 12:06:37 +0000
@@ -1,4 +1,10 @@
-ubuntu-clock-app (3.6) UNRELEASED; urgency=medium
+ubuntu-clock-app (3.7) UNRELEASED; urgency=medium
+
+  * Play background sound during volume slider changes (LP: #1362078) 
+
+ -- Bartosz Kosiorek <[e-mail]>  Thu, 22 Oct 2015 14:05:11 +0200
+
+ubuntu-clock-app (3.6) vivid; urgency=high
 
   [ Nekhelesh Ramananthan ]
   * Bumped version to 3.6