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

Merge branch '0.6.x'

Browse Source 
Conflicts:
	NEWS
	configure.ac
	src/media_library.cpp
	src/playlist_editor.cpp
	src/tags.cpp
This commit is contained in:
Andrzej Rybczak
2014-11-06 19:23:54 +01:00
parent 309a4989c9 a32a4262b8
commit 9cb3b21d4a
9 changed files with 71 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/playlist_editor.cpp
View File

@@ -220,11 +220,13 @@ ProxySongList PlaylistEditor::contentProxyList()
void PlaylistEditor::AddToPlaylist(bool add_n_play)
{
std::vector<MPD::Song> list;
if (isActiveWindow(Playlists) && !Playlists.empty())
{
bool success = addSongsToPlaylist(Content.beginV(), Content.endV(), add_n_play, -1);
std::vector<MPD::Song> list(
std::make_move_iterator(Mpd.GetPlaylistContent(Playlists.current()->value().path())),
std::make_move_iterator(MPD::SongIterator())
);
bool success = addSongsToPlaylist(list.begin(), list.end(), add_n_play, -1);
Statusbar::printf("Playlist \"%1%\" loaded%2%",
Playlists.current()->value().path(), withErrors(success)
);
@@ -414,8 +416,14 @@ std::vector<MPD::Song> PlaylistEditor::getSelectedSongs()
}
}
// if no item is selected, add songs from right column
if (!any_selected && !Content.empty())
std::copy(Content.beginV(), Content.endV(), std::back_inserter(result));
if (!any_selected && !Playlists.empty())
{
std::copy(
std::make_move_iterator(Mpd.GetPlaylistContent(Playlists.current()->value().path())),
std::make_move_iterator(MPD::SongIterator()),
std::back_inserter(result)
);
}
}
else if (isActiveWindow(Content))
{