diff options
| author | Max Kellermann <max@duempel.org> | 2014-01-27 08:20:25 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2014-01-28 09:20:53 +0100 |
| commit | f5a923b9d16e4c63942a033d1bdb2ab150aae342 (patch) | |
| tree | 6e3c39b305fd2a1da2a7b9c2b79a6737ca21a23b /src/command/PlayerCommands.cxx | |
| parent | 36bab6ef066c6898a791dd15054301f80757b3f6 (diff) | |
| download | mpd-f5a923b9d16e4c63942a033d1bdb2ab150aae342.tar.gz mpd-f5a923b9d16e4c63942a033d1bdb2ab150aae342.tar.xz mpd-f5a923b9d16e4c63942a033d1bdb2ab150aae342.zip | |
OutputAll: convert to class, move instance to class Partition
Another big chunk of code for multi-player support.
Diffstat (limited to '')
| -rw-r--r-- | src/command/PlayerCommands.cxx | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/command/PlayerCommands.cxx b/src/command/PlayerCommands.cxx index 28258dded..5dc55b485 100644 --- a/src/command/PlayerCommands.cxx +++ b/src/command/PlayerCommands.cxx @@ -25,7 +25,6 @@ #include "db/update/UpdateGlue.hxx" #include "client/Client.hxx" #include "mixer/Volume.hxx" -#include "output/OutputAll.hxx" #include "Partition.hxx" #include "protocol/Result.hxx" #include "protocol/ArgParser.hxx" @@ -140,7 +139,7 @@ handle_status(Client &client, COMMAND_STATUS_PLAYLIST_LENGTH ": %i\n" COMMAND_STATUS_MIXRAMPDB ": %f\n" COMMAND_STATUS_STATE ": %s\n", - volume_level_get(), + volume_level_get(client.partition.outputs), playlist.GetRepeat(), playlist.GetRandom(), playlist.GetSingle(), @@ -277,7 +276,7 @@ handle_random(Client &client, gcc_unused int argc, char *argv[]) return CommandResult::ERROR; client.partition.SetRandom(status); - audio_output_all_set_replay_gain_mode(replay_gain_get_real_mode(client.partition.GetRandom())); + client.partition.outputs.SetReplayGainMode(replay_gain_get_real_mode(client.partition.GetRandom())); return CommandResult::OK; } @@ -379,8 +378,7 @@ handle_replay_gain_mode(Client &client, return CommandResult::ERROR; } - audio_output_all_set_replay_gain_mode(replay_gain_get_real_mode(client.playlist.queue.random)); - + client.partition.outputs.SetReplayGainMode(replay_gain_get_real_mode(client.playlist.queue.random)); return CommandResult::OK; } |