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

SongPrint: remove Storage::MapToRelativeUTF8() call

Browse Source 
This code (added 7 years ago with commit b233c145f) has been obsoleted
by the SongLoader class (added 3 years ago).
This commit is contained in:
Max Kellermann
2017-02-24 13:56:13 +01:00
parent cd522f524d
commit 71ce1a25dd
12 changed files with 71 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/queue/QueuePrint.cxx
View File

@@ -33,10 +33,10 @@
* @param end the index of the last song (excluding)
*/
static void
queue_print_song_info(Response &r, Partition &partition, const Queue &queue,
queue_print_song_info(Response &r, const Queue &queue,
unsigned position)
{
song_print_info(r, partition, queue.Get(position));
song_print_info(r, queue.Get(position));
r.Format("Pos: %u\nId: %u\n",
position, queue.PositionToId(position));
@@ -46,18 +46,18 @@ queue_print_song_info(Response &r, Partition &partition, const Queue &queue,
}
void
queue_print_info(Response &r, Partition &partition, const Queue &queue,
queue_print_info(Response &r, const Queue &queue,
unsigned start, unsigned end)
{
assert(start <= end);
assert(end <= queue.GetLength());
for (unsigned i = start; i < end; ++i)
queue_print_song_info(r, partition, queue, i);
queue_print_song_info(r, queue, i);
}
void
queue_print_uris(Response &r, Partition &partition, const Queue &queue,
queue_print_uris(Response &r, const Queue &queue,
unsigned start, unsigned end)
{
assert(start <= end);
@@ -65,12 +65,12 @@ queue_print_uris(Response &r, Partition &partition, const Queue &queue,
for (unsigned i = start; i < end; ++i) {
r.Format("%i:", i);
song_print_uri(r, partition, queue.Get(i));
song_print_uri(r, queue.Get(i));
}
}
void
queue_print_changes_info(Response &r, Partition &partition, const Queue &queue,
queue_print_changes_info(Response &r, const Queue &queue,
uint32_t version,
unsigned start, unsigned end)
{
@@ -84,7 +84,7 @@ queue_print_changes_info(Response &r, Partition &partition, const Queue &queue,
for (unsigned i = start; i < end; i++)
if (queue.IsNewerAtPosition(i, version))
queue_print_song_info(r, partition, queue, i);
queue_print_song_info(r, queue, i);
}
void
@@ -107,13 +107,13 @@ queue_print_changes_position(Response &r, const Queue &queue,
}
void
queue_find(Response &r, Partition &partition, const Queue &queue,
queue_find(Response &r, const Queue &queue,
const SongFilter &filter)
{
for (unsigned i = 0; i < queue.GetLength(); i++) {
const DetachedSong &song = queue.Get(i);
if (filter.Match(song))
queue_print_song_info(r, partition, queue, i);
queue_print_song_info(r, queue, i);
}
}

9
src/queue/QueuePrint.hxx
View File

@@ -28,20 +28,19 @@
#include <stdint.h>
struct Queue;
struct Partition;
class SongFilter;
class Response;
void
queue_print_info(Response &r, Partition &partition, const Queue &queue,
queue_print_info(Response &r, const Queue &queue,
unsigned start, unsigned end);
void
queue_print_uris(Response &r, Partition &partition, const Queue &queue,
queue_print_uris(Response &r, const Queue &queue,
unsigned start, unsigned end);
void
queue_print_changes_info(Response &r, Partition &partition, const Queue &queue,
queue_print_changes_info(Response &r, const Queue &queue,
uint32_t version,
unsigned start, unsigned end);
@@ -51,7 +50,7 @@ queue_print_changes_position(Response &r, const Queue &queue,
unsigned start, unsigned end);
void
queue_find(Response &response, Partition &partition, const Queue &queue,
queue_find(Response &response, const Queue &queue,
const SongFilter &filter);
#endif