Merge lp:~morphis/media-hub/previous-to-same-after-four-secs into lp:media-hub/stable

[Simon Fels]

When calling previous and we already have played more than four seconds of the track we repeat the same track again. Switching to the previous track is possible when being issued before the first four seconds are over.

When calling previous and we already have played more than four seconds of the track we repeat the same track again. Switching to the previous track is possible when being issued before the first four seconds are over.

[Jim Hodapp (jhodapp)]

A few minor suggestions inline.

review: Needs Fixing (code)

=== modified file 'src/core/media/player_implementation.cpp'
--- src/core/media/player_implementation.cpp	2015-10-22 17:31:32 +0000
+++ src/core/media/player_implementation.cpp	2015-10-27 15:54:53 +0000
@@ -375,6 +375,11 @@
     };
     Parent::position().install(position_getter);
 
+    d->engine->position().changed().connect([this](uint64_t position)
+    {
+        d->track_list->on_position_changed(position);
+    });
+
     // Make sure that the Duration property gets updated from the Engine
     // every time the client requests duration
     std::function<uint64_t()> duration_getter = [this]()

=== modified file 'src/core/media/track_list_skeleton.cpp'
--- src/core/media/track_list_skeleton.cpp	2015-10-23 15:30:47 +0000
+++ src/core/media/track_list_skeleton.cpp	2015-10-27 15:54:53 +0000
@@ -56,6 +56,7 @@
           current_track(skeleton.properties.tracks->get().begin()),
           empty_iterator(skeleton.properties.tracks->get().begin()),
           loop_status(media::Player::LoopStatus::none),
+          current_position(0),
           signals
           {
               skeleton.signals.track_added,
@@ -212,6 +213,7 @@
     TrackList::ConstIterator current_track;
     TrackList::ConstIterator empty_iterator;
     media::Player::LoopStatus loop_status;
+    uint64_t current_position;
 
     struct Signals
     {
@@ -423,9 +425,18 @@
     }
 
     bool do_go_to_previous_track = false;
+    bool repeat_current_track = false;
+    const uint64_t max_position = 4 * 1000;
 
+    // If we're playing the current already for some time we will
+    // repeat it from the beginning
+    if (d->current_position > max_position)
+    {
+        std::cout << "Repeating current track..." << std::endl;
+        repeat_current_track = true;
+    }
     // Loop on the current track forever
-    if (d->loop_status == media::Player::LoopStatus::track)
+    else if (d->loop_status == media::Player::LoopStatus::track)
     {
         std::cout << "Looping on the current track..." << std::endl;
         do_go_to_previous_track = true;
@@ -454,7 +465,7 @@
         }
     }
 
-    if (do_go_to_previous_track)
+    if (do_go_to_previous_track && !repeat_current_track)
     {
         on_track_changed()(*(current_iterator()));
         // Don't automatically call stop() and play() in player_implementation.cpp on_go_to_track()
@@ -514,6 +525,12 @@
     return *d->skeleton.properties.tracks;
 }
 
+void media::TrackListSkeleton::on_position_changed(uint64_t position)
+{
+    std::cout << "TrackListSkeleton::on_position_changed: position = " << position << std::endl;
+    d->current_position = position;
+}
+
 void media::TrackListSkeleton::on_loop_status_changed(const media::Player::LoopStatus& loop_status)
 {
     d->loop_status = loop_status;

=== modified file 'src/core/media/track_list_skeleton.h'
--- src/core/media/track_list_skeleton.h	2015-10-21 19:40:20 +0000
+++ src/core/media/track_list_skeleton.h	2015-10-27 15:54:53 +0000
@@ -69,6 +69,8 @@
     void on_loop_status_changed(const core::ubuntu::media::Player::LoopStatus& loop_status);
     core::ubuntu::media::Player::LoopStatus loop_status() const;
 
+    void on_position_changed(uint64_t position);
+
     /** Gets called when the shuffle property on the Player interface is changed
      * by the client */
     void on_shuffle_changed(bool shuffle);