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

local browser: properly check if file extension is supported

Browse Source
This commit is contained in:
Andrzej Rybczak
2012-01-15 13:23:07 +01:00
parent b058fdce30
commit 57511bb941
4 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/browser.cpp
View File

@@ -47,13 +47,7 @@ using MPD::itPlaylist;
Browser *myBrowser = new Browser;
const char *Browser::SupportedExtensions[] =
{
"wma", "asf", "rm", "mp1", "mp2", "mp3",
"mp4", "m4a", "flac", "ogg", "wav", "au",
"aiff", "aif", "ac3", "aac", "mpc", "it",
"mod", "s3m", "xm", "wv", 0
};
std::set<std::string> Browser::SupportedExtensions;
void Browser::Init()
{
@@ -68,6 +62,10 @@ void Browser::Init()
w->SetItemDisplayer(Display::Items);
w->SetItemDisplayerUserData(&sf);
w->SetGetStringFunction(ItemToString);
if (SupportedExtensions.empty())
Mpd.GetSupportedExtensions(SupportedExtensions);
isInitialized = 1;
}
@@ -330,11 +328,7 @@ bool Browser::hasSupportedExtension(const std::string &file)
std::string ext = file.substr(last_dot+1);
ToLower(ext);
for (int i = 0; SupportedExtensions[i]; ++i)
if (strcmp(ext.c_str(), SupportedExtensions[i]) == 0)
return true;
return false;
return SupportedExtensions.find(ext) != SupportedExtensions.end();
}
void Browser::LocateSong(const MPD::Song &s)