From 7e58a44771516023ef3aa6caa131582c77e1cdd3 Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Tue, 10 Jul 2018 21:32:28 -0400 Subject: [PATCH] Renames `ConfigurationTarget` to `MediaTarget` as per its newly-reduced interface. --- .../MultiConfigurationTarget.cpp | 26 ------------------- .../Implementation/MultiMediaTarget.cpp | 26 +++++++++++++++++++ ...urationTarget.hpp => MultiMediaTarget.hpp} | 18 ++++++------- .../Dynamic/MultiMachine/MultiMachine.cpp | 10 +++---- .../Dynamic/MultiMachine/MultiMachine.hpp | 8 +++--- Machines/AmstradCPC/AmstradCPC.cpp | 4 +-- Machines/AppleII/AppleII.cpp | 6 ++--- Machines/Atari2600/Atari2600.cpp | 2 +- Machines/ColecoVision/ColecoVision.cpp | 4 +-- Machines/Commodore/Vic-20/Vic20.cpp | 4 +-- Machines/DynamicMachine.hpp | 6 ++--- Machines/Electron/Electron.cpp | 4 +-- Machines/MSX/MSX.cpp | 4 +-- ...onfigurationTarget.hpp => MediaTarget.hpp} | 12 ++++----- Machines/Oric/Oric.cpp | 4 +-- Machines/Utility/TypedDynamicMachine.hpp | 4 +-- Machines/ZX8081/ZX8081.cpp | 4 +-- .../Clock Signal.xcodeproj/project.pbxproj | 20 +++++++------- .../Mac/Clock Signal/Machine/CSMachine.mm | 6 ++--- OSBindings/SDL/main.cpp | 4 +-- 20 files changed, 88 insertions(+), 88 deletions(-) delete mode 100644 Analyser/Dynamic/MultiMachine/Implementation/MultiConfigurationTarget.cpp create mode 100644 Analyser/Dynamic/MultiMachine/Implementation/MultiMediaTarget.cpp rename Analyser/Dynamic/MultiMachine/Implementation/{MultiConfigurationTarget.hpp => MultiMediaTarget.hpp} (51%) rename Machines/{ConfigurationTarget.hpp => MediaTarget.hpp} (70%) diff --git a/Analyser/Dynamic/MultiMachine/Implementation/MultiConfigurationTarget.cpp b/Analyser/Dynamic/MultiMachine/Implementation/MultiConfigurationTarget.cpp deleted file mode 100644 index 32691fdc7..000000000 --- a/Analyser/Dynamic/MultiMachine/Implementation/MultiConfigurationTarget.cpp +++ /dev/null @@ -1,26 +0,0 @@ -// -// MultiConfigurationTarget.cpp -// Clock Signal -// -// Created by Thomas Harte on 29/01/2018. -// Copyright 2018 Thomas Harte. All rights reserved. -// - -#include "MultiConfigurationTarget.hpp" - -using namespace Analyser::Dynamic; - -MultiConfigurationTarget::MultiConfigurationTarget(const std::vector> &machines) { - for(const auto &machine: machines) { - ConfigurationTarget::Machine *configuration_target = machine->configuration_target(); - if(configuration_target) targets_.push_back(configuration_target); - } -} - -bool MultiConfigurationTarget::insert_media(const Analyser::Static::Media &media) { - bool inserted = false; - for(const auto &target : targets_) { - inserted |= target->insert_media(media); - } - return inserted; -} diff --git a/Analyser/Dynamic/MultiMachine/Implementation/MultiMediaTarget.cpp b/Analyser/Dynamic/MultiMachine/Implementation/MultiMediaTarget.cpp new file mode 100644 index 000000000..328586731 --- /dev/null +++ b/Analyser/Dynamic/MultiMachine/Implementation/MultiMediaTarget.cpp @@ -0,0 +1,26 @@ +// +// MultiMediaTarget.cpp +// Clock Signal +// +// Created by Thomas Harte on 29/01/2018. +// Copyright 2018 Thomas Harte. All rights reserved. +// + +#include "MultiMediaTarget.hpp" + +using namespace Analyser::Dynamic; + +MultiMediaTarget::MultiMediaTarget(const std::vector> &machines) { + for(const auto &machine: machines) { + MediaTarget::Machine *media_target = machine->media_target(); + if(media_target) targets_.push_back(media_target); + } +} + +bool MultiMediaTarget::insert_media(const Analyser::Static::Media &media) { + bool inserted = false; + for(const auto &target : targets_) { + inserted |= target->insert_media(media); + } + return inserted; +} diff --git a/Analyser/Dynamic/MultiMachine/Implementation/MultiConfigurationTarget.hpp b/Analyser/Dynamic/MultiMachine/Implementation/MultiMediaTarget.hpp similarity index 51% rename from Analyser/Dynamic/MultiMachine/Implementation/MultiConfigurationTarget.hpp rename to Analyser/Dynamic/MultiMachine/Implementation/MultiMediaTarget.hpp index d93fe6953..8b9fd1295 100644 --- a/Analyser/Dynamic/MultiMachine/Implementation/MultiConfigurationTarget.hpp +++ b/Analyser/Dynamic/MultiMachine/Implementation/MultiMediaTarget.hpp @@ -1,15 +1,15 @@ // -// MultiConfigurationTarget.hpp +// MultiMediaTarget.hpp // Clock Signal // // Created by Thomas Harte on 29/01/2018. // Copyright 2018 Thomas Harte. All rights reserved. // -#ifndef MultiConfigurationTarget_hpp -#define MultiConfigurationTarget_hpp +#ifndef MultiMediaTarget_hpp +#define MultiMediaTarget_hpp -#include "../../../../Machines/ConfigurationTarget.hpp" +#include "../../../../Machines/MediaTarget.hpp" #include "../../../../Machines/DynamicMachine.hpp" #include @@ -24,18 +24,18 @@ namespace Dynamic { Makes a static internal copy of the list of machines; makes no guarantees about the order of delivered messages. */ -struct MultiConfigurationTarget: public ConfigurationTarget::Machine { +struct MultiMediaTarget: public MediaTarget::Machine { public: - MultiConfigurationTarget(const std::vector> &machines); + MultiMediaTarget(const std::vector> &machines); - // Below is the standard ConfigurationTarget::Machine interface; see there for documentation. + // Below is the standard MediaTarget::Machine interface; see there for documentation. bool insert_media(const Analyser::Static::Media &media) override; private: - std::vector targets_; + std::vector targets_; }; } } -#endif /* MultiConfigurationTarget_hpp */ +#endif /* MultiMediaTarget_hpp */ diff --git a/Analyser/Dynamic/MultiMachine/MultiMachine.cpp b/Analyser/Dynamic/MultiMachine/MultiMachine.cpp index a60efb0c2..2a8eb80f7 100644 --- a/Analyser/Dynamic/MultiMachine/MultiMachine.cpp +++ b/Analyser/Dynamic/MultiMachine/MultiMachine.cpp @@ -15,10 +15,10 @@ using namespace Analyser::Dynamic; MultiMachine::MultiMachine(std::vector> &&machines) : machines_(std::move(machines)), configurable_(machines_), - configuration_target_(machines_), crt_machine_(machines_, machines_mutex_), joystick_machine_(machines), - keyboard_machine_(machines_) { + keyboard_machine_(machines_), + media_target_(machines_) { crt_machine_.set_delegate(this); } @@ -26,11 +26,11 @@ Activity::Source *MultiMachine::activity_source() { return nullptr; // TODO } -ConfigurationTarget::Machine *MultiMachine::configuration_target() { +MediaTarget::Machine *MultiMachine::media_target() { if(has_picked_) { - return machines_.front()->configuration_target(); + return machines_.front()->media_target(); } else { - return &configuration_target_; + return &media_target_; } } diff --git a/Analyser/Dynamic/MultiMachine/MultiMachine.hpp b/Analyser/Dynamic/MultiMachine/MultiMachine.hpp index 7b3f26455..d6e849ed6 100644 --- a/Analyser/Dynamic/MultiMachine/MultiMachine.hpp +++ b/Analyser/Dynamic/MultiMachine/MultiMachine.hpp @@ -12,10 +12,10 @@ #include "../../../Machines/DynamicMachine.hpp" #include "Implementation/MultiConfigurable.hpp" -#include "Implementation/MultiConfigurationTarget.hpp" #include "Implementation/MultiCRTMachine.hpp" #include "Implementation/MultiJoystickMachine.hpp" #include "Implementation/MultiKeyboardMachine.hpp" +#include "Implementation/MultiMediaTarget.hpp" #include #include @@ -51,11 +51,11 @@ class MultiMachine: public ::Machine::DynamicMachine, public MultiCRTMachine::De MultiMachine(std::vector> &&machines); Activity::Source *activity_source() override; - ConfigurationTarget::Machine *configuration_target() override; + Configurable::Device *configurable_device() override; CRTMachine::Machine *crt_machine() override; JoystickMachine::Machine *joystick_machine() override; KeyboardMachine::Machine *keyboard_machine() override; - Configurable::Device *configurable_device() override; + MediaTarget::Machine *media_target() override; void *raw_pointer() override; private: @@ -65,10 +65,10 @@ class MultiMachine: public ::Machine::DynamicMachine, public MultiCRTMachine::De std::mutex machines_mutex_; MultiConfigurable configurable_; - MultiConfigurationTarget configuration_target_; MultiCRTMachine crt_machine_; MultiJoystickMachine joystick_machine_; MultiKeyboardMachine keyboard_machine_; + MultiMediaTarget media_target_; void pick_first(); bool has_picked_ = false; diff --git a/Machines/AmstradCPC/AmstradCPC.cpp b/Machines/AmstradCPC/AmstradCPC.cpp index 752855cb3..92d146720 100644 --- a/Machines/AmstradCPC/AmstradCPC.cpp +++ b/Machines/AmstradCPC/AmstradCPC.cpp @@ -21,7 +21,7 @@ #include "../Utility/Typer.hpp" #include "../../Activity/Source.hpp" -#include "../ConfigurationTarget.hpp" +#include "../MediaTarget.hpp" #include "../CRTMachine.hpp" #include "../JoystickMachine.hpp" #include "../KeyboardMachine.hpp" @@ -756,7 +756,7 @@ class i8255PortHandler : public Intel::i8255::PortHandler { */ template class ConcreteMachine: public CRTMachine::Machine, - public ConfigurationTarget::Machine, + public MediaTarget::Machine, public KeyboardMachine::Machine, public Utility::TypeRecipient, public CPU::Z80::BusHandler, diff --git a/Machines/AppleII/AppleII.cpp b/Machines/AppleII/AppleII.cpp index 192dddebd..f6ed1eb20 100644 --- a/Machines/AppleII/AppleII.cpp +++ b/Machines/AppleII/AppleII.cpp @@ -9,7 +9,7 @@ #include "AppleII.hpp" #include "../../Activity/Source.hpp" -#include "../ConfigurationTarget.hpp" +#include "../MediaTarget.hpp" #include "../CRTMachine.hpp" #include "../JoystickMachine.hpp" #include "../KeyboardMachine.hpp" @@ -45,7 +45,7 @@ namespace { class ConcreteMachine: public CRTMachine::Machine, - public ConfigurationTarget::Machine, + public MediaTarget::Machine, public KeyboardMachine::Machine, public Configurable::Device, public CPU::MOS6502::BusHandler, @@ -662,7 +662,7 @@ class ConcreteMachine: string_serialiser_.reset(new Utility::StringSerialiser(string, true)); } - // MARK: ConfigurationTarget + // MARK: MediaTarget bool insert_media(const Analyser::Static::Media &media) override { if(!media.disks.empty()) { auto diskii = diskii_card(); diff --git a/Machines/Atari2600/Atari2600.cpp b/Machines/Atari2600/Atari2600.cpp index c28410d03..63dd7939f 100644 --- a/Machines/Atari2600/Atari2600.cpp +++ b/Machines/Atari2600/Atari2600.cpp @@ -11,7 +11,7 @@ #include #include -#include "../ConfigurationTarget.hpp" +#include "../MediaTarget.hpp" #include "../CRTMachine.hpp" #include "../JoystickMachine.hpp" diff --git a/Machines/ColecoVision/ColecoVision.cpp b/Machines/ColecoVision/ColecoVision.cpp index 4fcfd3157..74dd77ef1 100644 --- a/Machines/ColecoVision/ColecoVision.cpp +++ b/Machines/ColecoVision/ColecoVision.cpp @@ -14,7 +14,7 @@ #include "../../Components/AY38910/AY38910.hpp" // For the Super Game Module. #include "../../Components/SN76489/SN76489.hpp" -#include "../ConfigurationTarget.hpp" +#include "../MediaTarget.hpp" #include "../CRTMachine.hpp" #include "../JoystickMachine.hpp" @@ -108,7 +108,7 @@ class ConcreteMachine: public Machine, public CPU::Z80::BusHandler, public CRTMachine::Machine, - public ConfigurationTarget::Machine, + public MediaTarget::Machine, public JoystickMachine::Machine { public: diff --git a/Machines/Commodore/Vic-20/Vic20.cpp b/Machines/Commodore/Vic-20/Vic20.cpp index 088cd49f6..f4eb15ef7 100644 --- a/Machines/Commodore/Vic-20/Vic20.cpp +++ b/Machines/Commodore/Vic-20/Vic20.cpp @@ -11,7 +11,7 @@ #include "Keyboard.hpp" #include "../../../Activity/Source.hpp" -#include "../../ConfigurationTarget.hpp" +#include "../../MediaTarget.hpp" #include "../../CRTMachine.hpp" #include "../../KeyboardMachine.hpp" #include "../../JoystickMachine.hpp" @@ -280,7 +280,7 @@ class Joystick: public Inputs::ConcreteJoystick { class ConcreteMachine: public CRTMachine::Machine, - public ConfigurationTarget::Machine, + public MediaTarget::Machine, public KeyboardMachine::Machine, public JoystickMachine::Machine, public Configurable::Device, diff --git a/Machines/DynamicMachine.hpp b/Machines/DynamicMachine.hpp index d75f323a3..bcc59b965 100644 --- a/Machines/DynamicMachine.hpp +++ b/Machines/DynamicMachine.hpp @@ -11,7 +11,7 @@ #include "../Configurable/Configurable.hpp" #include "../Activity/Source.hpp" -#include "ConfigurationTarget.hpp" +#include "MediaTarget.hpp" #include "CRTMachine.hpp" #include "JoystickMachine.hpp" #include "KeyboardMachine.hpp" @@ -27,11 +27,11 @@ struct DynamicMachine { virtual ~DynamicMachine() {} virtual Activity::Source *activity_source() = 0; - virtual ConfigurationTarget::Machine *configuration_target() = 0; + virtual Configurable::Device *configurable_device() = 0; virtual CRTMachine::Machine *crt_machine() = 0; virtual JoystickMachine::Machine *joystick_machine() = 0; virtual KeyboardMachine::Machine *keyboard_machine() = 0; - virtual Configurable::Device *configurable_device() = 0; + virtual MediaTarget::Machine *media_target() = 0; /*! Provides a raw pointer to the underlying machine if and only if this dynamic machine really is diff --git a/Machines/Electron/Electron.cpp b/Machines/Electron/Electron.cpp index defa8a718..08af2995b 100644 --- a/Machines/Electron/Electron.cpp +++ b/Machines/Electron/Electron.cpp @@ -9,7 +9,7 @@ #include "Electron.hpp" #include "../../Activity/Source.hpp" -#include "../ConfigurationTarget.hpp" +#include "../MediaTarget.hpp" #include "../CRTMachine.hpp" #include "../KeyboardMachine.hpp" @@ -41,7 +41,7 @@ std::vector> get_options() { class ConcreteMachine: public Machine, public CRTMachine::Machine, - public ConfigurationTarget::Machine, + public MediaTarget::Machine, public KeyboardMachine::Machine, public Configurable::Device, public CPU::MOS6502::BusHandler, diff --git a/Machines/MSX/MSX.cpp b/Machines/MSX/MSX.cpp index fec603a7d..eb9072bed 100644 --- a/Machines/MSX/MSX.cpp +++ b/Machines/MSX/MSX.cpp @@ -32,7 +32,7 @@ #include "../../Activity/Source.hpp" #include "../CRTMachine.hpp" -#include "../ConfigurationTarget.hpp" +#include "../MediaTarget.hpp" #include "../KeyboardMachine.hpp" #include "../../Outputs/Speaker/Implementation/CompoundSource.hpp" @@ -84,7 +84,7 @@ class ConcreteMachine: public Machine, public CPU::Z80::BusHandler, public CRTMachine::Machine, - public ConfigurationTarget::Machine, + public MediaTarget::Machine, public KeyboardMachine::Machine, public Configurable::Device, public MemoryMap, diff --git a/Machines/ConfigurationTarget.hpp b/Machines/MediaTarget.hpp similarity index 70% rename from Machines/ConfigurationTarget.hpp rename to Machines/MediaTarget.hpp index a1fdf57c5..59a2c1d53 100644 --- a/Machines/ConfigurationTarget.hpp +++ b/Machines/MediaTarget.hpp @@ -1,23 +1,23 @@ // -// ConfigurationTarget.h +// MediaTarget.h // Clock Signal // // Created by Thomas Harte on 08/09/2016. // Copyright 2016 Thomas Harte. All rights reserved. // -#ifndef ConfigurationTarget_hpp -#define ConfigurationTarget_hpp +#ifndef MediaTarget_hpp +#define MediaTarget_hpp #include "../Analyser/Static/StaticAnalyser.hpp" #include "../Configurable/Configurable.hpp" #include -namespace ConfigurationTarget { +namespace MediaTarget { /*! - A ConfigurationTarget::Machine is anything that can accept a Analyser::Static::Target + A MediaTarget::Machine is anything that can accept a Analyser::Static::Target and configure itself appropriately, or accept a list of media subsequently to insert. */ class Machine { @@ -32,4 +32,4 @@ class Machine { } -#endif /* ConfigurationTarget_h */ +#endif /* MediaTarget_hpp */ diff --git a/Machines/Oric/Oric.cpp b/Machines/Oric/Oric.cpp index bddc76f69..1dd153f58 100644 --- a/Machines/Oric/Oric.cpp +++ b/Machines/Oric/Oric.cpp @@ -13,7 +13,7 @@ #include "Video.hpp" #include "../../Activity/Source.hpp" -#include "../ConfigurationTarget.hpp" +#include "../MediaTarget.hpp" #include "../CRTMachine.hpp" #include "../KeyboardMachine.hpp" @@ -193,7 +193,7 @@ class VIAPortHandler: public MOS::MOS6522::IRQDelegatePortHandler { template class ConcreteMachine: public CRTMachine::Machine, - public ConfigurationTarget::Machine, + public MediaTarget::Machine, public KeyboardMachine::Machine, public Configurable::Device, public CPU::MOS6502::BusHandler, diff --git a/Machines/Utility/TypedDynamicMachine.hpp b/Machines/Utility/TypedDynamicMachine.hpp index c76d62ada..a559c94e0 100644 --- a/Machines/Utility/TypedDynamicMachine.hpp +++ b/Machines/Utility/TypedDynamicMachine.hpp @@ -29,8 +29,8 @@ template class TypedDynamicMachine: public ::Machine::DynamicMachine return get(); } - ConfigurationTarget::Machine *configuration_target() override { - return get(); + MediaTarget::Machine *media_target() override { + return get(); } CRTMachine::Machine *crt_machine() override { diff --git a/Machines/ZX8081/ZX8081.cpp b/Machines/ZX8081/ZX8081.cpp index 0a1c67cf4..4fe9ddbcb 100644 --- a/Machines/ZX8081/ZX8081.cpp +++ b/Machines/ZX8081/ZX8081.cpp @@ -8,7 +8,7 @@ #include "ZX8081.hpp" -#include "../ConfigurationTarget.hpp" +#include "../MediaTarget.hpp" #include "../CRTMachine.hpp" #include "../KeyboardMachine.hpp" @@ -59,7 +59,7 @@ std::vector> get_options() { template class ConcreteMachine: public CRTMachine::Machine, - public ConfigurationTarget::Machine, + public MediaTarget::Machine, public KeyboardMachine::Machine, public Configurable::Device, public Utility::TypeRecipient, diff --git a/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj b/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj index 2979bd475..44f629ee4 100644 --- a/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj +++ b/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj @@ -595,8 +595,8 @@ 4BB73EB71B587A5100552FC2 /* AllSuiteATests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BB73EB61B587A5100552FC2 /* AllSuiteATests.swift */; }; 4BB73EC21B587A5100552FC2 /* Clock_SignalUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BB73EC11B587A5100552FC2 /* Clock_SignalUITests.swift */; }; 4BBB14311CD2CECE00BDB55C /* IntermediateShader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BBB142F1CD2CECE00BDB55C /* IntermediateShader.cpp */; }; - 4BBB70A4202011C2002FE009 /* MultiConfigurationTarget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BBB70A3202011C2002FE009 /* MultiConfigurationTarget.cpp */; }; - 4BBB70A5202011C2002FE009 /* MultiConfigurationTarget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BBB70A3202011C2002FE009 /* MultiConfigurationTarget.cpp */; }; + 4BBB70A4202011C2002FE009 /* MultiMediaTarget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BBB70A3202011C2002FE009 /* MultiMediaTarget.cpp */; }; + 4BBB70A5202011C2002FE009 /* MultiMediaTarget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BBB70A3202011C2002FE009 /* MultiMediaTarget.cpp */; }; 4BBB70A8202014E2002FE009 /* MultiCRTMachine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BBB70A6202014E2002FE009 /* MultiCRTMachine.cpp */; }; 4BBB70A9202014E2002FE009 /* MultiCRTMachine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BBB70A6202014E2002FE009 /* MultiCRTMachine.cpp */; }; 4BBC951E1F368D83008F4C34 /* i8272.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BBC951C1F368D83008F4C34 /* i8272.cpp */; }; @@ -1027,7 +1027,7 @@ 4BA141C12073100800A31EC9 /* Target.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = Target.hpp; sourceTree = ""; }; 4BA61EAE1D91515900B3C876 /* NSData+StdVector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSData+StdVector.h"; sourceTree = ""; }; 4BA61EAF1D91515900B3C876 /* NSData+StdVector.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "NSData+StdVector.mm"; sourceTree = ""; }; - 4BA9C3CF1D8164A9002DDB61 /* ConfigurationTarget.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = ConfigurationTarget.hpp; sourceTree = ""; }; + 4BA9C3CF1D8164A9002DDB61 /* MediaTarget.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = MediaTarget.hpp; sourceTree = ""; }; 4BAB62AC1D3272D200DF5BA0 /* Disk.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = Disk.hpp; sourceTree = ""; }; 4BAB62AE1D32730D00DF5BA0 /* Storage.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = Storage.hpp; sourceTree = ""; }; 4BAF2B4C2004580C00480230 /* DMK.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = DMK.cpp; sourceTree = ""; }; @@ -1324,8 +1324,8 @@ 4BBB142F1CD2CECE00BDB55C /* IntermediateShader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IntermediateShader.cpp; sourceTree = ""; }; 4BBB14301CD2CECE00BDB55C /* IntermediateShader.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = IntermediateShader.hpp; sourceTree = ""; }; 4BBB709C2020109C002FE009 /* DynamicMachine.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = DynamicMachine.hpp; sourceTree = ""; }; - 4BBB70A2202011C2002FE009 /* MultiConfigurationTarget.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = MultiConfigurationTarget.hpp; sourceTree = ""; }; - 4BBB70A3202011C2002FE009 /* MultiConfigurationTarget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MultiConfigurationTarget.cpp; sourceTree = ""; }; + 4BBB70A2202011C2002FE009 /* MultiMediaTarget.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = MultiMediaTarget.hpp; sourceTree = ""; }; + 4BBB70A3202011C2002FE009 /* MultiMediaTarget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MultiMediaTarget.cpp; sourceTree = ""; }; 4BBB70A6202014E2002FE009 /* MultiCRTMachine.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = MultiCRTMachine.cpp; sourceTree = ""; }; 4BBB70A7202014E2002FE009 /* MultiCRTMachine.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = MultiCRTMachine.hpp; sourceTree = ""; }; 4BBC34241D2208B100FFC9DF /* CSFastLoading.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSFastLoading.h; sourceTree = ""; }; @@ -2820,7 +2820,7 @@ isa = PBXGroup; children = ( 4B54C0BB1F8D8E790050900F /* KeyboardMachine.cpp */, - 4BA9C3CF1D8164A9002DDB61 /* ConfigurationTarget.hpp */, + 4BA9C3CF1D8164A9002DDB61 /* MediaTarget.hpp */, 4B046DC31CFE651500E9E45E /* CRTMachine.hpp */, 4BBB709C2020109C002FE009 /* DynamicMachine.hpp */, 4B7041271F92C26900735E45 /* JoystickMachine.hpp */, @@ -2858,16 +2858,16 @@ isa = PBXGroup; children = ( 4B1B88BE202E3DB200B67DFF /* MultiConfigurable.cpp */, - 4BBB70A3202011C2002FE009 /* MultiConfigurationTarget.cpp */, 4BBB70A6202014E2002FE009 /* MultiCRTMachine.cpp */, 4B1B88C6202E469300B67DFF /* MultiJoystickMachine.cpp */, 4B1B88B9202E2EC100B67DFF /* MultiKeyboardMachine.cpp */, + 4BBB70A3202011C2002FE009 /* MultiMediaTarget.cpp */, 4B9BE3FE203A0C0600FFAE60 /* MultiSpeaker.cpp */, 4B1B88BF202E3DB200B67DFF /* MultiConfigurable.hpp */, - 4BBB70A2202011C2002FE009 /* MultiConfigurationTarget.hpp */, 4BBB70A7202014E2002FE009 /* MultiCRTMachine.hpp */, 4B1B88C7202E469300B67DFF /* MultiJoystickMachine.hpp */, 4B1B88BA202E2EC100B67DFF /* MultiKeyboardMachine.hpp */, + 4BBB70A2202011C2002FE009 /* MultiMediaTarget.hpp */, 4B9BE3FF203A0C0600FFAE60 /* MultiSpeaker.hpp */, ); path = Implementation; @@ -3691,7 +3691,7 @@ 4BAD13441FF709C700FD114A /* MSX.cpp in Sources */, 4B055AC41FAE9AE80060FFFF /* Keyboard.cpp in Sources */, 4B055A941FAE85B50060FFFF /* CommodoreROM.cpp in Sources */, - 4BBB70A5202011C2002FE009 /* MultiConfigurationTarget.cpp in Sources */, + 4BBB70A5202011C2002FE009 /* MultiMediaTarget.cpp in Sources */, 4B1B88BD202E3D3D00B67DFF /* MultiMachine.cpp in Sources */, 4B055A971FAE85BB0060FFFF /* ZX8081.cpp in Sources */, 4B055AAD1FAE85FD0060FFFF /* PCMTrack.cpp in Sources */, @@ -3856,7 +3856,7 @@ 4B4518841F75E91A00926311 /* UnformattedTrack.cpp in Sources */, 4B55CE5D1C3B7D6F0093A61B /* CSOpenGLView.m in Sources */, 4B894528201967B4007DE474 /* Disk.cpp in Sources */, - 4BBB70A4202011C2002FE009 /* MultiConfigurationTarget.cpp in Sources */, + 4BBB70A4202011C2002FE009 /* MultiMediaTarget.cpp in Sources */, 4B89453A201967B4007DE474 /* StaticAnalyser.cpp in Sources */, 4BB697CB1D4B6D3E00248BDF /* TimedEventLoop.cpp in Sources */, 4B54C0C21F8D91CD0050900F /* Keyboard.cpp in Sources */, diff --git a/OSBindings/Mac/Clock Signal/Machine/CSMachine.mm b/OSBindings/Mac/Clock Signal/Machine/CSMachine.mm index ee3335573..52271e74f 100644 --- a/OSBindings/Mac/Clock Signal/Machine/CSMachine.mm +++ b/OSBindings/Mac/Clock Signal/Machine/CSMachine.mm @@ -11,7 +11,7 @@ #include "CSROMFetcher.hpp" -#include "ConfigurationTarget.hpp" +#include "MediaTarget.hpp" #include "JoystickMachine.hpp" #include "KeyboardMachine.hpp" #include "KeyCodes.h" @@ -199,8 +199,8 @@ struct ActivityObserver: public Activity::Observer { - (void)applyMedia:(const Analyser::Static::Media &)media { @synchronized(self) { - ConfigurationTarget::Machine *const configurationTarget = _machine->configuration_target(); - if(configurationTarget) configurationTarget->insert_media(media); + MediaTarget::Machine *const mediaTarget = _machine->media_target(); + if(mediaTarget) mediaTarget->insert_media(media); } } diff --git a/OSBindings/SDL/main.cpp b/OSBindings/SDL/main.cpp index 6101956cc..01c0045cf 100644 --- a/OSBindings/SDL/main.cpp +++ b/OSBindings/SDL/main.cpp @@ -16,7 +16,7 @@ #include "../../Analyser/Static/StaticAnalyser.hpp" #include "../../Machines/Utility/MachineForTarget.hpp" -#include "../../Machines/ConfigurationTarget.hpp" +#include "../../Machines/MediaTarget.hpp" #include "../../Machines/CRTMachine.hpp" #include "../../Concurrency/BestEffortUpdater.hpp" @@ -487,7 +487,7 @@ int main(int argc, char *argv[]) { case SDL_DROPFILE: { Analyser::Static::Media media = Analyser::Static::GetMedia(event.drop.file); - machine->configuration_target()->insert_media(media); + machine->media_target()->insert_media(media); } break; case SDL_KEYDOWN: