6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-11-23 03:32:32 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #654 from TomHarte/GoodbyeFastTapeProtocol

Browse Source 
Eliminates fast loading Objective-C/Swift protocol.
This commit is contained in:
Thomas Harte 2019-09-24 20:22:08 -04:00 committed by GitHub
commit 298694a881
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 7 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj
View File

@ -1434,7 +1434,6 @@
4BBB70A3202011C2002FE009 /* MultiMediaTarget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MultiMediaTarget.cpp; sourceTree = "<group>"; }; 4BBB70A3202011C2002FE009 /* MultiMediaTarget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MultiMediaTarget.cpp; sourceTree = "<group>"; };
4BBB70A6202014E2002FE009 /* MultiCRTMachine.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = MultiCRTMachine.cpp; sourceTree = "<group>"; }; 4BBB70A6202014E2002FE009 /* MultiCRTMachine.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = MultiCRTMachine.cpp; sourceTree = "<group>"; };
4BBB70A7202014E2002FE009 /* MultiCRTMachine.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = MultiCRTMachine.hpp; sourceTree = "<group>"; }; 4BBB70A7202014E2002FE009 /* MultiCRTMachine.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = MultiCRTMachine.hpp; sourceTree = "<group>"; };
4BBC34241D2208B100FFC9DF /* CSFastLoading.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSFastLoading.h; sourceTree = "<group>"; };
4BBC951C1F368D83008F4C34 /* i8272.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = i8272.cpp; path = 8272/i8272.cpp; sourceTree = "<group>"; }; 4BBC951C1F368D83008F4C34 /* i8272.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = i8272.cpp; path = 8272/i8272.cpp; sourceTree = "<group>"; };
4BBC951D1F368D83008F4C34 /* i8272.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = i8272.hpp; path = 8272/i8272.hpp; sourceTree = "<group>"; }; 4BBC951D1F368D83008F4C34 /* i8272.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = i8272.hpp; path = 8272/i8272.hpp; sourceTree = "<group>"; };
4BBF49AE1ED2880200AB3669 /* FUSETests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FUSETests.swift; sourceTree = "<group>"; }; 4BBF49AE1ED2880200AB3669 /* FUSETests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FUSETests.swift; sourceTree = "<group>"; };
@ -1774,7 +1773,6 @@
4B2A53921D117D36003C6002 /* Machine */ = { 4B2A53921D117D36003C6002 /* Machine */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
4BBC34241D2208B100FFC9DF /* CSFastLoading.h */,
4B2A53951D117D36003C6002 /* CSMachine.h */, 4B2A53951D117D36003C6002 /* CSMachine.h */,
4B643F3C1D77AE5C00D431D6 /* CSMachine+Target.h */, 4B643F3C1D77AE5C00D431D6 /* CSMachine+Target.h */,
4B2A53971D117D36003C6002 /* KeyCodes.h */, 4B2A53971D117D36003C6002 /* KeyCodes.h */,

1
OSBindings/Mac/Clock Signal/ClockSignal-Bridging-Header.h
View File

@ -3,7 +3,6 @@
// //
#import "CSMachine.h" #import "CSMachine.h"
#import "CSFastLoading.h"
#import "CSAtari2600.h" #import "CSAtari2600.h"
#import "CSZX8081.h" #import "CSZX8081.h"

14
OSBindings/Mac/Clock Signal/Documents/MachinePanel.swift
View File

@ -22,11 +22,9 @@ class MachinePanel: NSPanel {
} }
@IBOutlet var fastLoadingButton: NSButton? @IBOutlet var fastLoadingButton: NSButton?
@IBAction func setFastLoading(_ sender: NSButton!) { @IBAction func setFastLoading(_ sender: NSButton!) {
if let fastLoadingMachine = machine as? CSFastLoading { let useFastLoadingHack = sender.state == .on
let useFastLoadingHack = sender.state == .on machine.useFastLoadingHack = useFastLoadingHack
fastLoadingMachine.useFastLoadingHack = useFastLoadingHack UserDefaults.standard.set(useFastLoadingHack, forKey: fastLoadingUserDefaultsKey)
UserDefaults.standard.set(useFastLoadingHack, forKey: fastLoadingUserDefaultsKey)
}
} }
// MARK: Quick Boot // MARK: Quick Boot
@ -71,10 +69,10 @@ class MachinePanel: NSPanel {
displayTypeUserDefaultsKey: 0 displayTypeUserDefaultsKey: 0
]) ])
if let fastLoadingMachine = machine as? CSFastLoading { if let fastLoadingButton = self.fastLoadingButton {
let useFastLoadingHack = standardUserDefaults.bool(forKey: self.fastLoadingUserDefaultsKey) let useFastLoadingHack = standardUserDefaults.bool(forKey: self.fastLoadingUserDefaultsKey)
fastLoadingMachine.useFastLoadingHack = useFastLoadingHack machine.useFastLoadingHack = useFastLoadingHack
self.fastLoadingButton?.state = useFastLoadingHack ? .on : .off fastLoadingButton.state = useFastLoadingHack ? .on : .off
} }
if let fastBootingButton = self.fastBootingButton { if let fastBootingButton = self.fastBootingButton {

11
OSBindings/Mac/Clock Signal/Machine/CSFastLoading.h
View File

@ -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 <NSObject>
@property (nonatomic, assign) BOOL useFastLoadingHack;
@end

1
OSBindings/Mac/Clock Signal/Machine/CSMachine.h
View File

@ -9,7 +9,6 @@
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#import "CSAudioQueue.h" #import "CSAudioQueue.h"
#import "CSFastLoading.h"
#import "CSOpenGLView.h" #import "CSOpenGLView.h"
#import "CSStaticAnalyser.h" #import "CSStaticAnalyser.h"
#import "CSJoystickManager.h" #import "CSJoystickManager.h"

2
OSBindings/Mac/Clock Signal/Machine/CSMachine.mm
View File

@ -32,7 +32,7 @@
#include "../../../../Outputs/OpenGL/ScanTarget.hpp" #include "../../../../Outputs/OpenGL/ScanTarget.hpp"
#include "../../../../Outputs/OpenGL/Screenshot.hpp" #include "../../../../Outputs/OpenGL/Screenshot.hpp"
@interface CSMachine() <CSFastLoading> @interface CSMachine()
- (void)speaker:(Outputs::Speaker::Speaker *)speaker didCompleteSamples:(const int16_t *)samples length:(int)length; - (void)speaker:(Outputs::Speaker::Speaker *)speaker didCompleteSamples:(const int16_t *)samples length:(int)length;
- (void)speakerDidChangeInputClock:(Outputs::Speaker::Speaker *)speaker; - (void)speakerDidChangeInputClock:(Outputs::Speaker::Speaker *)speaker;
- (void)addLED:(NSString *)led; - (void)addLED:(NSString *)led;