From e3fd63b2d73f952ac290efad875442c67d6d935b Mon Sep 17 00:00:00 2001
From: Thomas Harte <thomas.harte@gmail.com>
Date: Tue, 23 Oct 2018 22:30:24 -0400
Subject: [PATCH] Adds composite/RGB selection for the Master System.

---
 Machines/MasterSystem/MasterSystem.cpp        | 31 +++++++++++++++++++
 Machines/MasterSystem/MasterSystem.hpp        |  3 ++
 .../xcschemes/Clock Signal.xcscheme           |  2 +-
 .../StaticAnalyser/CSStaticAnalyser.mm        | 17 +++++-----
 4 files changed, 44 insertions(+), 9 deletions(-)

diff --git a/Machines/MasterSystem/MasterSystem.cpp b/Machines/MasterSystem/MasterSystem.cpp
index e3e921b03..7b3d5c8d2 100644
--- a/Machines/MasterSystem/MasterSystem.cpp
+++ b/Machines/MasterSystem/MasterSystem.cpp
@@ -32,6 +32,12 @@ const int sn76489_divider = 2;
 namespace Sega {
 namespace MasterSystem {
 
+std::vector<std::unique_ptr<Configurable::Option>> get_options() {
+	return Configurable::standard_options(
+		static_cast<Configurable::StandardOptions>(Configurable::DisplayRGB | Configurable::DisplayComposite)
+	);
+}
+
 class Joystick: public Inputs::ConcreteJoystick {
 	public:
 		Joystick() :
@@ -75,6 +81,7 @@ class ConcreteMachine:
 	public Machine,
 	public CPU::Z80::BusHandler,
 	public CRTMachine::Machine,
+	public Configurable::Device,
 	public JoystickMachine::Machine {
 
 	public:
@@ -326,6 +333,30 @@ class ConcreteMachine:
 			return joysticks_;
 		}
 
+		// MARK: - Configuration options.
+		std::vector<std::unique_ptr<Configurable::Option>> get_options() override {
+			return Sega::MasterSystem::get_options();
+		}
+
+		void set_selections(const Configurable::SelectionSet &selections_by_option) override {
+			Configurable::Display display;
+			if(Configurable::get_display(selections_by_option, display)) {
+				set_video_signal_configurable(display);
+			}
+		}
+
+		Configurable::SelectionSet get_accurate_selections() override {
+			Configurable::SelectionSet selection_set;
+			Configurable::append_display_selection(selection_set, Configurable::Display::Composite);
+			return selection_set;
+		}
+
+		Configurable::SelectionSet get_user_friendly_selections() override {
+			Configurable::SelectionSet selection_set;
+			Configurable::append_display_selection(selection_set, Configurable::Display::RGB);
+			return selection_set;
+		}
+
 	private:
 		inline uint8_t get_th_values() {
 			// Quick not on TH inputs here: if either is setup as an output, then the
diff --git a/Machines/MasterSystem/MasterSystem.hpp b/Machines/MasterSystem/MasterSystem.hpp
index e6cfae681..b192dfae7 100644
--- a/Machines/MasterSystem/MasterSystem.hpp
+++ b/Machines/MasterSystem/MasterSystem.hpp
@@ -9,12 +9,15 @@
 #ifndef MasterSystem_hpp
 #define MasterSystem_hpp
 
+#include "../../Configurable/Configurable.hpp"
 #include "../../Analyser/Static/StaticAnalyser.hpp"
 #include "../ROMMachine.hpp"
 
 namespace Sega {
 namespace MasterSystem {
 
+std::vector<std::unique_ptr<Configurable::Option>> get_options();
+
 class Machine {
 	public:
 		virtual ~Machine();
diff --git a/OSBindings/Mac/Clock Signal.xcodeproj/xcshareddata/xcschemes/Clock Signal.xcscheme b/OSBindings/Mac/Clock Signal.xcodeproj/xcshareddata/xcschemes/Clock Signal.xcscheme
index f9049689f..782b17c09 100644
--- a/OSBindings/Mac/Clock Signal.xcodeproj/xcshareddata/xcschemes/Clock Signal.xcscheme	
+++ b/OSBindings/Mac/Clock Signal.xcodeproj/xcshareddata/xcschemes/Clock Signal.xcscheme	
@@ -68,7 +68,7 @@
       </AdditionalOptions>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Debug"
+      buildConfiguration = "Release"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       enableASanStackUseAfterReturn = "YES"
diff --git a/OSBindings/Mac/Clock Signal/Machine/StaticAnalyser/CSStaticAnalyser.mm b/OSBindings/Mac/Clock Signal/Machine/StaticAnalyser/CSStaticAnalyser.mm
index f1933c417..202493b1a 100644
--- a/OSBindings/Mac/Clock Signal/Machine/StaticAnalyser/CSStaticAnalyser.mm	
+++ b/OSBindings/Mac/Clock Signal/Machine/StaticAnalyser/CSStaticAnalyser.mm	
@@ -188,14 +188,15 @@ static Analyser::Static::ZX8081::Target::MemoryModel ZX8081MemoryModelFromSize(K
 
 - (NSString *)optionsPanelNibName {
 	switch(_targets.front()->machine) {
-		case Analyser::Machine::AmstradCPC:	return @"CompositeOptions";
-//		case Analyser::Machine::AppleII:	return @"AppleIIOptions";
-		case Analyser::Machine::Atari2600:	return @"Atari2600Options";
-		case Analyser::Machine::Electron:	return @"QuickLoadCompositeOptions";
-		case Analyser::Machine::MSX:		return @"QuickLoadCompositeOptions";
-		case Analyser::Machine::Oric:		return @"OricOptions";
-		case Analyser::Machine::Vic20:		return @"QuickLoadCompositeOptions";
-		case Analyser::Machine::ZX8081:		return @"ZX8081Options";
+		case Analyser::Machine::AmstradCPC:		return @"CompositeOptions";
+//		case Analyser::Machine::AppleII:		return @"AppleIIOptions";
+		case Analyser::Machine::Atari2600:		return @"Atari2600Options";
+		case Analyser::Machine::Electron:		return @"QuickLoadCompositeOptions";
+		case Analyser::Machine::MasterSystem:	return @"CompositeOptions";
+		case Analyser::Machine::MSX:			return @"QuickLoadCompositeOptions";
+		case Analyser::Machine::Oric:			return @"OricOptions";
+		case Analyser::Machine::Vic20:			return @"QuickLoadCompositeOptions";
+		case Analyser::Machine::ZX8081:			return @"ZX8081Options";
 		default: return nil;
 	}
 }