From 15d54dfb4c5fe971d7f707de46ff672d2ae920ee Mon Sep 17 00:00:00 2001
From: Thomas Harte <thomas.harte@gmail.com>
Date: Sat, 21 Mar 2020 22:24:31 -0400
Subject: [PATCH] Adds 'volume' command-line parameter for kiosk mode.

---
 .../xcschemes/Clock Signal Kiosk.xcscheme     | 10 +++--
 OSBindings/SDL/main.cpp                       | 45 ++++++++++++++-----
 2 files changed, 40 insertions(+), 15 deletions(-)

diff --git a/OSBindings/Mac/Clock Signal.xcodeproj/xcshareddata/xcschemes/Clock Signal Kiosk.xcscheme b/OSBindings/Mac/Clock Signal.xcodeproj/xcshareddata/xcschemes/Clock Signal Kiosk.xcscheme
index 66ee95aed..9a32a7574 100644
--- a/OSBindings/Mac/Clock Signal.xcodeproj/xcshareddata/xcschemes/Clock Signal Kiosk.xcscheme	
+++ b/OSBindings/Mac/Clock Signal.xcodeproj/xcshareddata/xcschemes/Clock Signal Kiosk.xcscheme	
@@ -56,6 +56,10 @@
             argument = "/Users/thomasharte/Downloads/test-dsk-for-rw-and-50-60-hz/TEST-RW-60Hz.DSK"
             isEnabled = "NO">
          </CommandLineArgument>
+         <CommandLineArgument
+            argument = "--volume=0.001"
+            isEnabled = "YES">
+         </CommandLineArgument>
          <CommandLineArgument
             argument = "--new=amstradcpc"
             isEnabled = "NO">
@@ -70,7 +74,7 @@
          </CommandLineArgument>
          <CommandLineArgument
             argument = "--output=CompositeMonochrome"
-            isEnabled = "YES">
+            isEnabled = "NO">
          </CommandLineArgument>
          <CommandLineArgument
             argument = "--logical-keyboard"
@@ -94,11 +98,11 @@
          </CommandLineArgument>
          <CommandLineArgument
             argument = "--help"
-            isEnabled = "YES">
+            isEnabled = "NO">
          </CommandLineArgument>
          <CommandLineArgument
             argument = "--model=cpc6128"
-            isEnabled = "YES">
+            isEnabled = "NO">
          </CommandLineArgument>
       </CommandLineArguments>
    </LaunchAction>
diff --git a/OSBindings/SDL/main.cpp b/OSBindings/SDL/main.cpp
index 451f3c8d9..c42d55284 100644
--- a/OSBindings/SDL/main.cpp
+++ b/OSBindings/SDL/main.cpp
@@ -487,7 +487,7 @@ int main(int argc, char *argv[]) {
 	const ParsedArguments arguments = parse_arguments(argc, argv);
 
 	// This may be printed either as
-	const std::string usage_suffix = " [file or --new={machine}] [OPTIONS] [--rompath={path to ROMs}] [--speed={speed multiplier, e.g. 1.5}]  [--logical-keyboard]";
+	const std::string usage_suffix = " [file or --new={machine}] [OPTIONS] [--rompath={path to ROMs}] [--speed={speed multiplier, e.g. 1.5}]  [--logical-keyboard] [--volume={0.0 to 1.0}]";
 
 	// Print a help message if requested.
 	if(arguments.selections.find("help") != arguments.selections.end() || arguments.selections.find("h") != arguments.selections.end()) {
@@ -739,18 +739,39 @@ int main(int argc, char *argv[]) {
 	}
 
 	// Apply the speed multiplier, if one was requested.
-	const auto speed_argument = arguments.selections.find("speed");
-	if(speed_argument != arguments.selections.end()) {
-		const char *speed_string = speed_argument->second.c_str();
-		char *end;
-		double speed = strtod(speed_string, &end);
+	{
+		const auto speed_argument = arguments.selections.find("speed");
+		if(speed_argument != arguments.selections.end()) {
+			const char *speed_string = speed_argument->second.c_str();
+			char *end;
+			const double speed = strtod(speed_string, &end);
 
-		if(size_t(end - speed_string) != strlen(speed_string)) {
-			std::cerr << "Unable to parse speed: " << speed_string << std::endl;
-		} else if(speed <= 0.0) {
-			std::cerr << "Cannot run at speed " << speed_string << "; speeds must be positive." << std::endl;
-		} else {
-			machine_runner.set_speed_multiplier(speed);
+			if(size_t(end - speed_string) != strlen(speed_string)) {
+				std::cerr << "Unable to parse speed: " << speed_string << std::endl;
+			} else if(speed <= 0.0) {
+				std::cerr << "Cannot run at speed " << speed_string << "; speeds must be positive." << std::endl;
+			} else {
+				machine_runner.set_speed_multiplier(speed);
+			}
+		}
+	}
+
+	// Apply the desired output volume, if requested.
+	{
+		const auto volume_argument = arguments.selections.find("volume");
+		if(volume_argument != arguments.selections.end()) {
+			const char *volume_string = volume_argument->second.c_str();
+			char *end;
+			const double volume = strtod(volume_string, &end);
+
+			if(size_t(end - volume_string) != strlen(volume_string)) {
+				std::cerr << "Unable to parse volume: " << volume_string << std::endl;
+			} else if(volume < 0.0 || volume > 1.0) {
+				std::cerr << "Cannot run with volume " << volume_string << "; volumes must be between 0.0 and 1.0." << std::endl;
+			} else {
+				const auto speaker = machine->crt_machine()->get_speaker();
+				if(speaker) speaker->set_output_volume(volume);
+			}
 		}
 	}