Salastil/ncmpcpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

media library: search constraints: rename Artist to PrimaryTag

Browse Source 
it makes much more sense since 'Artist' can be also date, composer etc.
This commit is contained in:
Andrzej Rybczak
2010-08-24 22:25:47 +02:00
parent d799c5bf32
commit 8ec84637d2
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/media_library.cpp
View File

@@ -311,7 +311,7 @@ void MediaLibrary::Update()
MPD::SongList list; MPD::SongList list;
Mpd.StartSearch(1); 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 if (Albums->Empty()) // left for compatibility with <mpd-0.14
{ {
*Albums << XY(0, 0) << "No albums found."; *Albums << XY(0, 0) << "No albums found.";
@@ -511,7 +511,7 @@ void MediaLibrary::GetSelectedSongs(MPD::SongList &v)
MPD::SongList list; MPD::SongList list;
Mpd.StartSearch(1); Mpd.StartSearch(1);
Mpd.AddSearch(Config.media_lib_primary_tag, hasTwoColumns Mpd.AddSearch(Config.media_lib_primary_tag, hasTwoColumns
? Albums->at(*it).Artist ? Albums->at(*it).PrimaryTag
: locale_to_utf_cpy(Artists->Current())); : locale_to_utf_cpy(Artists->Current()));
Mpd.AddSearch(MPD_TAG_ALBUM, Albums->at(*it).Album); Mpd.AddSearch(MPD_TAG_ALBUM, Albums->at(*it).Album);
Mpd.AddSearch(MPD_TAG_DATE, Albums->at(*it).Year); 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 album = s.GetAlbum();
std::string date = s.GetDate(); std::string date = s.GetDate();
if ((hasTwoColumns && Albums->Current().Artist != primary_tag) if ((hasTwoColumns && Albums->Current().PrimaryTag != primary_tag)
|| album != Albums->Current().Album || album != Albums->Current().Album
|| date != Albums->Current().Year) || date != Albums->Current().Year)
{ {
for (size_t i = 0; i < Albums->Size(); ++i) 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 && album == (*Albums)[i].Album
&& date == (*Albums)[i].Year) && date == (*Albums)[i].Year)
{ {
@@ -734,7 +734,7 @@ std::string MediaLibrary::AlbumToString(const SearchConstraints &sc, void *ptr)
return "All tracks"; return "All tracks";
std::string result; std::string result;
if (static_cast<MediaLibrary *>(ptr)->hasTwoColumns) 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()) if ((!static_cast<MediaLibrary *>(ptr)->hasTwoColumns || Config.media_lib_primary_tag != MPD_TAG_DATE) && !sc.Year.empty())
((result += "(") += sc.Year) += ") "; ((result += "(") += sc.Year) += ") ";
result += sc.Album.empty() ? "<no album>" : sc.Album; result += sc.Album.empty() ? "<no album>" : sc.Album;
@@ -755,7 +755,7 @@ bool MediaLibrary::SearchConstraintsSorting::operator()(const SearchConstraints
{ {
int result; int result;
CaseInsensitiveStringComparison cmp; CaseInsensitiveStringComparison cmp;
result = cmp(a.Artist, b.Artist); result = cmp(a.PrimaryTag, b.PrimaryTag);
if (result != 0) if (result != 0)
return result < 0; return result < 0;
result = cmp(a.Year, b.Year); result = cmp(a.Year, b.Year);

4
src/media_library.h
View File

@@ -28,10 +28,10 @@ class MediaLibrary : public Screen<Window>
{ {
struct SearchConstraints 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) { } SearchConstraints(const std::string &album, const std::string &year) : Album(album), Year(year) { }
std::string Artist; std::string PrimaryTag;
std::string Album; std::string Album;
std::string Year; std::string Year;
}; };