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

new screen (media library), some fixes etc.

Browse Source
This commit is contained in:
unknown
2008-08-08 20:40:04 +02:00
parent 52f5976af8
commit 7783f9b3f5
13 changed files with 480 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/helpers.cpp
View File

@@ -38,6 +38,8 @@ extern vector<Song> vPlaylist;
extern vector<MpdDataType> vFileType;
extern vector<string> vNameList;
extern CurrScreen current_screen;
extern Song edited_song;
extern Song searched_song;
@@ -61,6 +63,45 @@ extern string UNKNOWN_ARTIST;
extern string UNKNOWN_TITLE;
extern string UNKNOWN_ALBUM;
void * BoldSongsFromPlaylist(void *t)
{
if (!vNameList.empty())
{
bool bold = 0;
for (int i = 0; i < vFileType.size(); i++)
{
if (vFileType[i] == MPD_DATA_TYPE_SONG)
{
for (vector<Song>::const_iterator it = vPlaylist.begin(); it != vPlaylist.end(); it++)
{
if (it->GetFile() == vNameList[i])
{
bold = 1;
break;
}
}
mBrowser->BoldOption(i+1, bold);
bold = 0;
}
}
}
if (current_screen == csBrowser)
mBrowser->Refresh();
pthread_exit(NULL);
}
bool SortSongsByTrack(const Song &a, const Song &b)
{
return StrToInt(a.GetTrack()) < StrToInt(b.GetTrack());
}
bool CaseInsensitiveComparison(string a, string b)
{
transform(a.begin(), a.end(), a.begin(), tolower);
transform(b.begin(), b.end(), b.begin(), tolower);
return a < b;
}
void WindowTitle(const string &status)
{
if (TERMINAL_TYPE != "linux" && Config.set_window_title)
@@ -491,13 +532,14 @@ bool GetSongInfo(Song &s)
void GetDirectory(string dir)
{
pthread_t bolder;
browsed_dir_scroll_begin = 0;
if (browsed_dir != dir)
mBrowser->Reset();
browsed_dir = dir;
vFileType.clear();
vNameList.clear();
mBrowser->Clear();
mBrowser->Clear(current_screen != csLibrary);
if (dir != "/")
{
mBrowser->AddOption("[..]");
@@ -535,15 +577,14 @@ void GetDirectory(string dir)
vFileType.push_back(MPD_DATA_TYPE_SONG);
Song s = browser->song;
vNameList.push_back(s.GetFile());
bool bold = 0;
for (vector<Song>::const_iterator it = vPlaylist.begin(); it != vPlaylist.end(); it++)
if (it->GetFile() == s.GetFile())
bold = 1;
bold ? mBrowser->AddBoldOption(DisplaySong(s)) : mBrowser->AddOption(DisplaySong(s));
mBrowser->AddOption(DisplaySong(s));
break;
}
}
}
pthread_create(&bolder, NULL, BoldSongsFromPlaylist, NULL);
mpd_data_free(browser);
browsed_subdir.clear();
}