Merge lp:~thomas-voss/music-hub/fix-missing-symbols-and-add-stop-function into lp:music-hub

Proposed by Thomas Voß
Status: Merged
Merged at revision: 7
Proposed branch: lp:~thomas-voss/music-hub/fix-missing-symbols-and-add-stop-function
Merge into: lp:music-hub
Diff against target: 42 lines (+10/-0)
3 files modified
include/com/ubuntu/music/player.h (+2/-0)
src/com/ubuntu/music/player.cpp (+4/-0)
src/com/ubuntu/music/service.cpp (+4/-0)
To merge this branch: bzr merge lp:~thomas-voss/music-hub/fix-missing-symbols-and-add-stop-function
Reviewer Review Type Date Requested Status
David Henningsson (community) Approve
PS Jenkins bot continuous-integration Approve
Ubuntu Phablet Team Pending
Review via email: mp+183746@code.launchpad.net

Commit message

 * Add missing stop method.
 * Add missing c'tor implementation.

Description of the change

 * Add missing stop method.
 * Add missing c'tor implementation.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
David Henningsson (diwic) wrote :

Looks good - let me test it and see if it solves the symbol lookup error.

Revision history for this message
David Henningsson (diwic) wrote :

It does fix the symbol lookup error, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'include/com/ubuntu/music/player.h'
2--- include/com/ubuntu/music/player.h 2013-08-13 14:07:37 +0000
3+++ include/com/ubuntu/music/player.h 2013-09-03 19:10:53 +0000
4@@ -72,6 +72,8 @@
5
6 bool can_seek();
7 void seek_to(const std::chrono::microseconds& offset);
8+
9+ void stop();
10
11 PlaybackStatus playback_status() const;
12 Connection on_playback_status_changed(const std::function<void(PlaybackStatus)>& handler);
13
14=== modified file 'src/com/ubuntu/music/player.cpp'
15--- src/com/ubuntu/music/player.cpp 2013-08-13 14:07:37 +0000
16+++ src/com/ubuntu/music/player.cpp 2013-09-03 19:10:53 +0000
17@@ -82,6 +82,10 @@
18 (void) offset;
19 }
20
21+void music::Player::stop()
22+{
23+}
24+
25 music::Player::PlaybackStatus music::Player::playback_status() const
26 {
27 return Player::stopped;
28
29=== modified file 'src/com/ubuntu/music/service.cpp'
30--- src/com/ubuntu/music/service.cpp 2013-08-13 14:07:37 +0000
31+++ src/com/ubuntu/music/service.cpp 2013-09-03 19:10:53 +0000
32@@ -27,6 +27,10 @@
33 return instance;
34 }
35
36+music::Service::Service()
37+{
38+}
39+
40 music::Service::~Service()
41 {
42 }

Subscribers

People subscribed via source and target branches