qtubuntu-media

Merge lp:~jhodapp/qtubuntu-media/media-hub2-types into lp:qtubuntu-media

  1. media-hub2-types
  2. Merge into trunk
Proposed by Jim Hodapp
Status: Merged
Approved by: Ricardo Salveti
Approved revision: 45
Merged at revision: 45
Proposed branch: lp:~jhodapp/qtubuntu-media/media-hub2-types
Merge into: lp:qtubuntu-media
Diff against target: 64 lines (+9/-9)
2 files modified
unittests/player.cpp (+5/-5)
unittests/player.h (+4/-4)
To merge this branch: bzr merge lp:~jhodapp/qtubuntu-media/media-hub2-types
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Alberto Aguirre (community) Approve
Review via email: mp+236168@code.launchpad.net

Commit message

* Update to use the latest Property types for libmedia-hub2

Description of the change

* Update to use the latest Property types for libmedia-hub2

To post a comment you must log in.
Revision history for this message
Alberto Aguirre (albaguirre) wrote :

LGTM

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:45
http://jenkins.qa.ubuntu.com/job/qtubuntu-media-ci/57/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-utopic-amd64-ci/8
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-utopic-armhf-ci/8
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-utopic-armhf-ci/8/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-utopic-i386-ci/8

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

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'unittests/player.cpp'
2--- unittests/player.cpp 2014-09-23 17:16:52 +0000
3+++ unittests/player.cpp 2014-09-26 18:07:58 +0000
4@@ -195,14 +195,14 @@
5 return ret;
6 }
7
8-const core::Property<uint64_t>& TestPlayer::position() const
9+const core::Property<int64_t>& TestPlayer::position() const
10 {
11 return m_position;
12 }
13
14-const core::Property<uint64_t>& TestPlayer::duration() const
15+const core::Property<int64_t>& TestPlayer::duration() const
16 {
17- static const core::Property<uint64_t> dur(1e6);
18+ static const core::Property<int64_t> dur(1e6);
19 return dur;
20 }
21
22@@ -242,9 +242,9 @@
23 return role;
24 }
25
26-const core::Signal<uint64_t>& TestPlayer::seeked_to() const
27+const core::Signal<int64_t>& TestPlayer::seeked_to() const
28 {
29- static core::Signal<uint64_t> ret;
30+ static core::Signal<int64_t> ret;
31 return ret;
32 }
33
34
35=== modified file 'unittests/player.h'
36--- unittests/player.h 2014-09-23 17:16:52 +0000
37+++ unittests/player.h 2014-09-26 18:07:58 +0000
38@@ -67,8 +67,8 @@
39 virtual const core::Property<Volume>& volume() const;
40 virtual const core::Property<PlaybackRate>& minimum_playback_rate() const;
41 virtual const core::Property<PlaybackRate>& maximum_playback_rate() const;
42- virtual const core::Property<uint64_t>& position() const;
43- virtual const core::Property<uint64_t>& duration() const;
44+ virtual const core::Property<int64_t>& position() const;
45+ virtual const core::Property<int64_t>& duration() const;
46 virtual const core::Property<AudioStreamRole>& audio_stream_role() const;
47
48 virtual core::Property<LoopStatus>& loop_status();
49@@ -77,13 +77,13 @@
50 virtual core::Property<Volume>& volume();
51 virtual core::Property<AudioStreamRole>& audio_stream_role();
52
53- virtual const core::Signal<uint64_t>& seeked_to() const;
54+ virtual const core::Signal<int64_t>& seeked_to() const;
55 virtual const core::Signal<void>& end_of_stream() const;
56 virtual const core::Signal<PlaybackStatus>& playback_status_changed() const;
57 virtual core::Signal<PlaybackStatus>& playback_status_changed();
58
59 private:
60- core::Property<uint64_t> m_position;
61+ core::Property<int64_t> m_position;
62 };
63
64 }

Subscribers

People subscribed via source and target branches