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

use vector<string_pair> instead of map<string, string>

Browse Source
This commit is contained in:
Andrzej Rybczak
2009-02-16 20:08:14 +01:00
parent 2a6e0fd7e8
commit 173b012d00
4 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/helpers.cpp
View File

@@ -180,6 +180,15 @@ bool CaseInsensitiveSorting::operator()(string a, string b)
return a < b; return a < b;
} }
bool CaseInsensitiveSorting::operator()(const string_pair &a, const string_pair &b)
{
string aa = a.first;
string bb = b.first;
ToLower(aa);
ToLower(bb);
return aa < bb;
}
bool CaseInsensitiveSorting::operator()(Song *sa, Song *sb) bool CaseInsensitiveSorting::operator()(Song *sa, Song *sb)
{ {
string a = sa->GetName(); string a = sa->GetName();

1
src/helpers.h
View File

@@ -32,6 +32,7 @@ class CaseInsensitiveSorting
{ {
public: public:
bool operator()(std::string, std::string); bool operator()(std::string, std::string);
bool operator()(const string_pair &, const string_pair &);
bool operator()(MPD::Song *, MPD::Song *); bool operator()(MPD::Song *, MPD::Song *);
bool operator()(const MPD::Item &, const MPD::Item &); bool operator()(const MPD::Item &, const MPD::Item &);
}; };

10
src/media_library.cpp
View File

@@ -19,7 +19,6 @@
***************************************************************************/ ***************************************************************************/
#include <algorithm> #include <algorithm>
#include <map>
#include "charset.h" #include "charset.h"
#include "display.h" #include "display.h"
@@ -148,7 +147,7 @@ void MediaLibrary::Update()
{ {
Albums->Reset(); Albums->Reset();
TagList list; TagList list;
std::map<string, string, CaseInsensitiveSorting> maplist; std::vector<string_pair> maplist;
locale_to_utf(Artists->Current()); locale_to_utf(Artists->Current());
if (Config.media_lib_primary_tag == MPD_TAG_ITEM_ARTIST) if (Config.media_lib_primary_tag == MPD_TAG_ITEM_ARTIST)
Mpd->GetAlbums(Artists->Current(), list); Mpd->GetAlbums(Artists->Current(), list);
@@ -184,13 +183,14 @@ void MediaLibrary::Update()
{ {
utf_to_locale(*it); utf_to_locale(*it);
l[0]->Localize(); l[0]->Localize();
maplist[l[0]->toString(Config.media_lib_album_format)] = *it; maplist.push_back(make_pair(l[0]->toString(Config.media_lib_album_format), *it));
} }
FreeSongList(l); FreeSongList(l);
} }
utf_to_locale(Artists->Current()); utf_to_locale(Artists->Current());
for (std::map<string, string>::const_iterator it = maplist.begin(); it != maplist.end(); it++) sort(maplist.begin(), maplist.end(), CaseInsensitiveSorting());
Albums->AddOption(make_pair(it->first, it->second)); for (std::vector<string_pair>::const_iterator it = maplist.begin(); it != maplist.end(); it++)
Albums->AddOption(*it);
Albums->Window::Clear(); Albums->Window::Clear();
Albums->Refresh(); Albums->Refresh();
} }

9
src/tag_editor.cpp
View File

@@ -408,7 +408,7 @@ void TagEditor::Update()
TagList list; TagList list;
if (Config.albums_in_tag_editor) if (Config.albums_in_tag_editor)
{ {
std::map<string, string, CaseInsensitiveSorting> maplist; std::vector<string_pair> maplist;
*Albums << XY(0, 0) << "Fetching albums' list..." << wrefresh; *Albums << XY(0, 0) << "Fetching albums' list..." << wrefresh;
Mpd->GetAlbums("", list); Mpd->GetAlbums("", list);
for (TagList::const_iterator it = list.begin(); it != list.end(); it++) for (TagList::const_iterator it = list.begin(); it != list.end(); it++)
@@ -420,12 +420,13 @@ void TagEditor::Update()
if (!l.empty()) if (!l.empty())
{ {
l[0]->Localize(); l[0]->Localize();
maplist[l[0]->toString(Config.tag_editor_album_format)] = *it; maplist.push_back(make_pair(l[0]->toString(Config.tag_editor_album_format), *it));
} }
FreeSongList(l); FreeSongList(l);
} }
for (std::map<string, string>::const_iterator it = maplist.begin(); it != maplist.end(); it++) sort(maplist.begin(), maplist.end(), CaseInsensitiveSorting());
Albums->AddOption(make_pair(it->first, it->second)); for (std::vector<string_pair>::const_iterator it = maplist.begin(); it != maplist.end(); it++)
Albums->AddOption(*it);
} }
else else
{ {