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

rewrite communication system with mpd

Browse Source
This commit is contained in:
Andrzej Rybczak
2013-04-06 19:01:27 +02:00
parent 153e843774
commit 6a3eb73a49
25 changed files with 1039 additions and 1470 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/browser.cpp
View File

@@ -74,9 +74,6 @@ Browser::Browser() : itsBrowseLocally(0), itsScrollBeginning(0), itsBrowsedDir("
w.setSelectedPrefix(Config.selected_item_prefix);
w.setSelectedSuffix(Config.selected_item_suffix);
w.setItemDisplayer(std::bind(Display::Items, _1, proxySongList()));
if (SupportedExtensions.empty())
Mpd.GetSupportedExtensions(SupportedExtensions);
}
void Browser::resize()
@@ -136,11 +133,9 @@ void Browser::enterPressed()
}
case itPlaylist:
{
if (Mpd.LoadPlaylist(item.name))
{
Statusbar::msg("Playlist \"%s\" loaded", item.name.c_str());
myPlaylist->PlayNewlyAddedSongs();
}
Mpd.LoadPlaylist(item.name);
Statusbar::msg("Playlist \"%s\" loaded", item.name.c_str());
myPlaylist->PlayNewlyAddedSongs();
}
}
}
@@ -168,7 +163,6 @@ void Browser::spacePressed()
{
case itDirectory:
{
bool result;
# ifndef WIN32
if (isLocal())
{
@@ -179,13 +173,12 @@ void Browser::spacePressed()
list.reserve(items.size());
for (MPD::ItemList::const_iterator it = items.begin(); it != items.end(); ++it)
list.push_back(*it->song);
result = addSongsToPlaylist(list, false, -1);
addSongsToPlaylist(list, false, -1);
}
else
# endif // !WIN32
result = Mpd.Add(item.name);
if (result)
Statusbar::msg("Directory \"%s\" added", item.name.c_str());
Mpd.Add(item.name);
Statusbar::msg("Directory \"%s\" added", item.name.c_str());
break;
}
case itSong:
@@ -195,8 +188,8 @@ void Browser::spacePressed()
}
case itPlaylist:
{
if (Mpd.LoadPlaylist(item.name))
Statusbar::msg("Playlist \"%s\" loaded", item.name.c_str());
Mpd.LoadPlaylist(item.name);
Statusbar::msg("Playlist \"%s\" loaded", item.name.c_str());
break;
}
}
@@ -363,6 +356,12 @@ MPD::SongList Browser::getSelectedSongs()
return result;
}
void Browser::fetchSupportedExtensions()
{
SupportedExtensions.clear();
Mpd.GetSupportedExtensions(SupportedExtensions);
}
void Browser::LocateSong(const MPD::Song &s)
{
if (s.getDirectory().empty())
@@ -580,7 +579,7 @@ bool Browser::deleteItem(const MPD::Item &item)
// playlist created by mpd
if (!isLocal() && item.type == itPlaylist && CurrentDir() == "/")
return Mpd.DeletePlaylist(item.name);
Mpd.DeletePlaylist(item.name);
std::string path;
if (!isLocal())