SongPrint: remove Storage::MapToRelativeUTF8() call

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

View File

@@ -193,7 +193,7 @@ handle_lsinfo_relative(Client &client, Response &r, const char *uri)
}
static CommandResult
handle_lsinfo_path(Client &client, Response &r,
handle_lsinfo_path(Client &, Response &r,
const char *path_utf8, Path path_fs)
{
DetachedSong song(path_utf8);
@@ -202,7 +202,7 @@ handle_lsinfo_path(Client &client, Response &r,
return CommandResult::ERROR;
}
song_print_info(r, client.partition, song);
song_print_info(r, song);
return CommandResult::OK;
}

View File

@@ -86,7 +86,7 @@ handle_stop(Client &client, gcc_unused Request args, gcc_unused Response &r)
CommandResult
handle_currentsong(Client &client, gcc_unused Request args, Response &r)
{
playlist_print_current(r, client.partition, client.playlist);
playlist_print_current(r, client.playlist);
return CommandResult::OK;
}

View File

@@ -188,7 +188,7 @@ handle_deleteid(Client &client, Request args, gcc_unused Response &r)
CommandResult
handle_playlist(Client &client, gcc_unused Request args, Response &r)
{
playlist_print_uris(r, client.partition, client.playlist);
playlist_print_uris(r, client.playlist);
return CommandResult::OK;
}
@@ -212,8 +212,7 @@ handle_plchanges(Client &client, Request args, Response &r)
{
uint32_t version = ParseCommandArgU32(args.front());
RangeArg range = args.ParseOptional(1, RangeArg::All());
playlist_print_changes_info(r, client.partition,
client.playlist, version,
playlist_print_changes_info(r, client.playlist, version,
range.start, range.end);
return CommandResult::OK;
}
@@ -233,7 +232,7 @@ handle_playlistinfo(Client &client, Request args, Response &r)
{
RangeArg range = args.ParseOptional(0, RangeArg::All());
playlist_print_info(r, client.partition, client.playlist,
playlist_print_info(r, client.playlist,
range.start, range.end);
return CommandResult::OK;
}
@@ -243,10 +242,9 @@ handle_playlistid(Client &client, Request args, Response &r)
{
if (!args.IsEmpty()) {
unsigned id = args.ParseUnsigned(0);
playlist_print_id(r, client.partition,
client.playlist, id);
playlist_print_id(r, client.playlist, id);
} else {
playlist_print_info(r, client.partition, client.playlist,
playlist_print_info(r, client.playlist,
0, std::numeric_limits<unsigned>::max());
}
@@ -263,7 +261,7 @@ handle_playlist_match(Client &client, Request args, Response &r,
return CommandResult::ERROR;
}
playlist_print_find(r, client.partition, client.playlist, filter);
playlist_print_find(r, client.playlist, filter);
return CommandResult::OK;
}

View File

@@ -33,7 +33,6 @@
struct sticker_song_find_data {
Response &r;
Partition &partition;
const char *name;
};
@@ -44,7 +43,7 @@ sticker_song_find_print_cb(const LightSong &song, const char *value,
struct sticker_song_find_data *data =
(struct sticker_song_find_data *)user_data;
song_print_uri(data->r, data->partition, song);
song_print_uri(data->r, song);
sticker_print_value(data->r, data->name, value);
}
@@ -137,7 +136,6 @@ handle_sticker_song(Response &r, Partition &partition, Request args)
struct sticker_song_find_data data = {
r,
partition,
args[3],
};