DecoderThread: set Decoder::song_tag only for local files

If the song tag comes from a stream, and MPD playback restarts, MPD would believe the tag should override the newly received tag. This makes the previous tag appear stuck. This change passes the song tag only if it's authoritative - i.e. if it's a song file.

DecoderThread: set Decoder::song_tag only for local files
9acefcb2 · Max Kellermann · e4d0293a · 9acefcb2 · 9acefcb2
Commit 9acefcb2 authored Jun 21, 2015 by Max Kellermann
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

NEWS NEWS +1 -0

DecoderThread.cxx src/decoder/DecoderThread.cxx +5 -1

No files found.
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@ ver 0.19.10 (not yet released)
  - smbclient: fix DFF playback
 * decoder
  - ffmpeg: improve seeking accuracy
+  - fix stuck stream tags
 * encoder
  - opus: fix bogus granulepos
 * output

--- a/src/decoder/DecoderThread.cxx
+++ b/src/decoder/DecoderThread.cxx
@@ -380,7 +380,11 @@ decoder_run_song(DecoderControl &dc,
 		 const DetachedSong &song, const char *uri, Path path_fs)
 {
 	Decoder decoder(dc, dc.start_time.IsPositive(),
-			new Tag(song.GetTag()));
+			/* pass the song tag only if it's
+			   authoritative, i.e. if it's a local file -
+			   tags on "stream" songs are just remembered
+			   from the last time we played it*/
+			song.IsFile() ? new Tag(song.GetTag()) : nullptr);
 	int ret;

 	dc.state = DecoderState::START;