4 files changed, 78 insertions, 43 deletions
diff --git a/src/queue/Playlist.cxx b/src/queue/Playlist.cxx
index b2fd673b4..60588ab90 100644
--- a/src/queue/Playlist.cxx
+++ b/src/queue/Playlist.cxx
@@ -44,45 +44,52 @@ playlist::TagModified(DetachedSong &&song)
 	idle_add(IDLE_PLAYLIST);
 }
 
-/**
- * Queue a song, addressed by its order number.
- */
-static void
-playlist_queue_song_order(playlist &playlist, PlayerControl &pc,
-			  unsigned order)
+inline void
+playlist::QueueSongOrder(PlayerControl &pc, unsigned order)
+
 {
-	assert(playlist.queue.IsValidOrder(order));
+	assert(queue.IsValidOrder(order));
 
-	playlist.queued = order;
+	queued = order;
 
-	const DetachedSong &song = playlist.queue.GetOrder(order);
+	const DetachedSong &song = queue.GetOrder(order);
 
 	FormatDebug(playlist_domain, "queue song %i:\"%s\"",
-		    playlist.queued, song.GetURI());
+		    queued, song.GetURI());
 
 	pc.EnqueueSong(new DetachedSong(song));
 }
 
-/**
- * Called if the player thread has started playing the "queued" song.
- */
-static void
-playlist_song_started(playlist &playlist, PlayerControl &pc)
+void
+playlist::SongStarted()
+{
+	assert(current >= 0);
+
+	/* reset a song's "priority" when playback starts */
+	if (queue.SetPriority(queue.OrderToPosition(current), 0, -1, false))
+		OnModified();
+}
+
+inline void
+playlist::QueuedSongStarted(PlayerControl &pc)
 {
 	assert(pc.next_song == nullptr);
-	assert(playlist.queued >= -1);
+	assert(queued >= -1);
+	assert(current >= 0);
 
 	/* queued song has started: copy queued to current,
 	   and notify the clients */
 
-	int current = playlist.current;
-	playlist.current = playlist.queued;
-	playlist.queued = -1;
+	const int old_current = current;
+	current = queued;
+	queued = -1;
 
-	if(playlist.queue.consume)
-		playlist.DeleteOrder(pc, current);
+	if (queue.consume)
+		DeleteOrder(pc, old_current);
 
 	idle_add(IDLE_PLAYER);
+
+	SongStarted();
 }
 
 const DetachedSong *
@@ -139,7 +146,7 @@ playlist::UpdateQueuedSong(PlayerControl &pc, const DetachedSong *prev)
 
 	if (next_order >= 0) {
 		if (next_song != prev)
-			playlist_queue_song_order(*this, pc, next_order);
+			QueueSongOrder(pc, next_order);
 		else
 			queued = next_order;
 	}
@@ -157,10 +164,9 @@ playlist::PlayOrder(PlayerControl &pc, int order)
 
 	pc.Play(new DetachedSong(song));
 	current = order;
-}
 
-static void
-playlist_resume_playback(playlist &playlist, PlayerControl &pc);
+	SongStarted();
+}
 
 void
 playlist::SyncWithPlayer(PlayerControl &pc)
@@ -180,12 +186,12 @@ playlist::SyncWithPlayer(PlayerControl &pc)
 		   should be restarted with the next song.  That can
 		   happen if the playlist isn't filling the queue fast
 		   enough */
-		playlist_resume_playback(*this, pc);
+		ResumePlayback(pc);
 	else {
 		/* check if the player thread has already started
 		   playing the queued song */
 		if (pc_next_song == nullptr && queued != -1)
-			playlist_song_started(*this, pc);
+			QueuedSongStarted(pc);
 
 		pc.Lock();
 		pc_next_song = pc.next_song;
@@ -198,31 +204,27 @@ playlist::SyncWithPlayer(PlayerControl &pc)
 	}
 }
 
