From 8acf996d90e3be551ebffc98de7248a5bee5b69c Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 27 Oct 2015 20:35:40 +0100 Subject: command/queue: add range parameter to plchanges and plchangesposid --- src/queue/QueuePrint.cxx | 27 ++++++++++++++++++++++----- src/queue/QueuePrint.hxx | 6 ++++-- 2 files changed, 26 insertions(+), 7 deletions(-) (limited to 'src/queue') diff --git a/src/queue/QueuePrint.cxx b/src/queue/QueuePrint.cxx index 5ae1a3036..a7298c81f 100644 --- a/src/queue/QueuePrint.cxx +++ b/src/queue/QueuePrint.cxx @@ -71,19 +71,36 @@ queue_print_uris(Response &r, Partition &partition, const Queue &queue, void queue_print_changes_info(Response &r, Partition &partition, const Queue &queue, - uint32_t version) + uint32_t version, + unsigned start, unsigned end) { - for (unsigned i = 0; i < queue.GetLength(); i++) { + assert(start <= end); + + if (start >= queue.GetLength()) + return; + + if (end > queue.GetLength()) + end = queue.GetLength(); + + for (unsigned i = start; i < end; i++) if (queue.IsNewerAtPosition(i, version)) queue_print_song_info(r, partition, queue, i); - } } void queue_print_changes_position(Response &r, const Queue &queue, - uint32_t version) + uint32_t version, + unsigned start, unsigned end) { - for (unsigned i = 0; i < queue.GetLength(); i++) + assert(start <= end); + + if (start >= queue.GetLength()) + return; + + if (end > queue.GetLength()) + end = queue.GetLength(); + + for (unsigned i = start; i < end; i++) if (queue.IsNewerAtPosition(i, version)) r.Format("cpos: %i\nId: %i\n", i, queue.PositionToId(i)); diff --git a/src/queue/QueuePrint.hxx b/src/queue/QueuePrint.hxx index 88d28e8ca..461987520 100644 --- a/src/queue/QueuePrint.hxx +++ b/src/queue/QueuePrint.hxx @@ -42,11 +42,13 @@ queue_print_uris(Response &r, Partition &partition, const Queue &queue, void queue_print_changes_info(Response &r, Partition &partition, const Queue &queue, - uint32_t version); + uint32_t version, + unsigned start, unsigned end); void queue_print_changes_position(Response &r, const Queue &queue, - uint32_t version); + uint32_t version, + unsigned start, unsigned end); void queue_find(Response &response, Partition &partition, const Queue &queue, -- cgit v1.2.3