From bfbf422031736233ed58d90d5b6e3a17b824e4a7 Mon Sep 17 00:00:00 2001 From: Timo Hirvonen Date: Sat, 17 May 2008 14:30:53 +0300 Subject: [PATCH] Simplify finding artist name which is displayed in the tree window --- tree.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/tree.c b/tree.c index ea5a79c..19ede2d 100644 --- a/tree.c +++ b/tree.c @@ -536,26 +536,20 @@ static void update_artist_name(struct artist *artist, char *new_name) void tree_add_track(struct tree_track *track) { const struct track_info *ti = tree_track_info(track); - const char *album_name, *artist_name, *albumartist, - *artist_sort, *albumartist_sort, *compilation, - *artist_name_fancy = NULL; + const char *album_name, *artist_name, *compilation, *artist_name_fancy; struct artist *artist; struct album *album; int date; album_name = keyvals_get_val(ti->comments, "album"); artist_name = keyvals_get_val(ti->comments, "artist"); - albumartist = keyvals_get_val(ti->comments, "albumartist"); - artist_sort = keyvals_get_val(ti->comments, "artistsort"); - albumartist_sort = keyvals_get_val(ti->comments, "albumartistsort"); compilation = keyvals_get_val(ti->comments, "compilation"); - if (albumartist_sort) - artist_name_fancy = albumartist_sort; - else if (albumartist) - artist_name_fancy = albumartist; - else if (artist_sort) - artist_name_fancy = artist_sort; + artist_name_fancy = keyvals_get_val(ti->comments, "albumartistsort"); + if (!artist_name_fancy) + artist_name_fancy = keyvals_get_val(ti->comments, "albumartist"); + if (!artist_name_fancy) + artist_name_fancy = keyvals_get_val(ti->comments, "artistsort"); if (is_url(ti->filename)) { artist_name = ""; -- 2.11.4.GIT