-/**
- * The player has stopped for some reason.  Check the error, and
- * decide whether to re-start playback
- */
-static void
-playlist_resume_playback(playlist &playlist, PlayerControl &pc)
+inline void
+playlist::ResumePlayback(PlayerControl &pc)
 {
-	assert(playlist.playing);
+	assert(playing);
 	assert(pc.GetState() == PlayerState::STOP);
 
 	const auto error = pc.GetErrorType();
 	if (error == PlayerError::NONE)
-		playlist.error_count = 0;
+		error_count = 0;
 	else
-		++playlist.error_count;
+		++error_count;
 
-	if ((playlist.stop_on_error && error != PlayerError::NONE) ||
+	if ((stop_on_error && error != PlayerError::NONE) ||
 	    error == PlayerError::OUTPUT ||
-	    playlist.error_count >= playlist.queue.GetLength())
+	    error_count >= queue.GetLength())
 		/* too many errors, or critical error: stop
 		   playback */
-		playlist.Stop(pc);
+		Stop(pc);
 	else
 		/* continue playback at the next song */
-		playlist.PlayNext(pc);
+		PlayNext(pc);
 }
 
 void
diff --git a/src/queue/Playlist.hxx b/src/queue/Playlist.hxx
index ea19d9bba..ab8fbe2d4 100644
--- a/src/queue/Playlist.hxx
+++ b/src/queue/Playlist.hxx
@@ -135,6 +135,17 @@ protected:
 	void OnModified();
 
 	/**
+	 * Called when playback of a new song starts.  Unlike
+	 * QueuedSongStarted(), this also gets called when the user
+	 * manually switches to another song.  It may be used for
+	 * playlist fixups.
+	 *
+	 * The song being started is specified by the #current
+	 * attribute.
+	 */
+	void SongStarted();
+
+	/**
 	 * Updates the "queued song".  Calculates the next song
 	 * according to the current one (if MPD isn't playing, it
 	 * takes the first song), and queues this song.  Clears the
@@ -145,6 +156,24 @@ protected:
 	 */
 	void UpdateQueuedSong(PlayerControl &pc, const DetachedSong *prev);
 
+	/**
+	 * Queue a song, addressed by its order number.
+	 */
+	void QueueSongOrder(PlayerControl &pc, unsigned order);
+
+	/**
+	 * Called when the player thread has started playing the
+	 * "queued" song, i.e. it has switched from one song to the
+	 * next automatically.
+	 */
+	void QueuedSongStarted(PlayerControl &pc);
+
+	/**
+	 * The player has stopped for some reason.  Check the error,
+	 * and decide whether to re-start playback.
+	 */
+	void ResumePlayback(PlayerControl &pc);
+
 public:
 	void BeginBulk();
 	void CommitBulk(PlayerControl &pc);
diff --git a/src/queue/Queue.cxx b/src/queue/Queue.cxx
index 99b545ab1..039af096e 100644
--- a/src/queue/Queue.cxx
+++ b/src/queue/Queue.cxx
@@ -402,7 +402,8 @@ Queue::CountSamePriority(unsigned start_order, uint8_t priority) const
 }
 
 bool
-Queue::SetPriority(unsigned position, uint8_t priority, int after_order)
+Queue::SetPriority(unsigned position, uint8_t priority, int after_order,
+		   bool reorder)
 {
 	assert(position < length);
 
@@ -414,7 +415,7 @@ Queue::SetPriority(unsigned position, uint8_t priority, int after_order)
 	item->version = version;
 	item->priority = priority;
 
-	if (!random)
+	if (!random || !reorder)
 		/* don't reorder if not in random mode */
 		return true;
 
diff --git a/src/queue/Queue.hxx b/src/queue/Queue.hxx
index 016619e65..32acac689 100644
--- a/src/queue/Queue.hxx
+++ b/src/queue/Queue.hxx
@@ -340,10 +340,13 @@ struct Queue {
 	/**
 	 * Shuffles a (position) range in the queue.  The songs are physically
 	 * shuffled, not by using the "order" mapping.
+	 *
+	 * @param reorder false to suppress updating the order list
 	 */
 	void ShuffleRange(unsigned start, unsigned end);
 
-	bool SetPriority(unsigned position, uint8_t priority, int after_order);
+	bool SetPriority(unsigned position, uint8_t priority, int after_order,
+			 bool reorder=true);
 
 	bool SetPriorityRange(unsigned start_position, unsigned end_position,
 			      uint8_t priority, int after_order);