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

media library: fix adding songs with fetch delay enabled

Browse Source
This commit is contained in:
Andrzej Rybczak
2014-11-06 18:53:31 +01:00
parent 60749ea4bd
commit 08d17f9d0e
2 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@@ -3,6 +3,7 @@ ncmpcpp-0.6.1 (????-??-??)
* Comment tag is now properly written to mp3 files.
* Only ID3v2.4 tags are now saved to mp3 files.
* Mouse scrolling with newer ncurses API now works properly.
* Adding songs from an album in media library now works properly with fetch delay.
ncmpcpp-0.6 (2014-10-25)

26
src/media_library.cpp
View File

@@ -58,6 +58,19 @@ size_t itsRightColStartX;
typedef MediaLibrary::AlbumEntry AlbumEntry;
template <typename FunT>
void withSongsFromAlbum(const AlbumEntry &album, FunT &&f)
{
Mpd.StartSearch(true);
Mpd.AddSearch(Config.media_lib_primary_tag, album.entry().tag());
if (!album.isAllTracksEntry())
{
Mpd.AddSearch(MPD_TAG_ALBUM, album.entry().album());
Mpd.AddSearch(MPD_TAG_DATE, album.entry().date());
}
Mpd.CommitSearchSongs(std::forward<FunT>(f));
}
std::string AlbumToString(const AlbumEntry &ae);
std::string SongToString(const MPD::Song &s);
@@ -778,9 +791,9 @@ MPD::SongList MediaLibrary::getSelectedSongs()
// if no item is selected, add songs from right column
if (!any_selected && !Albums.empty())
{
withUnfilteredMenu(Songs, [this, &result]() {
result.insert(result.end(), Songs.beginV(), Songs.endV());
});
size_t begin = result.size();
withSongsFromAlbum(Albums.current().value().entry(), vectorMoveInserter(result));
std::sort(result.begin()+begin, result.end(), SortSongs(false));
}
}
else if (isActiveWindow(Songs))
@@ -1059,10 +1072,9 @@ void MediaLibrary::AddToPlaylist(bool add_n_play)
}
else if (isActiveWindow(Albums))
{
bool success;
withUnfilteredMenu(Songs, [&]() {
success = addSongsToPlaylist(Songs.beginV(), Songs.endV(), add_n_play, -1);
});
MPD::SongList list;
withSongsFromAlbum(Albums.current().value(), vectorMoveInserter(list));
bool success = addSongsToPlaylist(list.begin(), list.end(), add_n_play, -1);
Statusbar::printf("Songs from album \"%1%\" added%2%",
Albums.current().value().entry().album(), withErrors(success)
);