Merge lp:~phablet-team/media-hub/bg-playlist-fixes into lp:media-hub/stable

[Alfonso Sanchez-Beato]

Make sure our iterator for the current track points to the right place when (un)shuffling (LP #1510219). Fix crash when client tries to set the player for a non-existing key. Do not add empty URIs to the list (LP: #1511029).

Make sure our iterator for the current track points to the right place when (un)shuffling (LP #1510219). Fix crash when client tries to set the player for a non-existing key. Do not add empty URIs to the list (LP: #1511029).

[lp:~phablet-team/media-hub/bg-playlist-fixes]

165. By Alfonso Sanchez-Beato on 2015-11-02

Do not add empty URIs to the list (LP: #1511029)

166. By Alfonso Sanchez-Beato on 2015-11-02

Send TrackChanged signals only when the TrackAdded signal for the
corresponding track has already been sent.

[Jim Hodapp (jhodapp)]

A few comments inline.

review: Needs Fixing (code)

[lp:~phablet-team/media-hub/bg-playlist-fixes]

167. By Alfonso Sanchez-Beato on 2015-11-03

Address review comments

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

Branch refreshed after addressing comments.

[Jim Hodapp (jhodapp)]

Looks good, one minor change still needed.

review: Needs Fixing

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

Branch refreshed after addressing comment.

[lp:~phablet-team/media-hub/bg-playlist-fixes]

168. By Alfonso Sanchez-Beato on 2015-11-04

Address review comment

[Jim Hodapp (jhodapp)]

LGTM

review: Approve (code)

[lp:~phablet-team/media-hub/bg-playlist-fixes]

169. By Alfonso Sanchez-Beato on 2015-11-04

Repeat current track when already played more than five seconds

170. By Alfonso Sanchez-Beato on 2015-11-04

Fix for the repeat track feature

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

lp:~morphis/media-hub/previous-to-same-after-four-secs merged + fix for it

[lp:~phablet-team/media-hub/bg-playlist-fixes]

171. By Alfonso Sanchez-Beato on 2015-11-06

Add TrackListReset signal, which is emitted when the Reset DBus method is
called.

172. By Alfonso Sanchez-Beato on 2015-11-11

Update properly playlist iterator when adding or removing tracks
(LP: #1511073).

173. By Alfonso Sanchez-Beato on 2015-11-11

Use get/set_current track when shuffling

174. By Alfonso Sanchez-Beato on 2015-11-12

Force index update when changing the track list

[Jim Hodapp (jhodapp)]

A few comments below about the latest changes.

review: Needs Fixing

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

Some comments answered. I will update the branch later as I will modify qtubuntu-media too.

[lp:~phablet-team/media-hub/bg-playlist-fixes]

175. By Alfonso Sanchez-Beato on 2015-11-12

Address review comments

[Jim Hodapp (jhodapp)]

Several comments inline below.

review: Needs Fixing (code)

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

See comments below. I will address the remaining issues asap.

[lp:~phablet-team/media-hub/bg-playlist-fixes]

176. By Alfonso Sanchez-Beato on 2015-11-13

Address review comments

[Jim Hodapp (jhodapp)]

A couple of comments below.

[Jim Hodapp (jhodapp)]

LGTM

review: Approve (code)

=== modified file 'include/core/media/track_list.h'
--- include/core/media/track_list.h	2015-10-23 14:39:34 +0000
+++ include/core/media/track_list.h	2015-11-13 15:27:09 +0000
@@ -54,6 +54,11 @@
         {
             InsufficientPermissionsToAddTrack();
         };
+
+        struct TrackNotFound : public std::runtime_error
+        {
+            TrackNotFound();
+        };
     };
 
     static const Track::Id& after_empty_track();
@@ -123,6 +128,9 @@
     /** Indicates that a track has been removed from the track list. */
     virtual const core::Signal<Track::Id>& on_track_removed() const = 0;
 
+    /** Indicates that the track list has been reset and there are no tracks now */
+    virtual const core::Signal<void>& on_track_list_reset() const = 0;
+
     /** Indicates that the track list advanced from one track to another. */
     virtual const core::Signal<Track::Id>& on_track_changed() const = 0;
 
 
=== modified file 'src/core/media/mpris/service.h'
--- src/core/media/mpris/service.h	2015-09-08 20:03:56 +0000
+++ src/core/media/mpris/service.h	2015-11-13 15:27:09 +0000
@@ -107,6 +107,18 @@
                 return s;
             }
         };
+
+        struct PlayerKeyNotFound
+        {
+            static const std::string& name()
+            {
+                static const std::string s
+                {
+                    "core.ubuntu.media.Service.Error.PlayerKeyNotFound"
+                };
+                return s;
+            }
+        };
     };
 
     DBUS_CPP_METHOD_WITH_TIMEOUT_DEF(CreateSession, Service, 1000)
 
