qtubuntu-media

Merge lp:~ricmm/qtubuntu-media/abi-session-reattach into lp:qtubuntu-media

  1. abi-session-reattach
  2. Merge into trunk
Proposed by Ricardo Mendoza
Status: Merged
Approved by: Jim Hodapp
Approved revision: 70
Merged at revision: 68
Proposed branch: lp:~ricmm/qtubuntu-media/abi-session-reattach
Merge into: lp:qtubuntu-media
Diff against target: 125 lines (+38/-5)
5 files modified
debian/control (+1/-1)
unittests/player.cpp (+15/-2)
unittests/player.h (+6/-2)
unittests/service.cpp (+13/-0)
unittests/service.h (+3/-0)
To merge this branch: bzr merge lp:~ricmm/qtubuntu-media/abi-session-reattach
Reviewer Review Type Date Requested Status
Jim Hodapp (community) Approve
PS Jenkins bot continuous-integration Needs Fixing
Review via email: mp+255860@code.launchpad.net

Commit message

Adapt to new media-hub abi.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:70
http://jenkins.qa.ubuntu.com/job/qtubuntu-media-ci/103/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-vivid-amd64-ci/28/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-vivid-armhf-ci/28/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-vivid-i386-ci/28/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-media-ci/103/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Jim Hodapp (jhodapp) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2015-03-13 23:49:01 +0000
3+++ debian/control 2015-04-17 19:30:32 +0000
4@@ -10,7 +10,7 @@
5 libgl1-mesa-dev | libgl-dev,
6 libgles2-mesa-dev,
7 libhybris-dev (>= 0.1.0+git20131207+e452e83-0ubuntu13),
8- libmedia-hub-dev (>= 3.0.0),
9+ libmedia-hub-dev (>= 3.1.0),
10 libpulse-dev,
11 libqt5opengl5-dev,
12 libqtubuntu-media-signals-dev (>= 0.3+14.04.20140307-0ubuntu2),
13
14=== modified file 'unittests/player.cpp'
15--- unittests/player.cpp 2015-03-09 17:02:57 +0000
16+++ unittests/player.cpp 2015-04-17 19:30:32 +0000
17@@ -53,6 +53,19 @@
18 {
19 }
20
21+std::string TestPlayer::uuid() const
22+{
23+ return std::string{};
24+}
25+
26+void TestPlayer::reconnect()
27+{
28+}
29+
30+void TestPlayer::abandon()
31+{
32+}
33+
34 shared_ptr<TrackList> TestPlayer::track_list()
35 {
36 static shared_ptr<TrackList> ret(NULL);
37@@ -172,7 +185,7 @@
38 return ret;
39 }
40
41-const core::Property<bool>& TestPlayer::is_shuffle() const
42+const core::Property<bool>& TestPlayer::shuffle() const
43 {
44 static core::Property<bool> ret(true);
45 return ret;
46@@ -237,7 +250,7 @@
47 return ret;
48 }
49
50-core::Property<bool>& TestPlayer::is_shuffle()
51+core::Property<bool>& TestPlayer::shuffle()
52 {
53 static core::Property<bool> ret(true);
54 return ret;
55
56=== modified file 'unittests/player.h'
57--- unittests/player.h 2015-03-09 17:02:57 +0000
58+++ unittests/player.h 2015-04-17 19:30:32 +0000
59@@ -39,6 +39,10 @@
60 TestPlayer();
61 virtual ~TestPlayer();
62
63+ virtual std::string uuid() const;
64+ virtual void reconnect();
65+ virtual void abandon();
66+
67 virtual std::shared_ptr<TrackList> track_list();
68 virtual PlayerKey key() const;
69
70@@ -63,7 +67,7 @@
71 virtual const core::Property<Orientation>& orientation() const;
72 virtual const core::Property<LoopStatus>& loop_status() const;
73 virtual const core::Property<PlaybackRate>& playback_rate() const;
74- virtual const core::Property<bool>& is_shuffle() const;
75+ virtual const core::Property<bool>& shuffle() const;
76 virtual const core::Property<Track::MetaData>& meta_data_for_current_track() const;
77 virtual const core::Property<Volume>& volume() const;
78 virtual const core::Property<PlaybackRate>& minimum_playback_rate() const;
79@@ -75,7 +79,7 @@
80
81 virtual core::Property<LoopStatus>& loop_status();
82 virtual core::Property<PlaybackRate>& playback_rate();
83- virtual core::Property<bool>& is_shuffle();
84+ virtual core::Property<bool>& shuffle();
85 virtual core::Property<Volume>& volume();
86 virtual core::Property<AudioStreamRole>& audio_stream_role();
87 virtual core::Property<Lifetime>& lifetime();
88
89=== modified file 'unittests/service.cpp'
90--- unittests/service.cpp 2015-02-18 19:34:07 +0000
91+++ unittests/service.cpp 2015-04-17 19:30:32 +0000
92@@ -30,6 +30,19 @@
93 return NULL;
94 }
95
96+void TestService::detach_session(const std::string&, const Player::Configuration&)
97+{
98+}
99+
100+std::shared_ptr<Player> TestService::reattach_session(const std::string&, const Player::Configuration&)
101+{
102+ return NULL;
103+}
104+
105+void TestService::destroy_session(const std::string&, const Player::Configuration&)
106+{
107+}
108+
109 std::shared_ptr<Player> TestService::create_fixed_session(const std::string& name, const Player::Configuration&)
110 {
111 (void) name;
112
113=== modified file 'unittests/service.h'
114--- unittests/service.h 2014-10-08 07:57:42 +0000
115+++ unittests/service.h 2015-04-17 19:30:32 +0000
116@@ -45,6 +45,9 @@
117 bool operator==(const TestService&) const = delete;
118
119 virtual std::shared_ptr<Player> create_session(const Player::Configuration&);
120+ virtual void detach_session(const std::string& uuid, const Player::Configuration&);
121+ virtual std::shared_ptr<Player> reattach_session(const std::string& uuid, const Player::Configuration&);
122+ virtual void destroy_session(const std::string& uuid, const Player::Configuration&);
123 virtual std::shared_ptr<Player> create_fixed_session(const std::string& name, const Player::Configuration&);
124 virtual std::shared_ptr<Player> resume_session(Player::PlayerKey);
125 virtual void pause_other_sessions(Player::PlayerKey);

Subscribers

People subscribed via source and target branches