qtubuntu-media

Merge lp:~phablet-team/qtubuntu-media/media-hub-desktop into lp:qtubuntu-media

  1. media-hub-desktop
  2. Merge into trunk
Proposed by Jim Hodapp
Status: Merged
Approved by: Lorn Potter
Approved revision: 113
Merged at revision: 113
Proposed branch: lp:~phablet-team/qtubuntu-media/media-hub-desktop
Merge into: lp:qtubuntu-media
Diff against target: 70 lines (+15/-1)
5 files modified
debian/control (+1/-1)
tests/unit/player.cpp (+6/-0)
tests/unit/player.h (+1/-0)
tests/unit/player_mock.cpp (+6/-0)
tests/unit/player_mock.h (+1/-0)
To merge this branch: bzr merge lp:~phablet-team/qtubuntu-media/media-hub-desktop
Reviewer Review Type Date Requested Status
Lorn Potter (community) Approve
Review via email: mp+302961@code.launchpad.net

Commit message

Make media-hub work on the desktop. Everything except for video playback works with this commit.

Description of the change

Make media-hub work on the desktop. Everything except for video playback works with this commit.

To post a comment you must log in.
Revision history for this message
Lorn Potter (lorn-potter) wrote :

LGTM

Revision history for this message
Lorn Potter (lorn-potter) :
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 2016-07-19 21:28:39 +0000
3+++ debian/control 2016-08-15 19:44:56 +0000
4@@ -9,7 +9,7 @@
5 libgl1-mesa-dev | libgl-dev,
6 libgles2-mesa-dev,
7 libhybris-dev (>= 0.1.0+git20131207+e452e83-0ubuntu13),
8- libmedia-hub-dev (>= 4.5.0),
9+ libmedia-hub-dev (>= 4.6.0),
10 libpulse-dev,
11 libqt5opengl5-dev,
12 libqtubuntu-media-signals-dev (>= 0.3+15.04.20150618.1-0ubuntu1),
13
14=== modified file 'tests/unit/player.cpp'
15--- tests/unit/player.cpp 2016-06-12 22:55:36 +0000
16+++ tests/unit/player.cpp 2016-08-15 19:44:56 +0000
17@@ -168,6 +168,12 @@
18 return ret;
19 }
20
21+const core::Property<AVBackend::Backend>& TestPlayer::backend() const
22+{
23+ static core::Property<AVBackend::Backend> ret(AVBackend::Backend::none);
24+ return ret;
25+}
26+
27 const core::Property<Player::LoopStatus>& TestPlayer::loop_status() const
28 {
29 static core::Property<Player::LoopStatus> ret(Player::LoopStatus::none);
30
31=== modified file 'tests/unit/player.h'
32--- tests/unit/player.h 2016-06-08 09:17:31 +0000
33+++ tests/unit/player.h 2016-08-15 19:44:56 +0000
34@@ -69,6 +69,7 @@
35 virtual const core::Property<bool>& is_video_source() const;
36 virtual const core::Property<bool>& is_audio_source() const;
37 virtual const core::Property<PlaybackStatus>& playback_status() const;
38+ virtual const core::Property<AVBackend::Backend>& backend() const;
39 virtual const core::Property<LoopStatus>& loop_status() const;
40 virtual const core::Property<PlaybackRate>& playback_rate() const;
41 virtual const core::Property<bool>& shuffle() const;
42
43=== modified file 'tests/unit/player_mock.cpp'
44--- tests/unit/player_mock.cpp 2016-06-12 22:55:36 +0000
45+++ tests/unit/player_mock.cpp 2016-08-15 19:44:56 +0000
46@@ -153,6 +153,12 @@
47 return ret;
48 }
49
50+const core::Property<AVBackend::Backend>& PlayerMock::backend() const
51+{
52+ static core::Property<AVBackend::Backend> ret(AVBackend::Backend::none);
53+ return ret;
54+}
55+
56 const core::Property<PlayerMock::Orientation>& PlayerMock::orientation() const
57 {
58 static core::Property<Player::Orientation> ret(Player::Orientation::rotate0);
59
60=== modified file 'tests/unit/player_mock.h'
61--- tests/unit/player_mock.h 2016-06-08 09:17:31 +0000
62+++ tests/unit/player_mock.h 2016-08-15 19:44:56 +0000
63@@ -64,6 +64,7 @@
64 virtual const core::Property<bool>& is_video_source() const;
65 virtual const core::Property<bool>& is_audio_source() const;
66 virtual const core::Property<PlaybackStatus>& playback_status() const;
67+ virtual const core::Property<AVBackend::Backend>& backend() const;
68 virtual const core::Property<Orientation>& orientation() const;
69 virtual const core::Property<LoopStatus>& loop_status() const;
70 virtual const core::Property<PlaybackRate>& playback_rate() const;

Subscribers

People subscribed via source and target branches

to all changes: