Merge lp:~mzanetti/ubuntu-clock-app/detect-qtmm-version into lp:ubuntu-clock-app

[Michael Zanetti]

add a hack to detect the available QtMultimedia version

This is supposed to handle API changes in our QtMultimedia distro-patches
without requiring to go through a deprecation phase

This would be the theoretical correct approach forward if we want the alarm sound preview to reflect the alarm volume. However, as the alarm volume seems to be restored to what the setting in the clock app is before the alarm is triggered, the current alarm role volume does not necessarily reflect the upcoming alarm's volume. Because of this, it is arguable how much sense it makes to include this workaround.

A simpler workaround to the api breakage problem, with roughly the same outcome can be found here:
https://code.launchpad.net/~mzanetti/ubuntu-clock-app/drop-audioRole/+merge/275179

[lp:~mzanetti/ubuntu-clock-app/detect-qtmm-version]

402. By Michael Zanetti on 2015-10-21

make api a little better

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:402
https://core-apps-jenkins.ubuntu.com/job/clock-app-ci/10/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/40/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/clock-app-ci/10/rebuild

review: Approve (continuous-integration)

[Bartosz Kosiorek (gang65)]

I tested it and it is working correctly for me on BQ E4.5 device.
It is nice improvement especially for QT 5.5 upgrade

One inline question below.

Do you think it could help in missing volume changes, during alarm preview?:
https://code.launchpad.net/~gang65/ubuntu-clock-app/ubuntu-clock-volume-preview/+merge/264783

Ricardo Salveti already investigated that issue, unfortunately without success.

review: Needs Information

[Michael Zanetti (mzanetti)]

fixed the inline comment.

For me, the volume controls during preview were working fine. Probably the issue was because before it was using the "alert" role, which seems to be wrong in any case.

As written in the description, I'm not really sure if we should merge this branch, or instead just go with the much simpler https://code.launchpad.net/~mzanetti/ubuntu-clock-app/drop-audioRole/+merge/275179

The outcome is pretty much the same with the current audio system.

[lp:~mzanetti/ubuntu-clock-app/detect-qtmm-version]

403. By Michael Zanetti on 2015-10-22

s/print/console.log/

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Continuous integration, rev:403
https://core-apps-jenkins.ubuntu.com/job/clock-app-ci/11/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/41/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/clock-app-ci/11/rebuild

review: Needs Fixing (continuous-integration)

[Bartosz Kosiorek (gang65)]

@Michael
I would like to clarify, that volume preview is working perfectly on Desktop,
unfortunately it is not working on Phone.

https://code.launchpad.net/~gang65/ubuntu-clock-app/ubuntu-clock-volume-preview/+merge/264783

This is very strange issue. Unfortunately these patches not resolve volume preview issue.
Do you have other idea, why it is not working on Phone?

review: Needs Information

[Michał Sawicz (saviq)]

@Bartosz, it's likely related to bug #1485522, and also the fact that indicator-datetime, AFAIK, sets the volume to the one set in the clock app when playing an alarm sound.

In any case, I vote for the competing approach for now - until we clear the whole volume situation up.

review: Disapprove

[Albert Astals Cid (aacid)]

review: Needs Fixing

[Michał Sawicz (saviq)]

I'm abstainig from this after all, see my reasoning on the counter-proposal:

https://code.launchpad.net/~mzanetti/ubuntu-clock-app/drop-audioRole/+merge/275179/comments/695921

review: Abstain

[lp:~mzanetti/ubuntu-clock-app/detect-qtmm-version]

404. By Michael Zanetti on 2015-10-26

update check to 5.6, in case we'd use this branch

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Continuous integration, rev:404
https://core-apps-jenkins.ubuntu.com/job/clock-app-ci/12/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/56/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/clock-app-ci/12/rebuild

review: Needs Fixing (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:404
https://core-apps-jenkins.ubuntu.com/job/clock-app-ci/14/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/66/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/clock-app-ci/14/rebuild

review: Approve (continuous-integration)

[Nicholas Skaggs (nskaggs)]

Let me know if you have further troubles. I'll be fixing the messages jenkins leaves to be a bit saner.

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

FAILED: Continuous integration, rev:401
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/856/
Executed test runs:

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

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

review: Abstain

Unmerged revisions

404. By Michael Zanetti on 2015-10-26

update check to 5.6, in case we'd use this branch

403. By Michael Zanetti on 2015-10-22

s/print/console.log/

402. By Michael Zanetti on 2015-10-21

make api a little better

401. By Michael Zanetti on 2015-10-21

add a hack to detect the available QtMultimedia version

This is supposed to handle API changes in our QtMultimedia distro-patches
without requiring to go through a deprecation phase

=== modified file 'app/alarm/AlarmSound.qml'
--- app/alarm/AlarmSound.qml	2015-08-28 20:06:32 +0000
+++ app/alarm/AlarmSound.qml	2015-10-26 10:26:22 +0000
@@ -23,6 +23,7 @@
 import Ubuntu.Components 1.2
 import QtQuick.Layouts 1.1
 import Qt.labs.folderlistmodel 2.1
+import "../components"
 
 Page {
     id: _alarmSoundPage
@@ -147,9 +148,8 @@
         }
     }
 
-    Audio {
+    AlarmAudio {
         id: previewAlarmSound
-        audioRole: MediaPlayer.alert
 
         function controlPlayback(fileURL) {
             source = fileURL

=== added file 'app/components/AlarmAudio.qml'
--- app/components/AlarmAudio.qml	1970-01-01 00:00:00 +0000
+++ app/components/AlarmAudio.qml	2015-10-26 10:26:22 +0000
@@ -0,0 +1,35 @@
+import QtQuick 2.4
+
+Item {
+    id: root
+    property string source: ""
+    readonly property alias playbackState: priv.playbackState
+
+    function play() {
+        priv.audio.play();
+    }
+    function stop() {
+        priv.audio.stop();
+    }
+
+    QtObject {
+        id: priv
+        property var audio: null
+        property var playbackState: null
+    }
+
+    Binding {
+        target: priv
+        property: "playbackState"
+        value: priv.audio ? priv.audio.playbackState : 0
+    }
+
+    Component.onCompleted: {
+        try {
+            priv.audio = Qt.createQmlObject("import QtMultimedia 5.6; Audio { source: root.source; audioRole: MediaPlayer.AlarmRole }", priv)
+        } catch(err) {
+            console.log("QtMultimedia 5.6 not installed. Falling back to 5.4.");
+            priv.audio = Qt.createQmlObject("import QtMultimedia 5.4; Audio { source: root.source; audioRole: MediaPlayer.alarm }", priv)
+        }
+    }
+}

=== modified file 'app/components/CMakeLists.txt'
--- app/components/CMakeLists.txt	2015-08-13 18:26:31 +0000
+++ app/components/CMakeLists.txt	2015-10-26 10:26:22 +0000
@@ -2,6 +2,7 @@
     ActionIcon.qml
     AnalogMode.qml
     AnalogShadow.qml
+    AlarmAudio.qml
     Background.qml
     Clock.qml
     ClockCircle.qml