fixed double-play in shuffle mode;

fixed lastfm submission/nowplaying

1 files changed, 8 insertions, 4 deletions

diff --git a/streamer.c b/streamer.c
index 67a79e05..fe7c0ed4 100644
--- a/streamer.c
+++ b/streamer.c
@@ -436,7 +436,11 @@ streamer_set_current (playItem_t *it) {
         playing_track = it;
         if (playing_track) {
             pl_item_ref (playing_track);
+            playing_track->played = 1;
+            trace ("sending songstarted to plugins [2] current playtrack: %s\n", playing_track->fname);
+            plug_trigger_event (DB_EV_SONGSTARTED, 0);
         }
+        bytes_until_next_song = -1;
     }
 
 // code below breaks seekbar drawing during transition between tracks
@@ -532,9 +536,9 @@ streamer_set_current (playItem_t *it) {
         }
         return -1;
     }
-    if (bytes_until_next_song == -1) {
-        bytes_until_next_song = 0;
-    }
+//    if (bytes_until_next_song == -1) {
+//        bytes_until_next_song = 0;
+//    }
 success:
     messagepump_push (M_TRACKCHANGED, 0, to, 0);
     return 0;
@@ -718,7 +722,7 @@ streamer_thread (void *ctx) {
             playlist_track = playing_track;
             // that is needed for playlist drawing
             // plugin will get pointer to new str_playing_song
-            trace ("sending songstarted to plugins\ncurrent playtrack: %s\n", playing_track->fname);
+            trace ("sending songstarted to plugins [1] current playtrack: %s\n", playing_track->fname);
             plug_trigger_event (DB_EV_SONGSTARTED, 0);
             playpos = 0;