Merge lp:~thomas-voss/music-hub/wire-up-tracklist-to-player into lp:music-hub

[Thomas Voß]

Wire up tracklist to the player interface.

Wire up tracklist to the player interface.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:9
http://jenkins.qa.ubuntu.com/job/music-hub-ci/7/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/music-hub-saucy-amd64-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/music-hub-saucy-armhf-ci/7
        deb: http://jenkins.qa.ubuntu.com/job/music-hub-saucy-armhf-ci/7/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/music-hub-saucy-i386-ci/7

Click here to trigger a rebuild:
http://s-jenkins:8080/job/music-hub-ci/7/rebuild

review: Approve (continuous-integration)

[David Henningsson (diwic)]

Looks good, merged.

=== modified file 'include/com/ubuntu/music/player.h'
--- include/com/ubuntu/music/player.h	2013-09-03 18:53:18 +0000
+++ include/com/ubuntu/music/player.h	2013-09-09 03:25:52 +0000
@@ -19,7 +19,7 @@
 #define COM_UBUNTU_MUSIC_PLAYER_H_
 
 #include "com/ubuntu/music/connection.h"
-#include "com/ubuntu/music/track_list.h"
+#include "com/ubuntu/music/track.h"
 
 #include <chrono>
 #include <memory>
@@ -31,6 +31,7 @@
 namespace music
 {
 class Service;
+class TrackList;
 
 class Player
 {
@@ -58,6 +59,8 @@
     Player& operator=(const Player&) = delete;
     bool operator==(const Player&) const = delete;
 
+    const std::shared_ptr<TrackList>& track_list() const;
+
     bool can_go_next();
     void next();
     

=== modified file 'src/com/ubuntu/music/player.cpp'
--- src/com/ubuntu/music/player.cpp	2013-09-03 18:53:18 +0000
+++ src/com/ubuntu/music/player.cpp	2013-09-09 03:25:52 +0000
@@ -18,6 +18,7 @@
 
 #include "com/ubuntu/music/player.h"
 #include "com/ubuntu/music/service.h"
+#include "com/ubuntu/music/track_list.h"
 
 #include <limits>
 
@@ -26,9 +27,10 @@
 struct music::Player::Private
 {
     std::shared_ptr<Service> parent;
+    std::shared_ptr<TrackList> track_list;
 };
 
-music::Player::Player(const std::shared_ptr<Service>& parent) : d(new Private{parent})
+music::Player::Player(const std::shared_ptr<Service>& parent) : d(new Private{parent, std::make_shared<TrackList>()})
 {
 }
 
@@ -36,6 +38,11 @@
 {
 }
 
+const std::shared_ptr<music::TrackList>& music::Player::track_list() const
+{
+    return d->track_list;
+}
+
 bool music::Player::can_go_next()
 {
     return true;