OutputAll: convert to class, move instance to class Partition

Another big chunk of code for multi-player support.

3 files changed, 14 insertions, 18 deletions

diff --git a/src/command/OtherCommands.cxx b/src/command/OtherCommands.cxx
index 328683d3d..359fa9fe3 100644
--- a/src/command/OtherCommands.cxx
+++ b/src/command/OtherCommands.cxx
@@ -45,6 +45,7 @@
 #include "db/PlaylistVector.hxx"
 #include "client/ClientFile.hxx"
 #include "client/Client.hxx"
+#include "Partition.hxx"
 #include "Idle.hxx"
 
 #include <assert.h>
@@ -254,7 +255,7 @@ handle_setvol(Client &client, gcc_unused int argc, char *argv[])
 		return CommandResult::ERROR;
 	}
 
-	success = volume_level_change(level);
+	success = volume_level_change(client.partition.outputs, level);
 	if (!success) {
 		command_error(client, ACK_ERROR_SYSTEM,
 			      "problems setting volume");
@@ -276,7 +277,7 @@ handle_volume(Client &client, gcc_unused int argc, char *argv[])
 		return CommandResult::ERROR;
 	}
 
-	const int old_volume = volume_level_get();
+	const int old_volume = volume_level_get(client.partition.outputs);
 	if (old_volume < 0) {
 		command_error(client, ACK_ERROR_SYSTEM, "No mixer");
 		return CommandResult::ERROR;
@@ -288,7 +289,8 @@ handle_volume(Client &client, gcc_unused int argc, char *argv[])
 	else if (new_volume > 100)
 		new_volume = 100;
 
-	if (new_volume != old_volume && !volume_level_change(new_volume)) {
+	if (new_volume != old_volume &&
+	    !volume_level_change(client.partition.outputs, new_volume)) {
 		command_error(client, ACK_ERROR_SYSTEM,
 			      "problems setting volume");
 		return CommandResult::ERROR;
diff --git a/src/command/OutputCommands.cxx b/src/command/OutputCommands.cxx
index 4ed3b89f1..03058d7ed 100644
--- a/src/command/OutputCommands.cxx
+++ b/src/command/OutputCommands.cxx
@@ -23,18 +23,17 @@
 #include "output/OutputCommand.hxx"
 #include "protocol/Result.hxx"
 #include "protocol/ArgParser.hxx"
+#include "client/Client.hxx"
+#include "Partition.hxx"
 
 CommandResult
 handle_enableoutput(Client &client, gcc_unused int argc, char *argv[])
 {
 	unsigned device;
-	bool ret;
-
 	if (!check_unsigned(client, &device, argv[1]))
 		return CommandResult::ERROR;
 
-	ret = audio_output_enable_index(device);
-	if (!ret) {
+	if (!audio_output_enable_index(client.partition.outputs, device)) {
 		command_error(client, ACK_ERROR_NO_EXIST,
 			      "No such audio output");
 		return CommandResult::ERROR;
@@ -47,13 +46,10 @@ CommandResult
 handle_disableoutput(Client &client, gcc_unused int argc, char *argv[])
 {
 	unsigned device;
-	bool ret;
-
 	if (!check_unsigned(client, &device, argv[1]))
 		return CommandResult::ERROR;
 
-	ret = audio_output_disable_index(device);
-	if (!ret) {
+	if (!audio_output_disable_index(client.partition.outputs, device)) {
 		command_error(client, ACK_ERROR_NO_EXIST,
 			      "No such audio output");
 		return CommandResult::ERROR;
@@ -69,7 +65,7 @@ handle_toggleoutput(Client &client, gcc_unused int argc, char *argv[])
 	if (!check_unsigned(client, &device, argv[1]))
 		return CommandResult::ERROR;
 
-	if (!audio_output_toggle_index(device)) {
+	if (!audio_output_toggle_index(client.partition.outputs, device)) {
 		command_error(client, ACK_ERROR_NO_EXIST,
 			      "No such audio output");
 		return CommandResult::ERROR;
@@ -82,7 +78,7 @@ CommandResult
 handle_devices(Client &client,
 	       gcc_unused int argc, gcc_unused char *argv[])
 {
-	printAudioDevices(client);
+	printAudioDevices(client, client.partition.outputs);
 
 	return CommandResult::OK;
 }
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;
 }