git.iko.soy/unity8
on xenial help sign in
Saviq doesn't like the two properties approach
ce2ec42Albert Astals Cid
qml/Components/NotificationAudio.qml+6−10
compare with xenial
unifiedsplit
@@ -19,7 +19,7 @@ import QtQuick 2.4
19Item {
19Item {
20 id: root
20 id: root
21 property string source: ""
21 property string source: ""
22− readonly property var playbackState: priv.realAudio ? priv.realAudio.playbackState : 0
22+ readonly property var playbackState: priv.audio ? priv.audio.playbackState : 0
23
23
24 function play() {
24 function play() {
25 priv.audio.play();
25 priv.audio.play();
@@ -30,17 +30,13 @@ Item {
30
30
31 QtObject {
31 QtObject {
32 id: priv
32 id: priv
33− property var realAudio: null
34 property var audio: {
33 property var audio: {
35− if (realAudio === null) {
36− try {
34+ try {
37− realAudio = Qt.createQmlObject("import QtMultimedia 5.6; Audio { source: root.source; audioRole: MediaPlayer.NotificationRole }", priv)
35+ return Qt.createQmlObject("import QtMultimedia 5.6; Audio { source: root.source; audioRole: MediaPlayer.NotificationRole }", priv)
38− } catch(err) {
36+ } catch(err) {
39− console.log("Upstream audioRole enum not available, falling back to old role name.");
37+ 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)
38+ return Qt.createQmlObject("import QtMultimedia 5.0; Audio { source: root.source; audioRole: MediaPlayer.alert; onPlaybackStateChanged: console.log('sdfasdfasfd', playbackState); }", priv)
41− }
42 }
39 }
43− return realAudio;
44 }
40 }
45 }
41 }
46}
42}