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/Main.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 'src/Main.cxx')
| -rw-r--r-- | src/Main.cxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/Main.cxx b/src/Main.cxx index f790ec574..87a35eca2 100644 --- a/src/Main.cxx +++ b/src/Main.cxx @@ -37,7 +37,6 @@ #include "command/AllCommands.hxx" #include "Partition.hxx" #include "mixer/Volume.hxx" -#include "output/OutputAll.hxx" #include "tag/TagConfig.hxx" #include "ReplayGainConfig.hxx" #include "Idle.hxx" @@ -458,7 +457,7 @@ int mpd_main(int argc, char *argv[]) initialize_decoder_and_player(); volume_init(); initAudioConfig(); - audio_output_all_init(instance->partition->pc); + instance->partition->outputs.Configure(instance->partition->pc); client_manager_init(); replay_gain_global_init(); @@ -500,7 +499,7 @@ int mpd_main(int argc, char *argv[]) return EXIT_FAILURE; } - audio_output_all_set_replay_gain_mode(replay_gain_get_real_mode(instance->partition->playlist.queue.random)); + instance->partition->outputs.SetReplayGainMode(replay_gain_get_real_mode(instance->partition->playlist.queue.random)); if (config_get_bool(CONF_AUTO_UPDATE, false)) { #ifdef ENABLE_INOTIFY @@ -567,7 +566,6 @@ int mpd_main(int argc, char *argv[]) playlist_list_global_finish(); input_stream_global_finish(); - audio_output_all_finish(); mapper_finish(); delete instance->partition; command_finish(); |