From 8ec84637d2de81853ed172e4455a630091f68766 Mon Sep 17 00:00:00 2001
From: Andrzej Rybczak <electricityispower@gmail.com>
Date: Tue, 24 Aug 2010 22:25:47 +0200
Subject: [PATCH] media library: search constraints: rename Artist to
 PrimaryTag

it makes much more sense since 'Artist' can be also date, composer etc.
---
 src/media_library.cpp | 12 ++++++------
 src/media_library.h   |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/media_library.cpp b/src/media_library.cpp
index edfc3afa..c7a7136d 100644
--- a/src/media_library.cpp
+++ b/src/media_library.cpp
@@ -311,7 +311,7 @@ void MediaLibrary::Update()
 		MPD::SongList list;
 		
 		Mpd.StartSearch(1);
-		Mpd.AddSearch(Config.media_lib_primary_tag, locale_to_utf_cpy(hasTwoColumns ? Albums->Current().Artist : Artists->Current()));
+		Mpd.AddSearch(Config.media_lib_primary_tag, locale_to_utf_cpy(hasTwoColumns ? Albums->Current().PrimaryTag : Artists->Current()));
 		if (Albums->Empty()) // left for compatibility with <mpd-0.14
 		{
 			*Albums << XY(0, 0) << "No albums found.";
@@ -511,7 +511,7 @@ void MediaLibrary::GetSelectedSongs(MPD::SongList &v)
 				MPD::SongList list;
 				Mpd.StartSearch(1);
 				Mpd.AddSearch(Config.media_lib_primary_tag, hasTwoColumns
-						?  Albums->at(*it).Artist
+						?  Albums->at(*it).PrimaryTag
 						: locale_to_utf_cpy(Artists->Current()));
 				Mpd.AddSearch(MPD_TAG_ALBUM, Albums->at(*it).Album);
 				Mpd.AddSearch(MPD_TAG_DATE, Albums->at(*it).Year);
@@ -648,13 +648,13 @@ void MediaLibrary::LocateSong(const MPD::Song &s)
 	
 	std::string album = s.GetAlbum();
 	std::string date = s.GetDate();
-	if ((hasTwoColumns && Albums->Current().Artist != primary_tag)
+	if ((hasTwoColumns && Albums->Current().PrimaryTag != primary_tag)
 	||  album != Albums->Current().Album
 	||  date != Albums->Current().Year)
 	{
 		for (size_t i = 0; i < Albums->Size(); ++i)
 		{
-			if ((!hasTwoColumns || (*Albums)[i].Artist == primary_tag)
+			if ((!hasTwoColumns || (*Albums)[i].PrimaryTag == primary_tag)
 			&&   album == (*Albums)[i].Album
 			&&   date == (*Albums)[i].Year)
 			{
@@ -734,7 +734,7 @@ std::string MediaLibrary::AlbumToString(const SearchConstraints &sc, void *ptr)
 		return "All tracks";
 	std::string result;
 	if (static_cast<MediaLibrary *>(ptr)->hasTwoColumns)
-		(result += sc.Artist.empty() ? Config.empty_tag : sc.Artist) += " - ";
+		(result += sc.PrimaryTag.empty() ? Config.empty_tag : sc.PrimaryTag) += " - ";
 	if ((!static_cast<MediaLibrary *>(ptr)->hasTwoColumns || Config.media_lib_primary_tag != MPD_TAG_DATE) && !sc.Year.empty())
 		((result += "(") += sc.Year) += ") ";
 	result += sc.Album.empty() ? "<no album>" : sc.Album;
@@ -755,7 +755,7 @@ bool MediaLibrary::SearchConstraintsSorting::operator()(const SearchConstraints
 {
 	int result;
 	CaseInsensitiveStringComparison cmp;
-	result = cmp(a.Artist, b.Artist);
+	result = cmp(a.PrimaryTag, b.PrimaryTag);
 	if (result != 0)
 		return result < 0;
 	result = cmp(a.Year, b.Year);
diff --git a/src/media_library.h b/src/media_library.h
index 8502dfd5..d598d52b 100644
--- a/src/media_library.h
+++ b/src/media_library.h
@@ -28,10 +28,10 @@ class MediaLibrary : public Screen<Window>
 {
 	struct SearchConstraints
 	{
-		SearchConstraints(const std::string &artist, const std::string &album, const std::string &year) : Artist(artist), Album(album), Year(year) { }
+		SearchConstraints(const std::string &tag, const std::string &album, const std::string &year) : PrimaryTag(tag), Album(album), Year(year) { }
 		SearchConstraints(const std::string &album, const std::string &year) : Album(album), Year(year) { }
 		
-		std::string Artist;
+		std::string PrimaryTag;
 		std::string Album;
 		std::string Year;
 	};