git.iko.soy/unity8
on xenial help sign in
NotificationAudio: We don't need weird "ifdef" for multimedia 5.6 vs 5.0 roles anymore

Approved by: Michael Zanetti

commit9b0e967a9e90db267e473df983c4bee61e848f2e authorAlbert Astals Cid <albert.astals@canonical.com> dateWed 27 Apr 2016, 14:59 (10 years ago) parent0ed2df33caee59
3 files changed+22−7
compare with xenial
unifiedsplit
qml/Components/NotificationAudio.qml+4−7 tests/mocks/QtMultimedia/audio.cpp+13 tests/mocks/QtMultimedia/audio.h+5
qml/Components/NotificationAudio.qml+4−7
@@ -15,6 +15,7 @@
1515 */
1616
1717import QtQuick 2.4
18+import QtMultimedia 5.6
1819
1920Item {
2021 id: root
@@ -30,13 +31,9 @@ Item {
3031
3132 QtObject {
3233 id: priv
33− property var audio: {
34− try {
35− return Qt.createQmlObject("import QtMultimedia 5.6; Audio { source: root.source; audioRole: MediaPlayer.NotificationRole }", priv)
36− } catch(err) {
37− console.log("Upstream audioRole enum not available, falling back to old role name.");
38− return Qt.createQmlObject("import QtMultimedia 5.0; Audio { source: root.source; audioRole: MediaPlayer.alert }", priv)
39− }
34+ property var audio: Audio {
35+ source: root.source
36+ audioRole: MediaPlayer.NotificationRole
4037 }
4138 }
4239}
tests/mocks/QtMultimedia/audio.cpp+13
@@ -34,6 +34,19 @@ Audio::Audio(QObject* parent):
3434 Q_EMIT durationChanged(m_duration);
3535}
3636
37+QUrl Audio::source() const
38+{
39+ return m_source;
40+}
41+
42+void Audio::setSource(const QUrl &source)
43+{
44+ if (m_source != source) {
45+ m_source = source;
46+ Q_EMIT sourceChanged(source);
47+ }
48+}
49+
3750Audio::PlaybackState Audio::playbackState() const
3851{
3952 return m_playbackState;
tests/mocks/QtMultimedia/audio.h+5
@@ -29,6 +29,7 @@ class Audio: public QObject
2929 Q_OBJECT
3030 Q_ENUMS(PlaybackState)
3131 Q_ENUMS(AudioRole)
32+ Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
3233 Q_PROPERTY(PlaybackState playbackState READ playbackState NOTIFY playbackStateChanged)
3334 Q_PROPERTY(int position READ position NOTIFY positionChanged)
3435 Q_PROPERTY(int duration READ duration NOTIFY durationChanged)
@@ -51,6 +52,9 @@ public:
5152
5253 explicit Audio(QObject *parent = 0);
5354
55+ QUrl source() const;
56+ void setSource(const QUrl &source);
57+
5458 DeclarativePlaylist *playlist() const;
5559 void setPlaylist(DeclarativePlaylist *playlist);
5660
@@ -82,6 +86,7 @@ private Q_SLOTS:
8286 void timerEvent();
8387
8488private:
89+ QUrl m_source;
8590 PlaybackState m_playbackState;
8691 QTimer m_timer;
8792 int m_position;