on xenial help sign in
Make the else branch use 5.0 instead of 5.4

It's what the mock provides and also what our intial patches provided Also move from onCompleted to a binding

commit9ce813a8af36b79fa00b4fbf05ebc1e1d0de19c1 authorAlbert Astals Cid <albert.astals@canonical.com> dateFri 23 Oct 2015, 12:21 (11 years ago) parent137a880
4 files changed+12−12
qml/Components/NotificationAudio.qml+12−9 qml/Components/ScreenGrabber.qml−1 qml/Notifications/Notification.qml−1 tests/qmltests/Notifications/tst_OptionToggle.qml−1
qml/Components/NotificationAudio.qml+12−9
@@ -19,6 +19,7 @@ import QtQuick 2.4
1919Item {
2020 id: root
2121 property string source: ""
22+ readonly property var playbackState: priv.realAudio ? priv.realAudio.playbackState : 0
2223
2324 function play() {
2425 priv.audio.play();
@@ -29,15 +30,17 @@ Item {
2930
3031 QtObject {
3132 id: priv
32− property var audio: null
33− }
34−
35− Component.onCompleted: {
36− try {
37− priv.audio = Qt.createQmlObject("import QtMultimedia 5.6; Audio { source: root.source; audioRole: MediaPlayer.NotificationRole }", priv)
38− } catch(err) {
39− console.log("Upstream audioRole enum not available, falling back to old role name.");
40− priv.audio = Qt.createQmlObject("import QtMultimedia 5.4; Audio { source: root.source; audioRole: MediaPlayer.alert }", priv)
33+ property var realAudio: null
34+ property var audio: {
35+ if (realAudio === null) {
36+ try {
37+ realAudio = Qt.createQmlObject("import QtMultimedia 5.6; Audio { source: root.source; audioRole: MediaPlayer.NotificationRole }", priv)
38+ } catch(err) {
39+ console.log("Upstream audioRole enum not available, falling back to old role name.");
40+ realAudio = Qt.createQmlObject("import QtMultimedia 5.0; Audio { source: root.source; audioRole: MediaPlayer.alert; onPlaybackStateChanged: console.log('sdfasdfasfd', playbackState); }", priv)
41+ }
42+ }
43+ return realAudio;
4144 }
4245 }
4346}
qml/Components/ScreenGrabber.qml−1
@@ -15,7 +15,6 @@
1515 */
1616
1717import QtQuick 2.0
18−import QtMultimedia 5.0
1918import ScreenGrabber 0.1
2019import GlobalShortcut 1.0
2120
qml/Notifications/Notification.qml−1
@@ -15,7 +15,6 @@
1515 */
1616
1717import QtQuick 2.0
18−import QtMultimedia 5.0
1918import Powerd 0.1
2019import Ubuntu.Components 1.2
2120import Unity.Notifications 1.0
tests/qmltests/Notifications/tst_OptionToggle.qml−1
@@ -24,7 +24,6 @@ import "../../../qml/Notifications"
2424import Ubuntu.Components 0.1
2525import Unity.Test 0.1
2626import Unity.Notifications 1.0
27−import QtMultimedia 5.0
2827
2928Row {
3029 id: rootRow