=== modified file 'src/core/media/mpris/track_list.h'
--- src/core/media/mpris/track_list.h	2015-10-23 14:39:34 +0000
+++ src/core/media/mpris/track_list.h	2015-11-13 15:27:09 +0000
@@ -57,6 +57,14 @@
                 "mpris.TrackList.Error.InsufficientPermissionsToAddTrack"
             };
         };
+
+        struct TrackNotFound
+        {
+            static constexpr const char* name
+            {
+                "mpris.TrackList.Error.TrackNotFound"
+            };
+        };
     };
 
     DBUS_CPP_METHOD_DEF(GetTracksMetadata, TrackList)
@@ -108,6 +116,13 @@
 
         DBUS_CPP_SIGNAL_DEF
         (
+            TrackListReset,
+            TrackList,
+            void
+        )
+
+        DBUS_CPP_SIGNAL_DEF
+        (
             TrackMetadataChanged,
             TrackList,
             BOOST_IDENTITY_TYPE((std::tuple<std::map<std::string, dbus::types::Variant>, dbus::types::ObjectPath>))
@@ -156,6 +171,7 @@
                   configuration.object->template get_signal<Signals::TracksAdded>(),
                   configuration.object->template get_signal<Signals::TrackRemoved>(),
                   configuration.object->template get_signal<Signals::TrackChanged>(),
+                  configuration.object->template get_signal<Signals::TrackListReset>(),
                   configuration.object->template get_signal<Signals::TrackMetadataChanged>(),
                   configuration.object->template get_signal<core::dbus::interfaces::Properties::Signals::PropertiesChanged>()
               }
@@ -201,6 +217,7 @@
             core::dbus::Signal<Signals::TracksAdded, Signals::TracksAdded::ArgumentType>::Ptr tracks_added;
             core::dbus::Signal<Signals::TrackRemoved, Signals::TrackRemoved::ArgumentType>::Ptr track_removed;
             core::dbus::Signal<Signals::TrackChanged, Signals::TrackChanged::ArgumentType>::Ptr track_changed;
+            core::dbus::Signal<Signals::TrackListReset, Signals::TrackListReset::ArgumentType>::Ptr track_list_reset;
             core::dbus::Signal<Signals::TrackMetadataChanged, Signals::TrackMetadataChanged::ArgumentType>::Ptr track_metadata_changed;
 
             dbus::Signal <core::dbus::interfaces::Properties::Signals::PropertiesChanged,
 
=== modified file 'src/core/media/player_implementation.cpp'
--- src/core/media/player_implementation.cpp	2015-11-13 15:27:09 +0000
+++ src/core/media/player_implementation.cpp	2015-11-13 15:27:09 +0000
@@ -569,6 +569,11 @@
         d->update_mpris_properties();
     });
 
