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

protocol/RangeArg: add Contains()

Browse Source
This commit is contained in:
Max Kellermann 2018-09-02 07:57:36 +02:00
parent 2915d2dd0f
commit 15b2a4862e
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/db/DatabasePrint.cxx
View File

@ -202,9 +202,7 @@ db_selection_print(Response &r, Partition &partition,
if (sort == TAG_NUM_OF_ITEM_TYPES) { if (sort == TAG_NUM_OF_ITEM_TYPES) {
if (!window.IsAll()) if (!window.IsAll())
s = [s, window, &i](const LightSong &song){ s = [s, window, &i](const LightSong &song){
const bool in_window = i >= window.start && i < window.end; if (window.Contains(i++))
++i;
if (in_window)
s(song); s(song);
}; };

4
src/protocol/RangeArg.hxx
View File

@ -42,6 +42,10 @@ struct RangeArg {
constexpr bool IsAll() const noexcept { constexpr bool IsAll() const noexcept {
return *this == All(); return *this == All();
} }
constexpr bool Contains(unsigned i) const noexcept {
return i >= start && i < end;
}
}; };
#endif #endif