Unity 8

Merge lp:~aacid/unity8/notifications56 into lp:unity8

  1. notifications56
  2. Merge into trunk
Proposed by Albert Astals Cid
Status: Merged
Approved by: Michael Zanetti
Approved revision: 2334
Merged at revision: 2361
Proposed branch: lp:~aacid/unity8/notifications56
Merge into: lp:unity8
Diff against target: 82 lines (+22/-7)
3 files modified
qml/Components/NotificationAudio.qml (+4/-7)
tests/mocks/QtMultimedia/audio.cpp (+13/-0)
tests/mocks/QtMultimedia/audio.h (+5/-0)
To merge this branch: bzr merge lp:~aacid/unity8/notifications56
Reviewer Review Type Date Requested Status
Unity8 CI Bot continuous-integration Needs Fixing
Michael Zanetti (community) Approve
Review via email: mp+292128@code.launchpad.net

Commit message

NotificationAudio: We don't need weird "ifdef" for multimedia 5.6 vs 5.0 roles anymore

Description of the change

 * Are there any related MPs required for this MP to build/function as expected?
No

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

 * Did you make sure that your branch does not contain spurious tags?
Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

 * If you changed the UI, has there been a design review?
N/A

To post a comment you must log in.
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2334
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1001/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1348
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1320
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/1320
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1320
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1319
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1319/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/1319/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1319
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1319/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1319
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1319/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/1319/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1319
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1319/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1319
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1319/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/1319/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1319
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1319/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1001/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Michael Zanetti (mzanetti) wrote :

 * Did you perform an exploratory manual test run of the code change and any related functionality?

yes

 * Did CI run pass? If not, please explain why.

not yet, but really should.

 * Did you make sure that the branch does not contain spurious tags?

yes

review: Approve
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2334
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1014/
Executed test runs:
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/576
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial,testname=qmluitests.sh/576
    FAILURE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=autopilot.sh/576/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1362
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1333
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/1333
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1333
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1333
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1333/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/1333
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/1333/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1333
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1333/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1333
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1333/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/1333
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/1333/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1333
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1333/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1333
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1333/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/1333
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/1333/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1333
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1333/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1014/rebuild

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'qml/Components/NotificationAudio.qml'
2--- qml/Components/NotificationAudio.qml 2015-10-29 14:19:34 +0000
3+++ qml/Components/NotificationAudio.qml 2016-04-18 09:56:53 +0000
4@@ -15,6 +15,7 @@
5 */
6
7 import QtQuick 2.4
8+import QtMultimedia 5.6
9
10 Item {
11 id: root
12@@ -30,13 +31,9 @@
13
14 QtObject {
15 id: priv
16- property var audio: {
17- try {
18- return Qt.createQmlObject("import QtMultimedia 5.6; Audio { source: root.source; audioRole: MediaPlayer.NotificationRole }", priv)
19- } catch(err) {
20- console.log("Upstream audioRole enum not available, falling back to old role name.");
21- return Qt.createQmlObject("import QtMultimedia 5.0; Audio { source: root.source; audioRole: MediaPlayer.alert }", priv)
22- }
23+ property var audio: Audio {
24+ source: root.source
25+ audioRole: MediaPlayer.NotificationRole
26 }
27 }
28 }
29
30=== modified file 'tests/mocks/QtMultimedia/audio.cpp'
31--- tests/mocks/QtMultimedia/audio.cpp 2015-12-01 14:02:21 +0000
32+++ tests/mocks/QtMultimedia/audio.cpp 2016-04-18 09:56:53 +0000
33@@ -34,6 +34,19 @@
34 Q_EMIT durationChanged(m_duration);
35 }
36
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+
50 Audio::PlaybackState Audio::playbackState() const
51 {
52 return m_playbackState;
53
54=== modified file 'tests/mocks/QtMultimedia/audio.h'
55--- tests/mocks/QtMultimedia/audio.h 2015-12-01 14:02:21 +0000
56+++ tests/mocks/QtMultimedia/audio.h 2016-04-18 09:56:53 +0000
57@@ -29,6 +29,7 @@
58 Q_OBJECT
59 Q_ENUMS(PlaybackState)
60 Q_ENUMS(AudioRole)
61+ Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
62 Q_PROPERTY(PlaybackState playbackState READ playbackState NOTIFY playbackStateChanged)
63 Q_PROPERTY(int position READ position NOTIFY positionChanged)
64 Q_PROPERTY(int duration READ duration NOTIFY durationChanged)
65@@ -51,6 +52,9 @@
66
67 explicit Audio(QObject *parent = 0);
68
69+ QUrl source() const;
70+ void setSource(const QUrl &source);
71+
72 DeclarativePlaylist *playlist() const;
73 void setPlaylist(DeclarativePlaylist *playlist);
74
75@@ -82,6 +86,7 @@
76 void timerEvent();
77
78 private:
79+ QUrl m_source;
80 PlaybackState m_playbackState;
81 QTimer m_timer;
82 int m_position;

Subscribers

People subscribed via source and target branches