+    d->track_list->on_track_list_reset().connect([this](void)
+    {
+        d->update_mpris_properties();
+    });
+
     d->track_list->on_track_changed().connect([this](const media::Track::Id&)
     {
         d->update_mpris_properties();
@@ -681,6 +686,13 @@
 bool media::PlayerImplementation<Parent>::open_uri(const Track::UriType& uri)
 {
     d->track_list->reset();
+
+    // If empty uri, give the same meaning as QMediaPlayer::setMedia("")
+    if (uri.empty()) {
+        cout << __PRETTY_FUNCTION__ << ": resetting current media" << endl;
+        return true;
+    }
+
     const bool ret = d->engine->open_resource_for_uri(uri, false);
     // Don't set new track as the current track to play since we're calling open_resource_for_uri above
     static const bool make_current = false;
 
=== modified file 'src/core/media/service_skeleton.cpp'
--- src/core/media/service_skeleton.cpp	2015-10-14 20:54:19 +0000
+++ src/core/media/service_skeleton.cpp	2015-11-13 15:27:09 +0000
@@ -46,6 +46,8 @@
 namespace dbus = core::dbus;
 namespace media = core::ubuntu::media;
 
+using namespace std;
+
 namespace
 {
 core::Signal<void> the_empty_signal;
@@ -132,7 +134,9 @@
             impl->access_service()->add_object_for_path(op)
         };
 
-        std::cout << "Session created by request of: " << msg->sender() << ", uuid: " << uuid << ", path:" << op << std::endl;
+        cout << "Session created by request of: " << msg->sender()
+             << ", key: " << key << ", uuid: " << uuid
+             << ", path:" << op << std::endl;
 
         try
         {
@@ -205,9 +209,11 @@
             std::string uuid;
             msg->reader() >> uuid;
 
-            if (uuid_player_map.count(uuid) != 0) {
+            if (uuid_player_map.count(uuid) != 0)
+            {
                 auto key = uuid_player_map.at(uuid);
-                if (not configuration.player_store->has_player_for_key(key)) {
+                if (not configuration.player_store->has_player_for_key(key))
+                {
                     auto reply = dbus::Message::make_error(
                                 msg,
                                 mpris::Service::Errors::ReattachingSession::name(),
@@ -442,9 +448,19 @@
     {
         Player::PlayerKey key;
         msg->reader() >> key;
-        impl->set_current_player(key);
-
-        auto reply = dbus::Message::make_method_return(msg);
+
+        core::dbus::Message::Ptr reply;
+        if (not configuration.player_store->has_player_for_key(key)) {
+            cerr <<  __PRETTY_FUNCTION__ << " player key not found - " << key << endl;
+            reply = dbus::Message::make_error(
+                            msg,
+                            mpris::Service::Errors::PlayerKeyNotFound::name(),
+                            "Player key not found");
+        } else {
+            impl->set_current_player(key);
+            reply = dbus::Message::make_method_return(msg);
+        }
+
         impl->access_bus()->send(reply);
     }
 
 
=== modified file 'src/core/media/track_list.cpp'
--- src/core/media/track_list.cpp	2015-10-23 14:39:34 +0000
+++ src/core/media/track_list.cpp	2015-11-13 15:27:09 +0000
@@ -25,6 +25,11 @@
 {
 }
 
+media::TrackList::Errors::TrackNotFound::TrackNotFound()
+    : std::runtime_error{"Track not found in TrackList"}
+{
+}
+
 const media::Track::Id& media::TrackList::after_empty_track()
 {
     static const media::Track::Id id{"/org/mpris/MediaPlayer2/TrackList/NoTrack"};
 
=== modified file 'src/core/media/track_list_implementation.cpp'
--- src/core/media/track_list_implementation.cpp	2015-10-23 14:39:34 +0000
+++ src/core/media/track_list_implementation.cpp	2015-11-13 15:27:09 +0000
@@ -118,6 +118,8 @@
     std::cout << "Adding Track::Id: " << id << std::endl;
     std::cout << "\tURI: " << uri << std::endl;
 
+    const auto current = get_current_track();
+
     auto result = tracks().update([this, id, position, make_current](TrackList::Container& container)
     {
         auto it = std::find(container.begin(), container.end(), position);
@@ -133,20 +135,24 @@
 
         if (make_current)
         {
+            set_current_track(id);
             // Don't automatically call stop() and play() in player_implementation.cpp on_go_to_track()
             // since this breaks video playback when using open_uri() (stop() and play() are unwanted in
             // this scenario since the qtubuntu-media will handle this automatically)
             const bool toggle_player_state = false;
             go_to(id, toggle_player_state);
+        } else {
+            set_current_track(current);
         }
 
-        // Signal to the client that the current track has changed for the first track added to the TrackList
-        if (tracks().get().size() == 1)
-            on_track_changed()(id);
-
         std::cout << "Signaling that we just added track id: " << id << std::endl;
         // Signal to the client that a track was added to the TrackList
         on_track_added()(id);
+
+        // Signal to the client that the current track has changed for the first
+        // track added to the TrackList
+        if (tracks().get().size() == 1)
+            on_track_changed()(id);
     }
 }
 
@@ -154,6 +160,9 @@
 {
     std::cout << __PRETTY_FUNCTION__ << std::endl;
 
+    const auto current = get_current_track();
+
+    Track::Id current_id;
     ContainerURI tmp;
     for (const auto uri : uris)
     {
@@ -185,12 +194,17 @@
 
             // Signal to the client that the current track has changed for the first track added to the TrackList
             if (tracks().get().size() == 1)
-                on_track_changed()(id);
+                current_id = id;
         }
     }
 
+    set_current_track(current);
+
     std::cout << "Signaling that we just added " << tmp.size() << " tracks to the TrackList" << std::endl;
     on_tracks_added()(tmp);
+
+    if (!current_id.empty())
+        on_track_changed()(current_id);
 }
 
 void media::TrackListImplementation::remove_track(const media::Track::Id& id)
@@ -209,7 +223,6 @@
 
         on_track_removed()(id);
     }
-
 }
 
 void media::TrackListImplementation::go_to(const media::Track::Id& track, bool toggle_player_state)
@@ -266,26 +279,20 @@
 
 void media::TrackListImplementation::reset()
 {
+    std::cout << __PRETTY_FUNCTION__ << std::endl;
+
     // Make sure playback stops
     on_end_of_tracklist()();
     // And make sure there is no "current" track
     media::TrackListSkeleton::reset();
 
-    auto result = tracks().update([this](TrackList::Container& container)
+    tracks().update([this](TrackList::Container& container)
     {
-        TrackList::Container ids = container;
-
-        for (auto it = container.begin(); it != container.end(); ) {
-            auto id = *it;
-            it = container.erase(it);
-            on_track_removed()(id);
-        }
-
-        container.resize(0);
+        container.clear();
+        on_track_list_reset()();
+
         d->track_counter = 0;
 
         return true;
     });
-
-    (void) result;
 }
 
=== modified file 'src/core/media/track_list_skeleton.cpp'
--- src/core/media/track_list_skeleton.cpp	2015-11-13 15:27:09 +0000
+++ src/core/media/track_list_skeleton.cpp	2015-11-13 15:27:09 +0000
@@ -38,10 +38,14 @@
 
 #include <iostream>
 #include <limits>
+#include <sstream>
+#include <cstdint>
 
 namespace dbus = core::dbus;
 namespace media = core::ubuntu::media;
 
+using namespace std;
+
 struct media::TrackListSkeleton::Private
 {
     Private(media::TrackListSkeleton* impl, const dbus::Bus::Ptr& bus, const dbus::Object::Ptr& object,
@@ -63,6 +67,7 @@
               skeleton.signals.tracks_added,
               skeleton.signals.track_removed,
               skeleton.signals.track_changed,
+              skeleton.signals.track_list_reset,
               skeleton.signals.tracklist_replaced
           }
     {
@@ -176,8 +181,53 @@
         media::Track::Id track;
         msg->reader() >> track;
 
+        auto id_it = find(impl->tracks().get().begin(), impl->tracks().get().end(), track);
+        if (id_it == impl->tracks().get().end()) {
+            ostringstream err_str;
+            err_str << "Track " << track << " not found in track list";
+            cout << __PRETTY_FUNCTION__ << " WARNING " << err_str.str() << endl;
+            auto reply = dbus::Message::make_error(
+                            msg,
+                            mpris::TrackList::Error::TrackNotFound::name,
+                            err_str.str());
+            bus->send(reply);
+            return;
+        }
+
+        media::Track::Id next;
+        bool deleting_current = false;
+
+        if (id_it == impl->current_iterator()) {
+            cout << "Removing current track" << endl;
+            deleting_current = true;
+
+            if (current_track != empty_iterator) {
+                ++current_track;
+
+                if (current_track == impl->tracks().get().end()
+                            && loop_status == media::Player::LoopStatus::playlist)
+                        current_track = impl->tracks().get().begin();
+
+                if (current_track == impl->tracks().get().end())
+                    current_track = empty_iterator;
+                else
+                    next = *current_track;
+            }
+        } else if (current_track != empty_iterator) {
+            next = *current_track;
+        }
+
         impl->remove_track(track);
 
+        if (not next.empty()) {
+            current_track = find(impl->tracks().get().begin(), impl->tracks().get().end(), next);
+
+            if (deleting_current) {
+                const bool toggle_player_state = true;
+                impl->go_to(next, toggle_player_state);
+            }
+        }
+
         auto reply = dbus::Message::make_method_return(msg);
         bus->send(reply);
     }
@@ -221,12 +271,17 @@
         typedef core::dbus::Signal<mpris::TrackList::Signals::TracksAdded, mpris::TrackList::Signals::TracksAdded::ArgumentType> DBusTracksAddedSignal;
         typedef core::dbus::Signal<mpris::TrackList::Signals::TrackRemoved, mpris::TrackList::Signals::TrackRemoved::ArgumentType> DBusTrackRemovedSignal;
         typedef core::dbus::Signal<mpris::TrackList::Signals::TrackChanged, mpris::TrackList::Signals::TrackChanged::ArgumentType> DBusTrackChangedSignal;
+        typedef core::dbus::Signal<
+            mpris::TrackList::Signals::TrackListReset,
+            mpris::TrackList::Signals::TrackListReset::ArgumentType>
+                DBusTrackListResetSignal;
         typedef core::dbus::Signal<mpris::TrackList::Signals::TrackListReplaced, mpris::TrackList::Signals::TrackListReplaced::ArgumentType> DBusTrackListReplacedSignal;
 
         Signals(const std::shared_ptr<DBusTrackAddedSignal>& remote_track_added,
                 const std::shared_ptr<DBusTracksAddedSignal>& remote_tracks_added,
                 const std::shared_ptr<DBusTrackRemovedSignal>& remote_track_removed,
                 const std::shared_ptr<DBusTrackChangedSignal>& remote_track_changed,
+                const std::shared_ptr<DBusTrackListResetSignal>& remote_track_list_reset,
                 const std::shared_ptr<DBusTrackListReplacedSignal>& remote_track_list_replaced)
         {
             // Connect all of the MPRIS interface signals to be emitted over dbus
@@ -245,6 +300,11 @@
                 remote_track_removed->emit(id);
             });
 
+            on_track_list_reset.connect([remote_track_list_reset]()
+            {
+                remote_track_list_reset->emit();
+            });
+
             on_track_changed.connect([remote_track_changed](const media::Track::Id &id)
             {
                 remote_track_changed->emit(id);
@@ -259,6 +319,7 @@
         core::Signal<Track::Id> on_track_added;
         core::Signal<TrackList::ContainerURI> on_tracks_added;
         core::Signal<Track::Id> on_track_removed;
+        core::Signal<void> on_track_list_reset;
         core::Signal<Track::Id> on_track_changed;
         core::Signal<TrackList::ContainerTrackIdTuple> on_track_list_replaced;
         core::Signal<std::pair<Track::Id, bool>> on_go_to_track;
@@ -401,6 +462,7 @@
 
     if (do_go_to_next_track)
     {
+        cout << "next track id is " << *(current_iterator()) << endl;
         on_track_changed()(*(current_iterator()));
         // Don't automatically call stop() and play() in player_implementation.cpp on_go_to_track()
         // since this breaks video playback when using open_uri() (stop() and play() are unwanted in
@@ -425,15 +487,15 @@
     }
 
     bool do_go_to_previous_track = false;
-    bool repeat_current_track = false;
-    const uint64_t max_position = 4 * 1000;
+    // Position is measured in nanoseconds
+    const uint64_t max_position = 5 * UINT64_C(1000000000);
 
-    // If we're playing the current already for some time we will
+    // If we're playing the current track for > max_position time then
     // repeat it from the beginning
     if (d->current_position > max_position)
     {
         std::cout << "Repeating current track..." << std::endl;
-        repeat_current_track = true;
+        do_go_to_previous_track = true;
     }
     // Loop on the current track forever
     else if (d->loop_status == media::Player::LoopStatus::track)
@@ -465,7 +527,7 @@
         }
     }
 
-    if (do_go_to_previous_track && !repeat_current_track)
+    if (do_go_to_previous_track)
     {
         on_track_changed()(*(current_iterator()));
         // Don't automatically call stop() and play() in player_implementation.cpp on_go_to_track()
@@ -510,6 +572,21 @@
         d->current_track = d->empty_iterator;
 }
 
+media::Track::Id media::TrackListSkeleton::get_current_track(void)
+{
+    if (d->current_track == d->empty_iterator || tracks().get().empty())
+        return media::Track::Id{};
+
+    return *(current_iterator());
+}
+
+void media::TrackListSkeleton::set_current_track(const media::Track::Id& id)
+{
+    const auto id_it = find(tracks().get().begin(), tracks().get().end(), id);
+    if (id_it != tracks().get().end())
+        d->current_track = id_it;
+}
+
 const core::Property<bool>& media::TrackListSkeleton::can_edit_tracks() const
 {
     return *d->skeleton.properties.can_edit_tracks;
@@ -527,7 +604,6 @@
 
 void media::TrackListSkeleton::on_position_changed(uint64_t position)
 {
-    std::cout << "TrackListSkeleton::on_position_changed: position = " << position << std::endl;
     d->current_position = position;
 }
 
@@ -543,21 +619,21 @@
 
 void media::TrackListSkeleton::on_shuffle_changed(bool shuffle)
 {
+    if (tracks().get().empty())
+        return;
+
+    const auto current_id = get_current_track();
+
+    cout << __PRETTY_FUNCTION__ << " " << shuffle
+         << " current track: " << current_id << endl;
+
     if (shuffle)
         shuffle_tracks();
     else
-    {
-        // Save the current Track::Id of what's currently playing to restore after unshuffle
-        const media::Track::Id current_id = *(current_iterator());
-
         unshuffle_tracks();
 
-        // Since we use assign() in unshuffle_tracks, which invalidates existing iterators, we need
-        // to make sure that current is pointing to the right place
-        auto it = std::find(tracks().get().begin(), tracks().get().end(), current_id);
-        if (it != tracks().get().end())
-            d->current_track = it;
-    }
+    // Shuffling and unshuffling invalidates iterators, so we re-create current_track
+    set_current_track(current_id);
 }
 
 const core::Property<media::TrackList::Container>& media::TrackListSkeleton::tracks() const
@@ -587,6 +663,11 @@
     return d->signals.on_track_removed;
 }
 
+const core::Signal<void>& media::TrackListSkeleton::on_track_list_reset() const
+{
+    return d->signals.on_track_list_reset;
+}
+
 const core::Signal<media::Track::Id>& media::TrackListSkeleton::on_track_changed() const
 {
     return d->signals.on_track_changed;
@@ -622,6 +703,11 @@
     return d->signals.on_track_removed;
 }
 
+core::Signal<void>& media::TrackListSkeleton::on_track_list_reset()
+{
+    return d->signals.on_track_list_reset;
+}
+
 core::Signal<media::Track::Id>& media::TrackListSkeleton::on_track_changed()
 {
     return d->signals.on_track_changed;
 
=== modified file 'src/core/media/track_list_skeleton.h'
--- src/core/media/track_list_skeleton.h	2015-11-13 15:27:09 +0000
+++ src/core/media/track_list_skeleton.h	2015-11-13 15:27:09 +0000
@@ -57,6 +57,7 @@
     const core::Signal<ContainerURI>& on_tracks_added() const;
     core::Signal<ContainerURI>& on_tracks_added();
     const core::Signal<Track::Id>& on_track_removed() const;
+    const core::Signal<void>& on_track_list_reset() const;
     const core::Signal<Track::Id>& on_track_changed() const;
     core::Signal<Track::Id>& on_track_changed();
     const core::Signal<std::pair<Track::Id, bool>>& on_go_to_track() const;
@@ -64,6 +65,7 @@
     const core::Signal<void>& on_end_of_tracklist() const;
     core::Signal<void>& on_end_of_tracklist();
     core::Signal<Track::Id>& on_track_removed();
+    core::Signal<void>& on_track_list_reset();
 
     core::Property<Container>& tracks();
     void on_loop_status_changed(const core::ubuntu::media::Player::LoopStatus& loop_status);
@@ -80,6 +82,8 @@
     inline bool is_last_track(const ConstIterator &it);
     inline const TrackList::ConstIterator& current_iterator();
     void reset_current_iterator_if_needed();
+    media::Track::Id get_current_track(void);
+    void set_current_track(const media::Track::Id& id);
 
     core::Property<bool>& can_edit_tracks();
 
 
=== modified file 'src/core/media/track_list_stub.cpp'
--- src/core/media/track_list_stub.cpp	2015-10-23 14:39:34 +0000
+++ src/core/media/track_list_stub.cpp	2015-11-13 15:27:09 +0000
@@ -54,6 +54,7 @@
               object->get_signal<mpris::TrackList::Signals::TrackAdded>(),
               object->get_signal<mpris::TrackList::Signals::TracksAdded>(),
               object->get_signal<mpris::TrackList::Signals::TrackRemoved>(),
+              object->get_signal<mpris::TrackList::Signals::TrackListReset>(),
               object->get_signal<mpris::TrackList::Signals::TrackListReplaced>(),
               object->get_signal<mpris::TrackList::Signals::TrackChanged>()
           }
@@ -73,17 +74,23 @@
         typedef core::dbus::Signal<mpris::TrackList::Signals::TrackAdded, mpris::TrackList::Signals::TrackAdded::ArgumentType> DBusTrackAddedSignal;
         typedef core::dbus::Signal<mpris::TrackList::Signals::TracksAdded, mpris::TrackList::Signals::TracksAdded::ArgumentType> DBusTracksAddedSignal;
         typedef core::dbus::Signal<mpris::TrackList::Signals::TrackRemoved, mpris::TrackList::Signals::TrackRemoved::ArgumentType> DBusTrackRemovedSignal;
+        typedef core::dbus::Signal<
+            mpris::TrackList::Signals::TrackListReset,
+            mpris::TrackList::Signals::TrackListReset::ArgumentType>
+                DBusTrackListResetSignal;
         typedef core::dbus::Signal<mpris::TrackList::Signals::TrackListReplaced, mpris::TrackList::Signals::TrackListReplaced::ArgumentType> DBusTrackListReplacedSignal;
         typedef core::dbus::Signal<mpris::TrackList::Signals::TrackChanged, mpris::TrackList::Signals::TrackChanged::ArgumentType> DBusTrackChangedSignal;
 
         Signals(const std::shared_ptr<DBusTrackAddedSignal>& track_added,
                 const std::shared_ptr<DBusTracksAddedSignal>& tracks_added,
                 const std::shared_ptr<DBusTrackRemovedSignal>& track_removed,
+                const std::shared_ptr<DBusTrackListResetSignal>& track_list_reset,
                 const std::shared_ptr<DBusTrackListReplacedSignal>& track_list_replaced,
                 const std::shared_ptr<DBusTrackChangedSignal>& track_changed)
             : on_track_added(),
               on_tracks_added(),
               on_track_removed(),
+              on_track_list_reset(),
               on_track_list_replaced(),
               on_track_changed(),
               dbus
@@ -91,6 +98,7 @@
                   track_added,
                   tracks_added,
                   track_removed,
+                  track_list_reset,
                   track_list_replaced,
                   track_changed,
               }
@@ -113,9 +121,15 @@
                 on_track_removed(id);
             });
 
+            dbus.on_track_list_reset->connect([this](void)
+            {
+                std::cout << "OnTrackListReset signal arrived via the bus." << std::endl;
+                on_track_list_reset();
+            });
+
             dbus.on_track_list_replaced->connect([this](const media::TrackList::ContainerTrackIdTuple& list)
             {
-                std::cout << "OnTrackListRemoved signal arrived via the bus." << std::endl;
+                std::cout << "OnTrackListReplaced signal arrived via the bus." << std::endl;
                 on_track_list_replaced(list);
             });
 
@@ -129,6 +143,7 @@
         core::Signal<Track::Id> on_track_added;
         core::Signal<media::TrackList::ContainerURI> on_tracks_added;
         core::Signal<Track::Id> on_track_removed;
+        core::Signal<void> on_track_list_reset;
         core::Signal<media::TrackList::ContainerTrackIdTuple> on_track_list_replaced;
         core::Signal<Track::Id> on_track_changed;
         core::Signal<std::pair<Track::Id, bool>> on_go_to_track;
@@ -139,6 +154,7 @@
             std::shared_ptr<DBusTrackAddedSignal> on_track_added;
             std::shared_ptr<DBusTracksAddedSignal> on_tracks_added;
             std::shared_ptr<DBusTrackRemovedSignal> on_track_removed;
+            std::shared_ptr<DBusTrackListResetSignal> on_track_list_reset;
             std::shared_ptr<DBusTrackListReplacedSignal> on_track_list_replaced;
             std::shared_ptr<DBusTrackChangedSignal> on_track_changed;
         } dbus;
@@ -237,7 +253,13 @@
                 track);
 
     if (op.is_error())
-        throw std::runtime_error("Problem removing track: " + op.error());
+    {
+        if (op.error().name() ==
+                mpris::TrackList::Error::TrackNotFound::name)
+            throw media::TrackList::Errors::TrackNotFound{};
+        else
+            throw std::runtime_error{"Problem removing track: " + op.error().print()};
+    }
 }
 
 void media::TrackListStub::go_to(const media::Track::Id& track, bool toggle_player_state)
@@ -300,6 +322,11 @@
     return d->signals.on_track_removed;
 }
 
+const core::Signal<void>& media::TrackListStub::on_track_list_reset() const
+{
+    return d->signals.on_track_list_reset;
+}
+
 const core::Signal<media::Track::Id>& media::TrackListStub::on_track_changed() const
 {
     return d->signals.on_track_changed;
 
=== modified file 'src/core/media/track_list_stub.h'
--- src/core/media/track_list_stub.h	2015-10-21 19:40:20 +0000
+++ src/core/media/track_list_stub.h	2015-11-13 15:27:09 +0000
@@ -65,6 +65,7 @@
     const core::Signal<Track::Id>& on_track_added() const;
     const core::Signal<ContainerURI>& on_tracks_added() const;
     const core::Signal<Track::Id>& on_track_removed() const;
+    const core::Signal<void>& on_track_list_reset() const;
     const core::Signal<Track::Id>& on_track_changed() const;
     const core::Signal<std::pair<Track::Id, bool>>& on_go_to_track() const;
     const core::Signal<void>& on_end_of_tracklist() const;