diff --git a/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj b/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj index 443cd4882..3e65642b2 100644 --- a/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj +++ b/OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj @@ -1434,7 +1434,6 @@ 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 = ""; }; 4BBC951C1F368D83008F4C34 /* i8272.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = i8272.cpp; path = 8272/i8272.cpp; sourceTree = ""; }; 4BBC951D1F368D83008F4C34 /* i8272.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = i8272.hpp; path = 8272/i8272.hpp; sourceTree = ""; }; 4BBF49AE1ED2880200AB3669 /* FUSETests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FUSETests.swift; sourceTree = ""; }; @@ -1774,7 +1773,6 @@ 4B2A53921D117D36003C6002 /* Machine */ = { isa = PBXGroup; children = ( - 4BBC34241D2208B100FFC9DF /* CSFastLoading.h */, 4B2A53951D117D36003C6002 /* CSMachine.h */, 4B643F3C1D77AE5C00D431D6 /* CSMachine+Target.h */, 4B2A53971D117D36003C6002 /* KeyCodes.h */, diff --git a/OSBindings/Mac/Clock Signal/ClockSignal-Bridging-Header.h b/OSBindings/Mac/Clock Signal/ClockSignal-Bridging-Header.h index 5b21dd3fc..c39778ffd 100644 --- a/OSBindings/Mac/Clock Signal/ClockSignal-Bridging-Header.h +++ b/OSBindings/Mac/Clock Signal/ClockSignal-Bridging-Header.h @@ -3,7 +3,6 @@ // #import "CSMachine.h" -#import "CSFastLoading.h" #import "CSAtari2600.h" #import "CSZX8081.h" diff --git a/OSBindings/Mac/Clock Signal/Documents/MachinePanel.swift b/OSBindings/Mac/Clock Signal/Documents/MachinePanel.swift index 00cee7a17..c75998e14 100644 --- a/OSBindings/Mac/Clock Signal/Documents/MachinePanel.swift +++ b/OSBindings/Mac/Clock Signal/Documents/MachinePanel.swift @@ -22,11 +22,9 @@ class MachinePanel: NSPanel { } @IBOutlet var fastLoadingButton: NSButton? @IBAction func setFastLoading(_ sender: NSButton!) { - if let fastLoadingMachine = machine as? CSFastLoading { - let useFastLoadingHack = sender.state == .on - fastLoadingMachine.useFastLoadingHack = useFastLoadingHack - UserDefaults.standard.set(useFastLoadingHack, forKey: fastLoadingUserDefaultsKey) - } + let useFastLoadingHack = sender.state == .on + machine.useFastLoadingHack = useFastLoadingHack + UserDefaults.standard.set(useFastLoadingHack, forKey: fastLoadingUserDefaultsKey) } // MARK: Quick Boot @@ -71,10 +69,10 @@ class MachinePanel: NSPanel { displayTypeUserDefaultsKey: 0 ]) - if let fastLoadingMachine = machine as? CSFastLoading { + if let fastLoadingButton = self.fastLoadingButton { let useFastLoadingHack = standardUserDefaults.bool(forKey: self.fastLoadingUserDefaultsKey) - fastLoadingMachine.useFastLoadingHack = useFastLoadingHack - self.fastLoadingButton?.state = useFastLoadingHack ? .on : .off + machine.useFastLoadingHack = useFastLoadingHack + fastLoadingButton.state = useFastLoadingHack ? .on : .off } if let fastBootingButton = self.fastBootingButton { diff --git a/OSBindings/Mac/Clock Signal/Machine/CSFastLoading.h b/OSBindings/Mac/Clock Signal/Machine/CSFastLoading.h deleted file mode 100644 index 896f2d2dd..000000000 --- a/OSBindings/Mac/Clock Signal/Machine/CSFastLoading.h +++ /dev/null @@ -1,11 +0,0 @@ -// -// CSFastLoading.h -// Clock Signal -// -// Created by Thomas Harte on 05/06/2016. -// Copyright 2016 Thomas Harte. All rights reserved. -// - -@protocol CSFastLoading -@property (nonatomic, assign) BOOL useFastLoadingHack; -@end diff --git a/OSBindings/Mac/Clock Signal/Machine/CSMachine.h b/OSBindings/Mac/Clock Signal/Machine/CSMachine.h index ddde679f3..660bd3bf8 100644 --- a/OSBindings/Mac/Clock Signal/Machine/CSMachine.h +++ b/OSBindings/Mac/Clock Signal/Machine/CSMachine.h @@ -9,7 +9,6 @@ #import #import "CSAudioQueue.h" -#import "CSFastLoading.h" #import "CSOpenGLView.h" #import "CSStaticAnalyser.h" #import "CSJoystickManager.h" diff --git a/OSBindings/Mac/Clock Signal/Machine/CSMachine.mm b/OSBindings/Mac/Clock Signal/Machine/CSMachine.mm index 66492fc07..af942fb81 100644 --- a/OSBindings/Mac/Clock Signal/Machine/CSMachine.mm +++ b/OSBindings/Mac/Clock Signal/Machine/CSMachine.mm @@ -32,7 +32,7 @@ #include "../../../../Outputs/OpenGL/ScanTarget.hpp" #include "../../../../Outputs/OpenGL/Screenshot.hpp" -@interface CSMachine() +@interface CSMachine() - (void)speaker:(Outputs::Speaker::Speaker *)speaker didCompleteSamples:(const int16_t *)samples length:(int)length; - (void)speakerDidChangeInputClock:(Outputs::Speaker::Speaker *)speaker; - (void)addLED:(NSString *)led;