aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2009-07-23 12:26:26 +0200
committerMax Kellermann <max@duempel.org>2009-07-23 12:26:26 +0200
commit0749dbfadfa7145d86bc75a486d91b0ce14169ba (patch)
tree5eefa6f542cd52b48571cdb70187671b623959be
parent54889c72e3469027a852d9e8ff029d659e612094 (diff)
downloadmpd-0749dbfadfa7145d86bc75a486d91b0ce14169ba.tar.gz
mpd-0749dbfadfa7145d86bc75a486d91b0ce14169ba.tar.xz
mpd-0749dbfadfa7145d86bc75a486d91b0ce14169ba.zip
player_thread: moved code to update_song_tag()
-rw-r--r--src/player_thread.c46
1 files changed, 27 insertions, 19 deletions
diff --git a/src/player_thread.c b/src/player_thread.c
index cffc5d82c..950a38e4c 100644
--- a/src/player_thread.c
+++ b/src/player_thread.c
@@ -414,6 +414,31 @@ static void player_process_command(struct player *player)
}
}
+static void
+update_song_tag(struct song *song, const struct tag *new_tag)
+{
+ struct tag *old_tag;
+
+ if (song_is_file(song))
+ /* don't update tags of local files, only remote
+ streams may change tags dynamically */
+ return;
+
+ old_tag = song->tag;
+ song->tag = tag_dup(new_tag);
+
+ if (old_tag != NULL)
+ tag_free(old_tag);
+
+ /* the main thread will update the playlist version when he
+ receives this event */
+ event_pipe_emit(PIPE_EVENT_TAG);
+
+ /* notify all clients that the tag of the current song has
+ changed */
+ idle_add(IDLE_PLAYER);
+}
+
/**
* Plays a #music_chunk object (after applying software volume). If
* it contains a (stream) tag, copy it to the current song, so MPD's
@@ -425,25 +450,8 @@ play_chunk(struct song *song, struct music_chunk *chunk,
{
assert(music_chunk_check_format(chunk, format));
- if (chunk->tag != NULL) {
- if (!song_is_file(song)) {
- /* always update the tag of remote streams */
- struct tag *old_tag = song->tag;
-
- song->tag = tag_dup(chunk->tag);
-
- if (old_tag != NULL)
- tag_free(old_tag);
-
- /* the main thread will update the playlist
- version when he receives this event */
- event_pipe_emit(PIPE_EVENT_TAG);
-
- /* notify all clients that the tag of the
- current song has changed */
- idle_add(IDLE_PLAYER);
- }
- }
+ if (chunk->tag != NULL)
+ update_song_tag(song, chunk->tag);
if (chunk->length == 0) {
music_buffer_return(player_buffer, chunk);