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

command/queue: move #ifdef out of AddDatabaseSelection()

Browse Source
This commit is contained in:
Max Kellermann 2021-10-23 13:06:40 +02:00
parent 293ed924d1
commit 35c4c7e8bf
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/command/QueueCommands.cxx
View File

@ -52,27 +52,21 @@ AddUri(Client &client, const LocatedUri &uri)
SongLoader(client).LoadSong(uri)); SongLoader(client).LoadSong(uri));
} }
static CommandResult
AddDatabaseSelection(Partition &partition, const char *uri,
[[maybe_unused]] Response &r)
{
#ifdef ENABLE_DATABASE #ifdef ENABLE_DATABASE
static void
AddDatabaseSelection(Partition &partition, const char *uri)
{
const ScopeBulkEdit bulk_edit(partition); const ScopeBulkEdit bulk_edit(partition);
const DatabaseSelection selection(uri, true); const DatabaseSelection selection(uri, true);
AddFromDatabase(partition, selection); AddFromDatabase(partition, selection);
return CommandResult::OK;
#else
(void)partition;
(void)uri;
r.Error(ACK_ERROR_NO_EXIST, "No database");
return CommandResult::ERROR;
#endif
} }
#endif
CommandResult CommandResult
handle_add(Client &client, Request args, Response &r) handle_add(Client &client, Request args, [[maybe_unused]] Response &r)
{ {
auto &partition = client.GetPartition(); auto &partition = client.GetPartition();
@ -102,9 +96,13 @@ handle_add(Client &client, Request args, Response &r)
return CommandResult::OK; return CommandResult::OK;
case LocatedUri::Type::RELATIVE: case LocatedUri::Type::RELATIVE:
return AddDatabaseSelection(partition, #ifdef ENABLE_DATABASE
located_uri.canonical_uri, AddDatabaseSelection(partition, located_uri.canonical_uri);
r); return CommandResult::OK;
#else
r.Error(ACK_ERROR_NO_EXIST, "No database");
return CommandResult::ERROR;
#endif
} }
gcc_unreachable(); gcc_unreachable();