diff options
| author | Andrzej Rybczak <electricityispower@gmail.com> | 2009-09-22 22:33:46 +0200 |
|---|---|---|
| committer | Andrzej Rybczak <electricityispower@gmail.com> | 2009-09-22 22:37:33 +0200 |
| commit | dec7bd9c0ef5c35216919ff9633d8d9a2d7ca992 (patch) | |
| tree | 88224565b37da3c7bb367fc361cce323f68f30df /src/media_library.cpp | |
| parent | aad9146397440003c246adcbb7e5c299ba26e16f (diff) | |
make ncmpcpp use external libmpdclient (--without-taglib and --without-iconv)
Diffstat (limited to 'src/media_library.cpp')
| -rw-r--r-- | src/media_library.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/media_library.cpp b/src/media_library.cpp index 6ccd9f10..0ea535b4 100644 --- a/src/media_library.cpp +++ b/src/media_library.cpp @@ -185,11 +185,11 @@ void MediaLibrary::Update() Albums->Reset(); TagList list; locale_to_utf(Artists->Current()); - if (Config.media_lib_primary_tag == MPD_TAG_ITEM_ARTIST) + if (Config.media_lib_primary_tag == MPD_TAG_ARTIST) Mpd.GetAlbums(Artists->Current(), list); else { - Mpd.StartFieldSearch(MPD_TAG_ITEM_ALBUM); + Mpd.StartFieldSearch(MPD_TAG_ALBUM); Mpd.AddSearch(Config.media_lib_primary_tag, Artists->Current()); Mpd.CommitSearch(list); } @@ -198,9 +198,9 @@ void MediaLibrary::Update() if (Mpd.Version() > 13) { TagList noalbum_list; - Mpd.StartFieldSearch(MPD_TAG_ITEM_FILENAME); + Mpd.StartFieldSearch(MPD_TAG_FILE); Mpd.AddSearch(Config.media_lib_primary_tag, Artists->Current()); - Mpd.AddSearch(MPD_TAG_ITEM_ALBUM, ""); + Mpd.AddSearch(MPD_TAG_ALBUM, ""); Mpd.CommitSearch(noalbum_list); if (!noalbum_list.empty()) Albums->AddOption(std::make_pair("<no album>", SearchConstraints("", ""))); @@ -209,9 +209,9 @@ void MediaLibrary::Update() for (TagList::const_iterator it = list.begin(); it != list.end(); ++it) { TagList l; - Mpd.StartFieldSearch(MPD_TAG_ITEM_DATE); + Mpd.StartFieldSearch(MPD_TAG_DATE); Mpd.AddSearch(Config.media_lib_primary_tag, Artists->Current()); - Mpd.AddSearch(MPD_TAG_ITEM_ALBUM, *it); + Mpd.AddSearch(MPD_TAG_ALBUM, *it); Mpd.CommitSearch(l); if (l.empty()) { @@ -237,17 +237,17 @@ void MediaLibrary::Update() for (TagList::const_iterator i = artists.begin(); i != artists.end(); ++i) { TagList albums; - Mpd.StartFieldSearch(MPD_TAG_ITEM_ALBUM); + Mpd.StartFieldSearch(MPD_TAG_ALBUM); Mpd.AddSearch(Config.media_lib_primary_tag, *i); Mpd.CommitSearch(albums); for (TagList::const_iterator j = albums.begin(); j != albums.end(); ++j) { - if (Config.media_lib_primary_tag != MPD_TAG_ITEM_DATE) + if (Config.media_lib_primary_tag != MPD_TAG_DATE) { TagList years; - Mpd.StartFieldSearch(MPD_TAG_ITEM_DATE); + Mpd.StartFieldSearch(MPD_TAG_DATE); Mpd.AddSearch(Config.media_lib_primary_tag, *i); - Mpd.AddSearch(MPD_TAG_ITEM_ALBUM, *j); + Mpd.AddSearch(MPD_TAG_ALBUM, *j); Mpd.CommitSearch(years); if (!years.empty()) { @@ -292,9 +292,9 @@ void MediaLibrary::Update() } else { - Mpd.AddSearch(MPD_TAG_ITEM_ALBUM, Albums->Current().second.Album); + Mpd.AddSearch(MPD_TAG_ALBUM, Albums->Current().second.Album); if (!Albums->Current().second.Album.empty()) // for <no album> - Mpd.AddSearch(MPD_TAG_ITEM_DATE, Albums->Current().second.Year); + Mpd.AddSearch(MPD_TAG_DATE, Albums->Current().second.Year); } Mpd.CommitSearch(list); |