oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

db/Print: pass RangeArg to db_selection_print()

This commit is contained in:
Max Kellermann 2018-09-02 07:49:27 +02:00
parent 68f824a186
commit 993f8d6a5e
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/command/DatabaseCommands.cxx
View File

@ -113,7 +113,7 @@ handle_match(Client &client, Request args, Response &r, bool fold_case)
db_selection_print(r, client.GetPartition(),
selection, true, false,
sort, descending,
window.start, window.end);
window);
return CommandResult::OK;
}

21
src/db/DatabasePrint.cxx
View File

@ -24,6 +24,7 @@
#include "TimePrint.hxx"
#include "TagPrint.hxx"
#include "client/Response.hxx"
#include "protocol/RangeArg.hxx"
#include "Partition.hxx"
#include "song/DetachedSong.hxx"
#include "song/Filter.hxx"
@ -180,7 +181,7 @@ db_selection_print(Response &r, Partition &partition,
const DatabaseSelection &selection,
bool full, bool base,
TagType sort, bool descending,
unsigned window_start, unsigned window_end)
RangeArg window)
{
const Database &db = partition.GetDatabaseOrThrow();
@ -199,10 +200,10 @@ db_selection_print(Response &r, Partition &partition,
: VisitPlaylist();
if (sort == TAG_NUM_OF_ITEM_TYPES) {
if (window_start > 0 ||
window_end < (unsigned)std::numeric_limits<int>::max())
s = [s, window_start, window_end, &i](const LightSong &song){
const bool in_window = i >= window_start && i < window_end;
if (window.start > 0 ||
window.end < (unsigned)std::numeric_limits<int>::max())
s = [s, window, &i](const LightSong &song){
const bool in_window = i >= window.start && i < window.end;
++i;
if (in_window)
s(song);
@ -242,15 +243,15 @@ db_selection_print(Response &r, Partition &partition,
b.GetTag());
});
if (window_end < songs.size())
songs.erase(std::next(songs.begin(), window_end),
if (window.end < songs.size())
songs.erase(std::next(songs.begin(), window.end),
songs.end());
if (window_start >= songs.size())
if (window.start >= songs.size())
return;
songs.erase(songs.begin(),
std::next(songs.begin(), window_start));
std::next(songs.begin(), window.start));
for (const auto &song : songs)
s((LightSong)song);
@ -264,7 +265,7 @@ db_selection_print(Response &r, Partition &partition,
{
db_selection_print(r, partition, selection, full, base,
TAG_NUM_OF_ITEM_TYPES, false,
0, std::numeric_limits<int>::max());
RangeArg::All());
}
static void

3
src/db/DatabasePrint.hxx
View File

@ -26,6 +26,7 @@ enum TagType : uint8_t;
class TagMask;
class SongFilter;
struct DatabaseSelection;
struct RangeArg;
struct Partition;
class Response;
@ -47,7 +48,7 @@ db_selection_print(Response &r, Partition &partition,
const DatabaseSelection &selection,
bool full, bool base,
TagType sort, bool descending,
unsigned window_start, unsigned window_end);
RangeArg window);
void
PrintSongUris(Response &r, Partition &partition,