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

command/player: add local Partition reference variable

Browse Source
This commit is contained in:
Max Kellermann
2020-01-18 23:30:45 +01:00
parent c16233fa74
commit 4029a79dc2
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/command/PlayerCommands.cxx
View File

@@ -108,7 +108,8 @@ handle_pause(Client &client, Request args, gcc_unused Response &r)
CommandResult CommandResult
handle_status(Client &client, gcc_unused Request args, Response &r) handle_status(Client &client, gcc_unused Request args, Response &r)
{ {
auto &pc = client.GetPlayerControl(); auto &partition = client.GetPartition();
auto &pc = partition.pc;
const char *state = nullptr; const char *state = nullptr;
int song; int song;
@@ -127,9 +128,9 @@ handle_status(Client &client, gcc_unused Request args, Response &r)
break; break;
} }
const playlist &playlist = client.GetPlaylist(); const auto &playlist = partition.playlist;
const auto volume = volume_level_get(client.GetPartition().outputs); const auto volume = volume_level_get(partition.outputs);
if (volume >= 0) if (volume >= 0)
r.Format("volume: %i\n", volume); r.Format("volume: %i\n", volume);
@@ -186,7 +187,7 @@ handle_status(Client &client, gcc_unused Request args, Response &r)
} }
#ifdef ENABLE_DATABASE #ifdef ENABLE_DATABASE
const UpdateService *update_service = client.GetInstance().update; const UpdateService *update_service = partition.instance.update;
unsigned updateJobId = update_service != nullptr unsigned updateJobId = update_service != nullptr
? update_service->GetId() ? update_service->GetId()
: 0; : 0;