Apple-2-Tools/ample
1
0 Fork 0
mirror of https://github.com/ksherlock/ample.git synced 2026-10-26 04:02:14 +00:00
Code Issues Projects Releases Wiki Activity

Compare commits

base: Apple-2-Tools/ample:r16
Apple-2-Tools/ample:master Apple-2-Tools/ample:trs Apple-2-Tools/ample:mainframe Apple-2-Tools/ample:hardened_runtime Apple-2-Tools/ample:bookmarks-1 Apple-2-Tools/ample:10.11 Apple-2-Tools/ample:macintosh
Apple-2-Tools/ample:r82 Apple-2-Tools/ample:r81 Apple-2-Tools/ample:r80 Apple-2-Tools/ample:r79 Apple-2-Tools/ample:r78 Apple-2-Tools/ample:r77 Apple-2-Tools/ample:r76 Apple-2-Tools/ample:r75 Apple-2-Tools/ample:r74 Apple-2-Tools/ample:r73 Apple-2-Tools/ample:r72 Apple-2-Tools/ample:r71 Apple-2-Tools/ample:r70 Apple-2-Tools/ample:r69 Apple-2-Tools/ample:r68 Apple-2-Tools/ample:r67 Apple-2-Tools/ample:r66 Apple-2-Tools/ample:r65 Apple-2-Tools/ample:r64 Apple-2-Tools/ample:r63 Apple-2-Tools/ample:r62 Apple-2-Tools/ample:r61 Apple-2-Tools/ample:r60 Apple-2-Tools/ample:r59 Apple-2-Tools/ample:r58 Apple-2-Tools/ample:r57 Apple-2-Tools/ample:r56 Apple-2-Tools/ample:r55 Apple-2-Tools/ample:r54 Apple-2-Tools/ample:r53 Apple-2-Tools/ample:mainframe-1 Apple-2-Tools/ample:r51 Apple-2-Tools/ample:r52 Apple-2-Tools/ample:r50 Apple-2-Tools/ample:r49 Apple-2-Tools/ample:r48 Apple-2-Tools/ample:r47 Apple-2-Tools/ample:r46 Apple-2-Tools/ample:r45 Apple-2-Tools/ample:r44 Apple-2-Tools/ample:r43 Apple-2-Tools/ample:r42 Apple-2-Tools/ample:r41 Apple-2-Tools/ample:r40 Apple-2-Tools/ample:r39 Apple-2-Tools/ample:r38 Apple-2-Tools/ample:r37 Apple-2-Tools/ample:r36 Apple-2-Tools/ample:r35 Apple-2-Tools/ample:r33.1 Apple-2-Tools/ample:r33 Apple-2-Tools/ample:r31 Apple-2-Tools/ample:r30 Apple-2-Tools/ample:r29 Apple-2-Tools/ample:r28 Apple-2-Tools/ample:r27 Apple-2-Tools/ample:r26 Apple-2-Tools/ample:r25 Apple-2-Tools/ample:r24 Apple-2-Tools/ample:r23 Apple-2-Tools/ample:r22 Apple-2-Tools/ample:r21 Apple-2-Tools/ample:r20 Apple-2-Tools/ample:r19 Apple-2-Tools/ample:r18 Apple-2-Tools/ample:r17 Apple-2-Tools/ample:r16 Apple-2-Tools/ample:r15 Apple-2-Tools/ample:0.232 Apple-2-Tools/ample:0.231 Apple-2-Tools/ample:release-12 Apple-2-Tools/ample:release-11 Apple-2-Tools/ample:release-10 Apple-2-Tools/ample:release-9-1 Apple-2-Tools/ample:release-9 Apple-2-Tools/ample:release-8 Apple-2-Tools/ample:release-7 Apple-2-Tools/ample:pre-images Apple-2-Tools/ample:release-6 Apple-2-Tools/ample:release-5 Apple-2-Tools/ample:release-4 Apple-2-Tools/ample:release-3 Apple-2-Tools/ample:release-2 Apple-2-Tools/ample:release-1
..
compare: Apple-2-Tools/ample:bookmarks-1
Apple-2-Tools/ample:master Apple-2-Tools/ample:trs Apple-2-Tools/ample:mainframe Apple-2-Tools/ample:hardened_runtime Apple-2-Tools/ample:bookmarks-1 Apple-2-Tools/ample:10.11 Apple-2-Tools/ample:macintosh
Apple-2-Tools/ample:r82 Apple-2-Tools/ample:r81 Apple-2-Tools/ample:r80 Apple-2-Tools/ample:r79 Apple-2-Tools/ample:r78 Apple-2-Tools/ample:r77 Apple-2-Tools/ample:r76 Apple-2-Tools/ample:r75 Apple-2-Tools/ample:r74 Apple-2-Tools/ample:r73 Apple-2-Tools/ample:r72 Apple-2-Tools/ample:r71 Apple-2-Tools/ample:r70 Apple-2-Tools/ample:r69 Apple-2-Tools/ample:r68 Apple-2-Tools/ample:r67 Apple-2-Tools/ample:r66 Apple-2-Tools/ample:r65 Apple-2-Tools/ample:r64 Apple-2-Tools/ample:r63 Apple-2-Tools/ample:r62 Apple-2-Tools/ample:r61 Apple-2-Tools/ample:r60 Apple-2-Tools/ample:r59 Apple-2-Tools/ample:r58 Apple-2-Tools/ample:r57 Apple-2-Tools/ample:r56 Apple-2-Tools/ample:r55 Apple-2-Tools/ample:r54 Apple-2-Tools/ample:r53 Apple-2-Tools/ample:mainframe-1 Apple-2-Tools/ample:r51 Apple-2-Tools/ample:r52 Apple-2-Tools/ample:r50 Apple-2-Tools/ample:r49 Apple-2-Tools/ample:r48 Apple-2-Tools/ample:r47 Apple-2-Tools/ample:r46 Apple-2-Tools/ample:r45 Apple-2-Tools/ample:r44 Apple-2-Tools/ample:r43 Apple-2-Tools/ample:r42 Apple-2-Tools/ample:r41 Apple-2-Tools/ample:r40 Apple-2-Tools/ample:r39 Apple-2-Tools/ample:r38 Apple-2-Tools/ample:r37 Apple-2-Tools/ample:r36 Apple-2-Tools/ample:r35 Apple-2-Tools/ample:r33.1 Apple-2-Tools/ample:r33 Apple-2-Tools/ample:r31 Apple-2-Tools/ample:r30 Apple-2-Tools/ample:r29 Apple-2-Tools/ample:r28 Apple-2-Tools/ample:r27 Apple-2-Tools/ample:r26 Apple-2-Tools/ample:r25 Apple-2-Tools/ample:r24 Apple-2-Tools/ample:r23 Apple-2-Tools/ample:r22 Apple-2-Tools/ample:r21 Apple-2-Tools/ample:r20 Apple-2-Tools/ample:r19 Apple-2-Tools/ample:r18 Apple-2-Tools/ample:r17 Apple-2-Tools/ample:r16 Apple-2-Tools/ample:r15 Apple-2-Tools/ample:0.232 Apple-2-Tools/ample:0.231 Apple-2-Tools/ample:release-12 Apple-2-Tools/ample:release-11 Apple-2-Tools/ample:release-10 Apple-2-Tools/ample:release-9-1 Apple-2-Tools/ample:release-9 Apple-2-Tools/ample:release-8 Apple-2-Tools/ample:release-7 Apple-2-Tools/ample:pre-images Apple-2-Tools/ample:release-6 Apple-2-Tools/ample:release-5 Apple-2-Tools/ample:release-4 Apple-2-Tools/ample:release-3 Apple-2-Tools/ample:release-2 Apple-2-Tools/ample:release-1
10 Commits
r16 .. bookmarks-1
Author SHA1 Message Date
Kelvin Sherlock f628d99e4a load bookmark... 2021-06-04 00:21:08 -04:00
Kelvin Sherlock 0b248e6aad stringValue can't be nil. 2021-06-04 00:20:42 -04:00
Kelvin Sherlock 94aac38af4 add bookmark menu 2021-06-03 23:04:37 -04:00
Kelvin Sherlock 6215a0df12 slot view needs to know the machine. 2021-06-03 23:03:29 -04:00
Kelvin Sherlock d348c15dc5 transformer to enable/disable control based on string length. 2021-06-03 23:02:58 -04:00
Kelvin Sherlock e14336a009 shut up compiler warning. 2021-06-03 23:02:14 -04:00
Kelvin Sherlock 4baf545245 bookmark manager 2021-06-03 23:01:32 -04:00
Kelvin Sherlock 0f3e6c8307 more (untested) bookmark code 2021-05-31 23:54:29 -04:00
Kelvin Sherlock 8fdb149eb3 start of bookmarking support. Untested. 2021-05-31 16:13:43 -04:00
Kelvin Sherlock 787eac87f6 shut up warnings about content clipping. 
maybe it's a 10.11 thing.  The size was chosen by interface builder.
 2021-05-31 16:12:45 -04:00
109 changed files with 516 additions and 4277 deletions
Expand all files Collapse all files

No files matched your search

.gitignore
-3
View File
@@ -1,9 +1,6 @@
dist
embedded/mame64
embedded/SDL2.framework
embedded/Sparkle.framework
embedded/Sparkle-*
embedded/SDL2-*
build
embedded/mame-data.tgz
__pycache__
Ample.xcodeproj/project.pbxproj
+11 -84
View File
@@ -66,10 +66,6 @@
B615A9A026640A70001FBF99 /* SlotViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B6E9A17F25088B1B005E7525 /* SlotViewController.m */; };
B63005332666D6940014C381 /* BookmarkManager.m in Sources */ = {isa = PBXBuildFile; fileRef = B63005322666D6940014C381 /* BookmarkManager.m */; };
B63005342666D6940014C381 /* BookmarkManager.m in Sources */ = {isa = PBXBuildFile; fileRef = B63005322666D6940014C381 /* BookmarkManager.m */; };
B635C09A26784A1200B23BFD /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B635C09926784A1200B23BFD /* Sparkle.framework */; };
B635C09B26784A1200B23BFD /* Sparkle.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B635C09926784A1200B23BFD /* Sparkle.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
B635C09D26784A4800B23BFD /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B635C09C26784A4800B23BFD /* Sparkle.framework */; };
B635C09F26784D4700B23BFD /* AmpleLite.m in Sources */ = {isa = PBXBuildFile; fileRef = B635C09E26784D4700B23BFD /* AmpleLite.m */; };
B6374AC4260EBBCF0045CA16 /* pty_shell.c in Sources */ = {isa = PBXBuildFile; fileRef = B6374AB6260EBB970045CA16 /* pty_shell.c */; };
B6374AC5260EBC5A0045CA16 /* pty_shell in CopyFiles */ = {isa = PBXBuildFile; fileRef = B6374ABD260EBBC90045CA16 /* pty_shell */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
B6374AD1260ECB400045CA16 /* macclas2.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6374AC9260ECB3F0045CA16 /* macclas2.plist */; };
@@ -129,6 +125,7 @@
B64AF1F7250ED5E400A09B9B /* TableCellView.m in Sources */ = {isa = PBXBuildFile; fileRef = B64AF1F5250ED5E400A09B9B /* TableCellView.m */; };
B64AF1FA250EF6A500A09B9B /* Transformers.m in Sources */ = {isa = PBXBuildFile; fileRef = B64AF1F9250EF6A500A09B9B /* Transformers.m */; };
B64AF1FB250EF6A500A09B9B /* Transformers.m in Sources */ = {isa = PBXBuildFile; fileRef = B64AF1F9250EF6A500A09B9B /* Transformers.m */; };
B64E15A924EA1D5300E8AD3D /* MachineViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B64E15A824EA1D5300E8AD3D /* MachineViewController.m */; };
B65085B925B616AC00354EC9 /* maclc2.plist in Resources */ = {isa = PBXBuildFile; fileRef = B65085B625B616AC00354EC9 /* maclc2.plist */; };
B65085BA25B616AC00354EC9 /* maclc2.plist in Resources */ = {isa = PBXBuildFile; fileRef = B65085B625B616AC00354EC9 /* maclc2.plist */; };
B65085BB25B616AC00354EC9 /* maclc3.plist in Resources */ = {isa = PBXBuildFile; fileRef = B65085B725B616AC00354EC9 /* maclc3.plist */; };
@@ -205,6 +202,7 @@
B6E08076252574690075F4E1 /* vmnet_helper in CopyFiles */ = {isa = PBXBuildFile; fileRef = B6841BD0251EC913006A5C39 /* vmnet_helper */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
B6E4B5B024FDE2670094A35C /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = B6BA258724E99BEB005FB8FF /* main.m */; };
B6E4B5B124FDE2670094A35C /* LaunchWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = B6D6DE4024FADFAC00661A5F /* LaunchWindowController.m */; };
B6E4B5B224FDE2670094A35C /* MachineViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B64E15A824EA1D5300E8AD3D /* MachineViewController.m */; };
B6E4B5B324FDE2670094A35C /* MediaViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B64979C124EF6703008ABD20 /* MediaViewController.m */; };
B6E4B5B424FDE2670094A35C /* FlippedView.m in Sources */ = {isa = PBXBuildFile; fileRef = B60A6E1324EE0AE2004B7EEF /* FlippedView.m */; };
B6E4B5B524FDE2670094A35C /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = B6BA257F24E99BE9005FB8FF /* AppDelegate.m */; };
@@ -265,10 +263,6 @@
B6E4B5F224FDE2670094A35C /* prav8m.plist in Resources */ = {isa = PBXBuildFile; fileRef = B6109A0024F5F371005CB652 /* prav8m.plist */; };
B6E9A18025088B1B005E7525 /* SlotViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B6E9A17F25088B1B005E7525 /* SlotViewController.m */; };
B6E9A18325088B36005E7525 /* SlotView.xib in Resources */ = {isa = PBXBuildFile; fileRef = B6E9A18125088B36005E7525 /* SlotView.xib */; };
B6F7B538266FDA5B00624C6B /* MachineView.xib in Resources */ = {isa = PBXBuildFile; fileRef = B6F7B536266FDA5B00624C6B /* MachineView.xib */; };
B6F7B539266FDA5B00624C6B /* MachineView.xib in Resources */ = {isa = PBXBuildFile; fileRef = B6F7B536266FDA5B00624C6B /* MachineView.xib */; };
B6F7B53C267017A200624C6B /* NewMachineViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B6F7B53B267017A200624C6B /* NewMachineViewController.m */; };
B6F7B53D267017A200624C6B /* NewMachineViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B6F7B53B267017A200624C6B /* NewMachineViewController.m */; };
/* End PBXBuildFile section */
/* Begin PBXCopyFilesBuildPhase section */
@@ -288,7 +282,6 @@
dstSubfolderSpec = 10;
files = (
B66236B524FDA527006CABD7 /* SDL2.framework in Embed Frameworks */,
B635C09B26784A1200B23BFD /* Sparkle.framework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
@@ -380,17 +373,12 @@
B6109A1424F5F376005CB652 /* apple2cp.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = apple2cp.plist; sourceTree = "<group>"; };
B6109A1524F5F376005CB652 /* apple2p.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = apple2p.plist; sourceTree = "<group>"; };
B6109A1624F5F376005CB652 /* agat7.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = agat7.plist; sourceTree = "<group>"; };
B611BA392679489F008597B5 /* pty_shell.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = pty_shell.entitlements; sourceTree = "<group>"; };
B611BA3A267948B5008597B5 /* vmnet_helper.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = vmnet_helper.entitlements; sourceTree = "<group>"; };
B6152B5425F4549F00605E6E /* Slot.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Slot.h; sourceTree = "<group>"; };
B6152B5525F4549F00605E6E /* Slot.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Slot.m; sourceTree = "<group>"; };
B6152B5825F5B4F100605E6E /* Media.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Media.h; sourceTree = "<group>"; };
B6152B5925F5B57E00605E6E /* Media.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Media.m; sourceTree = "<group>"; };
B63005312666D6940014C381 /* BookmarkManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BookmarkManager.h; sourceTree = "<group>"; };
B63005322666D6940014C381 /* BookmarkManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BookmarkManager.m; sourceTree = "<group>"; };
B635C09926784A1200B23BFD /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = embedded/Sparkle.framework; sourceTree = "<group>"; };
B635C09C26784A4800B23BFD /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = embedded/Sparkle.framework; sourceTree = "<group>"; };
B635C09E26784D4700B23BFD /* AmpleLite.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AmpleLite.m; sourceTree = "<group>"; };
B6374AB6260EBB970045CA16 /* pty_shell.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = pty_shell.c; sourceTree = "<group>"; };
B6374ABD260EBBC90045CA16 /* pty_shell */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = pty_shell; sourceTree = BUILT_PRODUCTS_DIR; };
B6374AC9260ECB3F0045CA16 /* macclas2.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = macclas2.plist; sourceTree = "<group>"; };
@@ -491,9 +479,6 @@
B6E9A17E25088B1B005E7525 /* SlotViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SlotViewController.h; sourceTree = "<group>"; };
B6E9A17F25088B1B005E7525 /* SlotViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SlotViewController.m; sourceTree = "<group>"; };
B6E9A18225088B36005E7525 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/SlotView.xib; sourceTree = "<group>"; };
B6F7B537266FDA5B00624C6B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MachineView.xib; sourceTree = "<group>"; };
B6F7B53A267017A200624C6B /* NewMachineViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NewMachineViewController.h; sourceTree = "<group>"; };
B6F7B53B267017A200624C6B /* NewMachineViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NewMachineViewController.m; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -517,8 +502,6 @@
buildActionMask = 2147483647;
files = (
B65D718625E70BD5008C5F87 /* WebKit.framework in Frameworks */,
B635C09D26784A4800B23BFD /* Sparkle.framework in Frameworks */,
B635C09A26784A1200B23BFD /* Sparkle.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -536,7 +519,6 @@
B6374AB2260EBB970045CA16 /* pty_shell */ = {
isa = PBXGroup;
children = (
B611BA392679489F008597B5 /* pty_shell.entitlements */,
B6374AB6260EBB970045CA16 /* pty_shell.c */,
);
path = pty_shell;
@@ -635,7 +617,6 @@
B66236B624FDA686006CABD7 /* Frameworks */ = {
isa = PBXGroup;
children = (
B635C09926784A1200B23BFD /* Sparkle.framework */,
B65D718525E70BD5008C5F87 /* WebKit.framework */,
B6841BDD251ECC29006A5C39 /* vmnet.framework */,
);
@@ -647,7 +628,6 @@
children = (
B63C1B8D25004C6D00511A71 /* mame-data.tgz */,
B66236B824FDA698006CABD7 /* mame64 */,
B635C09C26784A4800B23BFD /* Sparkle.framework */,
B66236B224FDA522006CABD7 /* SDL2.framework */,
);
name = "Embedded Content";
@@ -656,7 +636,6 @@
B6841BD1251EC913006A5C39 /* vmnet_helper */ = {
isa = PBXGroup;
children = (
B611BA3A267948B5008597B5 /* vmnet_helper.entitlements */,
B6841BCA251EC88E006A5C39 /* vmnet_helper.c */,
);
path = vmnet_helper;
@@ -694,7 +673,6 @@
B6BA257E24E99BE9005FB8FF /* AppDelegate.h */,
B6BA257F24E99BE9005FB8FF /* AppDelegate.m */,
B63C1B8924FF4B7100511A71 /* Ample.h */,
B635C09E26784D4700B23BFD /* AmpleLite.m */,
B63C1B8A24FF4BF700511A71 /* Ample.m */,
B64AF1F4250ED5E400A09B9B /* TableCellView.h */,
B64AF1F5250ED5E400A09B9B /* TableCellView.m */,
@@ -718,8 +696,6 @@
B66D0FE926113AA8000902F1 /* SoftwareList.h */,
B63005312666D6940014C381 /* BookmarkManager.h */,
B63005322666D6940014C381 /* BookmarkManager.m */,
B6F7B53A267017A200624C6B /* NewMachineViewController.h */,
B6F7B53B267017A200624C6B /* NewMachineViewController.m */,
B6BA563A251685DA00B0C47D /* Window Controllers */,
B6B9EA652506A5550080E70D /* EjectButton.h */,
B6B9EA642506A5550080E70D /* EjectButton.m */,
@@ -761,7 +737,6 @@
children = (
B6665C1A265C639900254939 /* Autocomplete.xib */,
B6E9A18125088B36005E7525 /* SlotView.xib */,
B6F7B536266FDA5B00624C6B /* MachineView.xib */,
B63C1B9325008A2700511A71 /* DownloadWindow.xib */,
B66236BF24FDB7A6006CABD7 /* Credits.rtf */,
B6D6DE3C24FADF8B00661A5F /* LaunchWindow.xib */,
@@ -841,7 +816,6 @@
B66236B124FDA443006CABD7 /* Embed Frameworks */,
B6152B5C25F6F4F800605E6E /* ShellScript */,
B66236BB24FDA71D006CABD7 /* CopyFiles */,
B611BA3D26796483008597B5 /* ShellScript */,
);
buildRules = (
);
@@ -960,7 +934,6 @@
B6109A2524F5F377005CB652 /* laser2c.plist in Resources */,
B6109A3D24F5F377005CB652 /* laser128.plist in Resources */,
B6109A2824F5F377005CB652 /* apple2ep.plist in Resources */,
B6F7B538266FDA5B00624C6B /* MachineView.xib in Resources */,
B6109A1924F5F377005CB652 /* apple2ees.plist in Resources */,
B6DE32482605482500418375 /* mac512ke.plist in Resources */,
B6109A3924F5F377005CB652 /* prav8c.plist in Resources */,
@@ -1106,7 +1079,6 @@
B6E4B5E224FDE2670094A35C /* apple2gsr1.plist in Resources */,
B6E4B5E324FDE2670094A35C /* Defaults.plist in Resources */,
B6E4B5E424FDE2670094A35C /* models.plist in Resources */,
B6F7B539266FDA5B00624C6B /* MachineView.xib in Resources */,
B63C1BA9250192E600511A71 /* zijini.plist in Resources */,
B6E4B5E524FDE2670094A35C /* craft2p.plist in Resources */,
B6E4B5E624FDE2670094A35C /* uniap2pt.plist in Resources */,
@@ -1132,26 +1104,6 @@
/* End PBXResourcesBuildPhase section */
/* Begin PBXShellScriptBuildPhase section */
B611BA3D26796483008597B5 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
"$(TARGET_BUILD_DIR)/$(EXECUTABLE_FOLDER_PATH)/mame64",
);
outputFileListPaths = (
);
outputPaths = (
"$(TARGET_BUILD_DIR)/$(EXECUTABLE_FOLDER_PATH)/mame-link",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "# Type a script or drag a script file from your workspace to insert its path.\n#cd \"$TARGET_BUILD_DIR/$EXECUTABLE_FOLDER_PATH\"\n#if [ ! -e mame-link] ; then ln -s mame64 mame-link ; fi\n";
showEnvVarsInLog = 0;
};
B6152B5C25F6F4F800605E6E /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
@@ -1167,7 +1119,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "# set the mame rpath and entitlements.\n\ncd \"embedded\"\necho perl install_name_tool.pl --verbose mame64 \"@executable_path/../Frameworks\"\nperl install_name_tool.pl --verbose mame64 \"@executable_path/../Frameworks\"\n\necho /usr/bin/codesign --sign - --deep --force --options=runtime --entitlements mame64.entitlements --timestamp mame64\n/usr/bin/codesign --sign - --deep --force --options=runtime --entitlements mame64.entitlements --timestamp mame64\n\n";
shellScript = "# Type a script or drag a script file from your workspace to insert its path.\n\ncd \"embedded\"\necho perl install_name_tool.pl --verbose mame64 \"@executable_path/../Frameworks\"\nperl install_name_tool.pl --verbose mame64 \"@executable_path/../Frameworks\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
@@ -1203,6 +1155,7 @@
B6152B5625F4549F00605E6E /* Slot.m in Sources */,
B6D6DE4124FADFAC00661A5F /* LaunchWindowController.m in Sources */,
B6665C14265A0E3E00254939 /* AutocompleteControl.m in Sources */,
B64E15A924EA1D5300E8AD3D /* MachineViewController.m in Sources */,
B64979C224EF6703008ABD20 /* MediaViewController.m in Sources */,
B60A6E1424EE0AE2004B7EEF /* FlippedView.m in Sources */,
B6BA258024E99BE9005FB8FF /* AppDelegate.m in Sources */,
@@ -1211,7 +1164,6 @@
B66236A924FD9A34006CABD7 /* PreferencesWindowController.m in Sources */,
B63C1F0F25B1447C0016A611 /* CheatSheetWindowController.m in Sources */,
B64AF1F2250ECB2E00A09B9B /* DiskImagesWindowController.m in Sources */,
B6F7B53C267017A200624C6B /* NewMachineViewController.m in Sources */,
B64AF1F6250ED5E400A09B9B /* TableCellView.m in Sources */,
B66D0FE72611386C000902F1 /* SoftwareList.m in Sources */,
B63C1B9425008A2700511A71 /* DownloadWindowController.m in Sources */,
@@ -1234,6 +1186,7 @@
B6152B5B25F5B57E00605E6E /* Media.m in Sources */,
B6E4B5B124FDE2670094A35C /* LaunchWindowController.m in Sources */,
B6152B5725F4549F00605E6E /* Slot.m in Sources */,
B6E4B5B224FDE2670094A35C /* MachineViewController.m in Sources */,
B6E4B5B324FDE2670094A35C /* MediaViewController.m in Sources */,
B64AF1F7250ED5E400A09B9B /* TableCellView.m in Sources */,
B6E4B5B424FDE2670094A35C /* FlippedView.m in Sources */,
@@ -1241,8 +1194,6 @@
B615A9A026640A70001FBF99 /* SlotViewController.m in Sources */,
B6665C15265A0E3E00254939 /* AutocompleteControl.m in Sources */,
B6E4B5B524FDE2670094A35C /* AppDelegate.m in Sources */,
B6F7B53D267017A200624C6B /* NewMachineViewController.m in Sources */,
B635C09F26784D4700B23BFD /* AmpleLite.m in Sources */,
B66D0FE82611386C000902F1 /* SoftwareList.m in Sources */,
B6E4B5B624FDE2670094A35C /* LogWindowController.m in Sources */,
B6E4B5B724FDE2670094A35C /* PreferencesWindowController.m in Sources */,
@@ -1325,14 +1276,6 @@
name = SlotView.xib;
sourceTree = "<group>";
};
B6F7B536266FDA5B00624C6B /* MachineView.xib */ = {
isa = PBXVariantGroup;
children = (
B6F7B537266FDA5B00624C6B /* Base */,
);
name = MachineView.xib;
sourceTree = "<group>";
};
/* End PBXVariantGroup section */
/* Begin XCBuildConfiguration section */
@@ -1340,9 +1283,7 @@
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ENABLE_MODULES = NO;
CODE_SIGN_ENTITLEMENTS = pty_shell/pty_shell.entitlements;
CODE_SIGN_STYLE = Automatic;
ENABLE_HARDENED_RUNTIME = YES;
INSTALL_PATH = "";
PRODUCT_NAME = "$(TARGET_NAME)";
};
@@ -1352,9 +1293,7 @@
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ENABLE_MODULES = NO;
CODE_SIGN_ENTITLEMENTS = pty_shell/pty_shell.entitlements;
CODE_SIGN_STYLE = Automatic;
ENABLE_HARDENED_RUNTIME = YES;
INSTALL_PATH = "";
PRODUCT_NAME = "$(TARGET_NAME)";
};
@@ -1363,9 +1302,7 @@
B6841BD5251EC913006A5C39 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_ENTITLEMENTS = vmnet_helper/vmnet_helper.entitlements;
CODE_SIGN_STYLE = Automatic;
ENABLE_HARDENED_RUNTIME = YES;
INSTALL_PATH = "";
PRODUCT_NAME = "$(TARGET_NAME)";
};
@@ -1374,9 +1311,7 @@
B6841BD6251EC913006A5C39 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_ENTITLEMENTS = vmnet_helper/vmnet_helper.entitlements;
CODE_SIGN_STYLE = Automatic;
ENABLE_HARDENED_RUNTIME = YES;
INSTALL_PATH = "";
PRODUCT_NAME = "$(TARGET_NAME)";
};
@@ -1498,18 +1433,14 @@
CODE_SIGN_ENTITLEMENTS = Ample/Ample.entitlements;
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 16;
ENABLE_HARDENED_RUNTIME = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/embedded",
);
CURRENT_PROJECT_VERSION = 14;
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
INFOPLIST_FILE = Ample/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/../Frameworks",
);
MARKETING_VERSION = 0.233;
MARKETING_VERSION = 0.232;
PRODUCT_BUNDLE_IDENTIFIER = com.ksherlock.ample;
PRODUCT_NAME = "$(TARGET_NAME)";
};
@@ -1522,18 +1453,14 @@
CODE_SIGN_ENTITLEMENTS = Ample/Ample.entitlements;
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 16;
ENABLE_HARDENED_RUNTIME = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/embedded",
);
CURRENT_PROJECT_VERSION = 14;
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
INFOPLIST_FILE = Ample/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/../Frameworks",
);
MARKETING_VERSION = 0.233;
MARKETING_VERSION = 0.232;
PRODUCT_BUNDLE_IDENTIFIER = com.ksherlock.ample;
PRODUCT_NAME = "$(TARGET_NAME)";
};
Ample/Ample.entitlements
-2
View File
@@ -4,8 +4,6 @@
<dict>
<key>com.apple.security.app-sandbox</key>
<false/>
<key>com.apple.security.cs.disable-library-validation</key>
<true/>
<key>com.apple.security.files.user-selected.read-only</key>
<true/>
</dict>
Ample/AmpleLite.m
-26
View File
@@ -1,26 +0,0 @@
//
// AmpleLite.m
// Ample Lite
//
// Created by Kelvin Sherlock on 6/14/2021.
// Copyright © 2021 Kelvin Sherlock. All rights reserved.
//
#import <Foundation/Foundation.h>
@class NSMenuItem;
@interface SUUpdater : NSObject
@end
@implementation SUUpdater
- (IBAction)checkForUpdates:(id)sender {
}
- (BOOL)validateMenuItem:(NSMenuItem *)menuItem {
return NO;
}
@end
Ample/AutocompleteControl.m
+9 -68
View File
@@ -32,10 +32,6 @@ Todo --
@property (weak) AutocompleteControl *parent;
-(void)reset;
-(void)reset: (id<AutocompleteItem>)value;
-(void)setItems:(NSArray<id<AutocompleteItem>> *)items;
-(void)setItems:(NSArray<id<AutocompleteItem>> *)items value: (id<AutocompleteItem>)value;
@end
@@ -101,36 +97,26 @@ Todo --
-(void)setStringValue:(NSString *)stringValue {
[super setStringValue: stringValue ? stringValue : @""];
if (_value && [[_value menuTitle] isEqualToString: stringValue] == NO) {
// post change notification?
if (_value && [[_value menuTitle] isEqualToString: stringValue] == NO)
_value = nil;
[_menuView reset];
}
[self fixTextColor: _editing];
// todo -- search for a matching item, update text color.
}
// todo -- _menuView has second copy of value, need to update that.
-(void)setObjectValue:(id)objectValue {
if (_value == objectValue) return;
if (![objectValue conformsToProtocol: @protocol(AutocompleteItem)]) {
_value = nil;
[_menuView reset];
[super setStringValue: @""];
[self fixTextColor: _editing];
return;
}
_value = objectValue;
if (!_value) [super setStringValue: @""]; //
else {
[super setStringValue: [_value menuTitle]];
[_menuView reset: _value];
// TODO -- menu view currently uses text search.
//NSArray *array = [_autocompleteDelegate autocomplete: self completionsForItem: _value];
//[_menuView setItems: array value: _value];
NSArray *array = [_autocompleteDelegate autocomplete: self completionsForItem: _value];
[_menuView setItems: array];
}
[self fixTextColor: NO];
}
-(BOOL)valid {
@@ -391,23 +377,6 @@ Todo --
return YES;
}
if (commandSelector == @selector(scrollPageDown:)) {
if ([_panel isVisible]) {
[_menuView scrollPageDown: textView];
} else {
[self updateSuggestions];
}
return YES;
}
if (commandSelector == @selector(scrollPageUp:)) {
if ([_panel isVisible]) {
[_menuView scrollPageUp: textView];
} else {
[self updateSuggestions];
}
return YES;
}
//NSLog(@"%@", NSStringFromSelector(commandSelector));
return NO;
}
@@ -499,24 +468,14 @@ static CGFloat HeightForItems(NSUInteger count) {
_items = nil;
}
-(void)reset: (id<AutocompleteItem>)value {
[self invalidateRow: _index];
_index = -1;
_items = nil;
_value = value;
}
-(void)setItems:(NSArray *)items value: (id<AutocompleteItem> )value {
if (_items == items && _value == value) return;
-(void)setItems:(NSArray *)items {
if (_items == items) return;
_items = [items copy];
_index = -1;
_count = [items count];
_value = value;
if (!_items) {
_value = nil;
return;
}
if (!_items) return;
// also check enabled status....
if (_value) {
@@ -543,6 +502,8 @@ static CGFloat HeightForItems(NSUInteger count) {
}
}
NSInteger displayCount = MIN(_count, MAX_DISPLAY_ITEMS);
CGFloat newHeight = HeightForItems(displayCount) + 8 ; // 4px top/bottom
NSWindow *window = [self window];
@@ -578,14 +539,6 @@ static CGFloat HeightForItems(NSUInteger count) {
//NSLog(@"%@", NSStringFromRect(wFrame));
}
-(void)setItems:(NSArray<id<AutocompleteItem>> *)items {
if (_items == items) return;
[self setItems: items value: _value];
}
-(id<AutocompleteItem>)itemAtPoint: (NSPoint)point indexPtr: (NSInteger *)indexPtr {
NSInteger index = floor(point.y / MENU_HEIGHT);
@@ -683,18 +636,6 @@ enum {
[_parent selectItem: _value withSelector: _cmd];
}
-(void)scrollPageUp:(id)sender {
if (_count == 0 || _index <= 0) return;
}
-(void)scrollPageDown:(id)sender {
if (_count == 0 || _index == _count - 1) return;
}
-(void)insertNewline:(id)sender {
if (_value) {
[_parent selectItem: _value withSelector: _cmd];
Ample/Base.lproj/Credits.rtf
+1 -10
View File
@@ -33,15 +33,6 @@ Please note that MAME is a registered trademark of Gregory Ember, and permission
\cf0 \cb1 \kerning1\expnd0\expndtw0 SDL 2.0 is distributed under the {\field{\*\fldinst{HYPERLINK "https://libsdl.org/license.php"}}{\fldrslt zlib license}}. This license allows you to use SDL freely in any software.\
\
\pard\pardeftab720\qc\partightenfactor0
{\field{\*\fldinst{HYPERLINK "https://sparkle-project.org/"}}{\fldrslt
\f0\b\fs36 \cf0 \cb3 \expnd0\expndtw0\kerning0
Sparkle}}\
\pard\pardeftab720\partightenfactor0
\cf0 \
Sparkle is open source software available under the permissive MIT license, and is developed on GitHub by the Sparkle Project with the help of dozens of valued contributors.\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0
\cf0 \
\pard\pardeftab720\qc\partightenfactor0
{\field{\*\fldinst{HYPERLINK "https://usdawatercolors.nal.usda.gov/pom/catalog.xhtml?id=POM00001916"}}{\fldrslt
\f0\b\fs36 \cf0 \cb3 \expnd0\expndtw0\kerning0
Icon}}
@@ -51,6 +42,6 @@ Icon}}
\f1\b0\fs28 \cf0 \
\pard\pardeftab720\qj\partightenfactor0
\cf4 R.C. Steadman, 6-1-\'9221.\
\cf4 \cb3 R.C. Steadman, 6-1-\'9221.\
\
U.S. Department of Agriculture Pomological Watercolor Collection. Rare and Special Collections, National Agricultural Library, Beltsville, MD 20705}
Ample/Base.lproj/DiskImages.xib
+3 -3
View File
@@ -27,15 +27,15 @@
<scrollView focusRingType="none" fixedFrame="YES" borderType="none" autohidesScrollers="YES" horizontalLineScroll="24" horizontalPageScroll="10" verticalLineScroll="24" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" findBarPosition="belowContent" translatesAutoresizingMaskIntoConstraints="NO" id="ivr-XT-BPS">
<rect key="frame" x="-1" y="-1" width="302" height="402"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<clipView key="contentView" ambiguous="YES" drawsBackground="NO" copiesOnScroll="NO" id="1jn-uc-06s">
<clipView key="contentView" ambiguous="YES" copiesOnScroll="NO" id="1jn-uc-06s">
<rect key="frame" x="0.0" y="0.0" width="302" height="402"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<tableView focusRingType="none" verticalHuggingPriority="750" ambiguous="YES" allowsExpansionToolTips="YES" columnAutoresizingStyle="none" columnReordering="NO" columnResizing="NO" multipleSelection="NO" emptySelection="NO" autosaveColumns="NO" typeSelect="NO" rowHeight="22" rowSizeStyle="automatic" viewBased="YES" id="J5l-1d-030">
<tableView focusRingType="none" verticalHuggingPriority="750" ambiguous="YES" allowsExpansionToolTips="YES" columnAutoresizingStyle="none" selectionHighlightStyle="none" columnReordering="NO" columnResizing="NO" multipleSelection="NO" emptySelection="NO" autosaveColumns="NO" typeSelect="NO" rowHeight="22" rowSizeStyle="automatic" viewBased="YES" id="J5l-1d-030">
<rect key="frame" x="0.0" y="0.0" width="302" height="402"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<size key="intercellSpacing" width="3" height="2"/>
<color key="backgroundColor" white="1" alpha="0.0" colorSpace="custom" customColorSpace="calibratedWhite"/>
<color key="backgroundColor" name="windowBackgroundColor" catalog="System" colorSpace="catalog"/>
<color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
<tableColumns>
<tableColumn width="282" minWidth="40" maxWidth="1000" id="1rF-M3-pYV">
Ample/Base.lproj/DownloadWindow.xib
+60 -106
View File
@@ -8,11 +8,8 @@
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="DownloadWindowController">
<connections>
<outlet property="allFilterButton" destination="Kgj-LP-FsF" id="yub-s9-RVW"/>
<outlet property="arrayController" destination="jhO-4z-Qwt" id="GHu-xb-4zU"/>
<outlet property="downloadField" destination="sJz-So-jbA" id="WjK-48-FcE"/>
<outlet property="formatButton" destination="2Rg-eX-DUq" id="oYo-MG-Sc6"/>
<outlet property="missingFilterButton" destination="6c7-tU-3F3" id="89Y-wQ-9pB"/>
<outlet property="tableView" destination="FLX-Wt-y53" id="a4O-pk-EAt"/>
<outlet property="window" destination="F0z-JX-Cv5" id="gIp-Ho-8D9"/>
</connections>
@@ -21,29 +18,45 @@
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
<window title="ROMs" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" frameAutosaveName="DownloadManagerWindow" animationBehavior="default" id="F0z-JX-Cv5">
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES"/>
<rect key="contentRect" x="196" y="240" width="454" height="575"/>
<rect key="contentRect" x="196" y="240" width="400" height="575"/>
<rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/>
<value key="minSize" type="size" width="454" height="300"/>
<value key="minSize" type="size" width="300" height="300"/>
<view key="contentView" id="se5-gp-TjO">
<rect key="frame" x="0.0" y="0.0" width="454" height="575"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<rect key="frame" x="0.0" y="0.0" width="400" height="575"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="rg5-Qf-4Mw">
<rect key="frame" x="324" y="19" width="56" height="23"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
<buttonCell key="cell" type="roundTextured" title="Cancel" bezelStyle="texturedRounded" alignment="center" lineBreakMode="truncatingTail" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="i6Z-OM-lqE">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
<string key="keyEquivalent">.</string>
<modifierMask key="keyEquivalentModifierMask" command="YES"/>
<connections>
<binding destination="-2" name="enabled" keyPath="self.active" id="mBP-8S-yGB"/>
</connections>
</buttonCell>
<connections>
<action selector="cancelAll:" target="-2" id="ycl-eJ-ByB"/>
</connections>
</button>
<scrollView fixedFrame="YES" autohidesScrollers="YES" horizontalLineScroll="51" horizontalPageScroll="10" verticalLineScroll="51" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="CMD-nT-mEa">
<rect key="frame" x="0.0" y="130" width="456" height="446"/>
<rect key="frame" x="0.0" y="130" width="402" height="446"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<clipView key="contentView" ambiguous="YES" drawsBackground="NO" id="Igp-aH-flp">
<rect key="frame" x="1" y="1" width="454" height="444"/>
<rect key="frame" x="1" y="1" width="400" height="444"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<tableView verticalHuggingPriority="750" ambiguous="YES" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" alternatingRowBackgroundColors="YES" columnReordering="NO" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" rowHeight="49" rowSizeStyle="automatic" viewBased="YES" id="FLX-Wt-y53">
<rect key="frame" x="0.0" y="0.0" width="454" height="444"/>
<rect key="frame" x="0.0" y="0.0" width="400" height="444"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<size key="intercellSpacing" width="3" height="2"/>
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
<tableViewGridLines key="gridStyleMask" dashed="YES"/>
<color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
<tableColumns>
<tableColumn width="451" minWidth="40" maxWidth="1000" id="5jP-bY-fhI">
<tableColumn width="397" minWidth="40" maxWidth="1000" id="5jP-bY-fhI">
<tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
@@ -56,67 +69,63 @@
</textFieldCell>
<tableColumnResizingMask key="resizingMask" resizeWithTable="YES"/>
<prototypeCellViews>
<tableCellView focusRingType="none" id="onK-6l-2iV">
<rect key="frame" x="1" y="1" width="451" height="49"/>
<tableCellView identifier="Cell" focusRingType="none" id="aBv-F5-XWo">
<rect key="frame" x="1" y="1" width="397" height="17"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="pWm-hb-BXB">
<rect key="frame" x="0.0" y="0.0" width="397" height="17"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
<textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="p71-gJ-vFV">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
</subviews>
<connections>
<outlet property="textField" destination="pWm-hb-BXB" id="NNG-rj-AAQ"/>
</connections>
</tableCellView>
<tableCellView identifier="DownloadCell" focusRingType="none" id="onK-6l-2iV" customClass="DownloadTableCellView">
<rect key="frame" x="1" y="20" width="397" height="49"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="A44-us-TEl">
<rect key="frame" x="25" y="28" width="425" height="17"/>
<rect key="frame" x="25" y="28" width="371" height="17"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
<textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="NSU-6I-nsG">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<connections>
<binding destination="onK-6l-2iV" name="value" keyPath="objectValue.name" id="t1L-kM-AW6">
<dictionary key="options">
<string key="NSMultipleValuesPlaceholder">multiple</string>
<string key="NSNoSelectionPlaceholder">no selection</string>
<string key="NSNotApplicablePlaceholder">n/a</string>
<string key="NSNullPlaceholder">null</string>
</dictionary>
</binding>
<binding destination="onK-6l-2iV" name="textColor" keyPath="objectValue.titleColor" id="0Qx-rz-DEZ"/>
</connections>
</textField>
<progressIndicator wantsLayer="YES" fixedFrame="YES" maxValue="100" displayedWhenStopped="NO" indeterminate="YES" controlSize="small" style="spinning" translatesAutoresizingMaskIntoConstraints="NO" id="jBN-UJ-tWi">
<rect key="frame" x="3" y="29" width="16" height="16"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<connections>
<binding destination="onK-6l-2iV" name="animate" keyPath="objectValue.task" id="d22-JL-3Z7">
<dictionary key="options">
<string key="NSValueTransformerName">NSIsNotNil</string>
</dictionary>
</binding>
</connections>
</progressIndicator>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="hfu-hP-QAH">
<rect key="frame" x="25" y="3" width="425" height="17"/>
<rect key="frame" x="25" y="3" width="371" height="17"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
<textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="1cQ-Zh-q0o">
<font key="font" metaFont="system" size="10"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<connections>
<binding destination="onK-6l-2iV" name="textColor" keyPath="objectValue.descriptionColor" id="KVi-3N-Swm"/>
<binding destination="onK-6l-2iV" name="value" keyPath="objectValue.statusDescription" id="yV1-5r-YDh"/>
</connections>
</textField>
</subviews>
<connections>
<outlet property="textField" destination="A44-us-TEl" id="ude-er-Gm4"/>
<outlet property="activity" destination="jBN-UJ-tWi" id="ZwD-yU-Vne"/>
<outlet property="statusTextField" destination="hfu-hP-QAH" id="8Hv-BB-kYA"/>
<outlet property="textField" destination="A44-us-TEl" id="Ta5-nd-ed1"/>
</connections>
</tableCellView>
</prototypeCellViews>
<connections>
<binding destination="jhO-4z-Qwt" name="value" keyPath="arrangedObjects.selection" id="KQP-Xo-Fbf"/>
</connections>
</tableColumn>
</tableColumns>
<connections>
<binding destination="jhO-4z-Qwt" name="content" keyPath="arrangedObjects" id="2av-gV-V4K"/>
<outlet property="dataSource" destination="-2" id="Ghf-k9-bRK"/>
<outlet property="delegate" destination="-2" id="rpR-0W-4Nu"/>
<outlet property="menu" destination="RJM-21-hjO" id="xpL-0n-1jm"/>
</connections>
</tableView>
@@ -133,7 +142,7 @@
</scroller>
</scrollView>
<textField verticalHuggingPriority="750" fixedFrame="YES" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="sJz-So-jbA">
<rect key="frame" x="51" y="101" width="383" height="21"/>
<rect key="frame" x="51" y="101" width="329" height="21"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" id="HKe-di-YSs">
<font key="font" metaFont="system"/>
@@ -145,9 +154,9 @@
</connections>
</textField>
<button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Fhd-vr-Q2G">
<rect key="frame" x="208" y="13" width="150" height="32"/>
<rect key="frame" x="192" y="18" width="124" height="23"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<buttonCell key="cell" type="push" title="Download Missing" bezelStyle="rounded" alignment="center" lineBreakMode="truncatingTail" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="AKx-eg-iLS">
<buttonCell key="cell" type="roundTextured" title="Download Missing" bezelStyle="texturedRounded" alignment="center" lineBreakMode="truncatingTail" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="AKx-eg-iLS">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
@@ -179,13 +188,13 @@
</textFieldCell>
</textField>
<box verticalHuggingPriority="750" fixedFrame="YES" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="AuM-pD-Gul">
<rect key="frame" x="12" y="52" width="422" height="5"/>
<rect key="frame" x="12" y="52" width="368" height="5"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
</box>
<button verticalHuggingPriority="750" fixedFrame="YES" imageHugsTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="dpY-qZ-2Nk">
<rect key="frame" x="93" y="13" width="115" height="32"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<buttonCell key="cell" type="push" title="ROMs" bezelStyle="rounded" image="NSFolder" imagePosition="left" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="E0t-sX-rgE">
<rect key="frame" x="90" y="13" width="100" height="32"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<buttonCell key="cell" type="push" title="ROMs" bezelStyle="rounded" image="NSFolder" imagePosition="leading" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="E0t-sX-rgE">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
@@ -195,7 +204,7 @@
</button>
<button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Lnv-mh-zAr">
<rect key="frame" x="6" y="13" width="87" height="32"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<buttonCell key="cell" type="push" title="Refresh" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="mYS-h7-GUa">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
@@ -228,66 +237,12 @@
</binding>
</connections>
</popUpButton>
<button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="rg5-Qf-4Mw">
<rect key="frame" x="358" y="13" width="82" height="32"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" lineBreakMode="truncatingTail" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="i6Z-OM-lqE">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
<string key="keyEquivalent">.</string>
<modifierMask key="keyEquivalentModifierMask" command="YES"/>
<connections>
<binding destination="-2" name="enabled" keyPath="self.active" id="mBP-8S-yGB"/>
</connections>
</buttonCell>
<connections>
<action selector="cancelAll:" target="-2" id="ycl-eJ-ByB"/>
</connections>
</button>
</subviews>
</view>
<toolbar key="toolbar" implicitIdentifier="B60021E6-BFBC-44E6-97DC-120AA9FD3269" autosavesConfiguration="NO" allowsUserCustomization="NO" displayMode="iconOnly" sizeMode="regular" id="kpz-W4-xgh">
<allowedToolbarItems>
<toolbarItem implicitItemIdentifier="NSToolbarSpaceItem" id="tbY-ts-Irb"/>
<toolbarItem implicitItemIdentifier="NSToolbarFlexibleSpaceItem" id="3Kc-zG-IdN"/>
<toolbarItem implicitItemIdentifier="BD743A15-0B61-48FF-9EED-FD8D57EF8459" label="All" paletteLabel="All" tag="1" sizingBehavior="auto" id="Jj0-n8-I5a">
<nil key="toolTip"/>
<button key="view" verticalHuggingPriority="750" tag="1" id="Kgj-LP-FsF">
<rect key="frame" x="0.0" y="14" width="74" height="20"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<buttonCell key="cell" type="recessed" title="All" bezelStyle="recessed" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="9s7-S1-hW1">
<behavior key="behavior" lightByBackground="YES" lightByGray="YES" changeBackground="YES" changeGray="YES"/>
<font key="font" metaFont="systemBold" size="12"/>
</buttonCell>
<connections>
<action selector="filterButton:" target="-2" id="gTc-Ul-FYR"/>
</connections>
</button>
</toolbarItem>
<toolbarItem implicitItemIdentifier="5B013840-E582-4568-8448-DDD7EE1E5AE2" label="Missing" paletteLabel="Missing" tag="2" sizingBehavior="auto" id="GV4-aX-5Ox">
<nil key="toolTip"/>
<button key="view" verticalHuggingPriority="750" tag="2" id="6c7-tU-3F3">
<rect key="frame" x="0.0" y="14" width="74" height="20"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<buttonCell key="cell" type="recessed" title="Missing" bezelStyle="recessed" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="ui2-dz-IZj">
<behavior key="behavior" lightByBackground="YES" lightByGray="YES" changeBackground="YES" changeGray="YES"/>
<font key="font" metaFont="systemBold" size="12"/>
</buttonCell>
<connections>
<action selector="filterButton:" target="-2" id="R6W-hU-oqL"/>
</connections>
</button>
</toolbarItem>
</allowedToolbarItems>
<defaultToolbarItems>
<toolbarItem reference="Jj0-n8-I5a"/>
<toolbarItem reference="GV4-aX-5Ox"/>
</defaultToolbarItems>
</toolbar>
<connections>
<outlet property="delegate" destination="-2" id="0bl-1N-AYu"/>
</connections>
<point key="canvasLocation" x="59" y="119.5"/>
<point key="canvasLocation" x="32" y="119.5"/>
</window>
<menu id="RJM-21-hjO">
<items>
@@ -315,7 +270,6 @@
</connections>
<point key="canvasLocation" x="-348" y="164"/>
</menu>
<arrayController objectClassName="DownloadItem" editable="NO" preservesSelection="NO" selectsInsertedObjects="NO" avoidsEmptySelection="NO" clearsFilterPredicateOnInsertion="NO" automaticallyRearrangesObjects="YES" id="jhO-4z-Qwt" customClass="DownloadItemArrayController"/>
<userDefaultsController representsSharedInstance="YES" id="721-9N-Bma"/>
</objects>
<resources>
Ample/Base.lproj/LaunchWindow.xib
+91 -156
View File
@@ -11,7 +11,7 @@
<outlet property="addBookmarkWindow" destination="yIt-hP-HBq" id="Qhx-WV-cg4"/>
<outlet property="bookmarkTextField" destination="fAl-Vn-x1w" id="GNr-j6-BiQ"/>
<outlet property="machineView" destination="oVt-eD-aaj" id="Q9V-Kr-6GN"/>
<outlet property="machineViewController" destination="FSD-3v-Wni" id="tXv-zJ-QO3"/>
<outlet property="machineViewController" destination="RgH-d9-xl8" id="DIa-h0-6y2"/>
<outlet property="mediaController" destination="t7c-zy-czN" id="a7d-HC-TWx"/>
<outlet property="mediaView" destination="J9O-xI-P5J" id="PmZ-VC-4SN"/>
<outlet property="slotController" destination="lyS-mc-3Tf" id="LXo-Ii-fDX"/>
@@ -24,19 +24,51 @@
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
<window title="Ample" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" frameAutosaveName="LaunchWindow" animationBehavior="default" id="Vze-YF-m6e">
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES"/>
<rect key="contentRect" x="335" y="390" width="1000" height="640"/>
<rect key="contentRect" x="335" y="390" width="718" height="795"/>
<rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/>
<view key="contentView" id="Ssv-Jw-EE0">
<rect key="frame" x="0.0" y="0.0" width="1000" height="640"/>
<rect key="frame" x="0.0" y="0.0" width="718" height="795"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<customView fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="oVt-eD-aaj">
<rect key="frame" x="0.0" y="615" width="718" height="180"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
</customView>
<button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="nKp-px-nHg">
<rect key="frame" x="588.5" y="58" width="111" height="23"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
<buttonCell key="cell" type="roundTextured" title="Launch" bezelStyle="texturedRounded" image="NSAppleMenuImage" imagePosition="left" alignment="center" borderStyle="border" inset="2" id="Ct1-Rb-7uI">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
<string key="keyEquivalent" base64-UTF8="YES">
DQ
</string>
<modifierMask key="keyEquivalentModifierMask" command="YES"/>
</buttonCell>
<connections>
<action selector="launchAction:" target="-2" id="a4d-zv-1CU"/>
</connections>
</button>
<button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="nNO-3T-OAy">
<rect key="frame" x="470.5" y="58" width="109" height="23"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
<buttonCell key="cell" type="roundTextured" title="Reset Slots" bezelStyle="texturedRounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="Uii-5h-2R2">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
<string key="keyEquivalent">r</string>
<modifierMask key="keyEquivalentModifierMask" command="YES"/>
</buttonCell>
<connections>
<action selector="resetSlots:" target="lyS-mc-3Tf" id="1qi-N0-Q8B"/>
</connections>
</button>
<customView id="P9d-sS-qEb" customClass="FlippedView">
<rect key="frame" x="302" y="105" width="316" height="363"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
<rect key="frame" x="20" y="92" width="316" height="363"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
</customView>
<tabView initialItem="zUN-Qs-haG" id="l8R-bg-6Zm">
<rect key="frame" x="295" y="466" width="692" height="160"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
<rect key="frame" x="13" y="453" width="692" height="160"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
<font key="font" metaFont="system"/>
<tabViewItems>
<tabViewItem label="Video" identifier="" id="zUN-Qs-haG">
@@ -270,7 +302,7 @@
<textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="5Yf-ZJ-8kx">
<rect key="frame" x="132" y="59" width="523" height="21"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" placeholderString="/path/to/file.wav" drawsBackground="YES" usesSingleLineMode="YES" id="Xqc-zw-28b">
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" placeholderString="/path/to/file.wav" drawsBackground="YES" id="Xqc-zw-28b">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -287,7 +319,7 @@
<textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ne8-5I-D1H">
<rect key="frame" x="132" y="28" width="523" height="21"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" placeholderString="/path/to/file.vgm" drawsBackground="YES" usesSingleLineMode="YES" id="xGs-Mi-wzj">
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" placeholderString="/path/to/file.vgm" drawsBackground="YES" id="xGs-Mi-wzj">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -312,7 +344,7 @@
<textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Xht-PS-Hw8">
<rect key="frame" x="132" y="90" width="523" height="21"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" placeholderString="/path/to/file.avi" drawsBackground="YES" usesSingleLineMode="YES" id="iY4-FF-x2e">
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" placeholderString="/path/to/file.avi" drawsBackground="YES" id="iY4-FF-x2e">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -345,64 +377,79 @@
<rect key="frame" x="10" y="33" width="672" height="114"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="VDW-FX-9az">
<textField toolTip="path or socket.address:port" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Wga-1O-bDR">
<rect key="frame" x="132" y="90" width="523" height="21"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" placeholderString="/path/to/directory/" drawsBackground="YES" usesSingleLineMode="YES" id="ykl-aj-n1L">
<font key="font" metaFont="system"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" placeholderString="socket.127.0.0.1:23 or /path/to/file" drawsBackground="YES" id="6d8-LZ-wh1">
<font key="font" usesAppearanceFont="YES"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<connections>
<binding destination="-2" name="enabled" keyPath="self.mameShareDirectory" id="bPv-hU-XgK"/>
<binding destination="-2" name="value" keyPath="self.mameShareDirectoryPath" id="ddj-BN-tsY">
<binding destination="-2" name="value" keyPath="self.mameBitBanger" id="O76-B6-FhP">
<dictionary key="options">
<string key="NSNullPlaceholder">socket.127.0.0.1:23 or /path/to/file</string>
</dictionary>
</binding>
</connections>
</textField>
<textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="VDW-FX-9az">
<rect key="frame" x="132" y="59" width="523" height="21"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" placeholderString="/path/to/directory/" drawsBackground="YES" id="ykl-aj-n1L">
<font key="font" usesAppearanceFont="YES"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<connections>
<binding destination="-2" name="value" keyPath="self.mameShareDirectory" id="fqw-G0-t5P">
<dictionary key="options">
<string key="NSNullPlaceholder">/path/to/directory/</string>
</dictionary>
</binding>
</connections>
</textField>
<button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="1fA-nr-wns">
<rect key="frame" x="15" y="91" width="117" height="18"/>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="uPk-SB-lIF">
<rect key="frame" x="15" y="92" width="71" height="16"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<buttonCell key="cell" type="check" title="Share Directory" bezelStyle="regularSquare" imagePosition="left" inset="2" id="xmA-1v-wU7">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<textFieldCell key="cell" lineBreakMode="clipping" title="Bit Banger:" id="9jA-4x-Abr">
<font key="font" metaFont="system"/>
</buttonCell>
<connections>
<binding destination="-2" name="value" keyPath="self.mameShareDirectory" id="x3D-ho-u4v"/>
</connections>
</button>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="upA-x5-LVd">
<rect key="frame" x="15" y="61" width="103" height="16"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<textFieldCell key="cell" lineBreakMode="clipping" title="Share Directory:" id="RmQ-pY-o5K">
<font key="font" metaFont="system"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
</subviews>
</view>
</tabViewItem>
</tabViewItems>
<connections>
<binding destination="-2" name="hidden" keyPath="machine" id="odt-eJ-VrX">
<dictionary key="options">
<string key="NSValueTransformerName">NSIsNil</string>
</dictionary>
</binding>
</connections>
</tabView>
<customView fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="J9O-xI-P5J" customClass="FlippedView">
<rect key="frame" x="664" y="107" width="316" height="331"/>
<rect key="frame" x="382" y="92" width="316" height="331"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
</customView>
<scrollView borderType="none" autohidesScrollers="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" horizontalScrollElasticity="none" id="2ue-XT-byh">
<rect key="frame" x="0.0" y="0.0" width="1001" height="69"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
<rect key="frame" x="0.0" y="0.0" width="718" height="51"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="eSY-AU-tvi">
<rect key="frame" x="0.0" y="0.0" width="1001" height="69"/>
<rect key="frame" x="0.0" y="0.0" width="718" height="51"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textView focusRingType="none" editable="NO" importsGraphics="NO" richText="NO" verticallyResizable="YES" allowsCharacterPickerTouchBarItem="NO" textCompletion="NO" id="c0R-8x-RL2">
<rect key="frame" x="0.0" y="0.0" width="1001" height="69"/>
<rect key="frame" x="0.0" y="0.0" width="718" height="51"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
<size key="minSize" width="1001" height="69"/>
<size key="maxSize" width="1001" height="10000000"/>
<size key="minSize" width="718" height="51"/>
<size key="maxSize" width="718" height="10000000"/>
<color key="insertionPointColor" name="textColor" catalog="System" colorSpace="catalog"/>
<connections>
<binding destination="-2" name="value" keyPath="self.commandLine" id="deQ-gK-fgu">
@@ -424,8 +471,8 @@
</scroller>
</scrollView>
<searchField wantsLayer="YES" verticalHuggingPriority="750" textCompletion="NO" id="pNl-g4-ZLh" customClass="AutocompleteControl">
<rect key="frame" x="664" y="446" width="316" height="22"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
<rect key="frame" x="382" y="431" width="316" height="22"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
<searchFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" borderStyle="bezel" placeholderString="Software List" usesSingleLineMode="YES" bezelStyle="round" id="sMi-a3-XEn">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -433,64 +480,15 @@
</searchFieldCell>
<connections>
<action selector="softwareChanged:" target="-2" id="879-da-UEc"/>
<binding destination="-2" name="hidden" keyPath="machine" id="RdE-9k-oFd">
<dictionary key="options">
<string key="NSValueTransformerName">NSIsNil</string>
</dictionary>
</binding>
</connections>
</searchField>
<customView id="oVt-eD-aaj" customClass="FlippedView">
<rect key="frame" x="0.0" y="69" width="294" height="571"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
</customView>
<box verticalHuggingPriority="750" fixedFrame="YES" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="UwI-q9-hEm">
<rect key="frame" x="0.0" y="67" width="1000" height="5"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
</box>
<box horizontalHuggingPriority="750" fixedFrame="YES" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="xjH-Gv-MHt">
<rect key="frame" x="291" y="69" width="5" height="571"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" heightSizable="YES"/>
</box>
<button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="nKp-px-nHg">
<rect key="frame" x="869.5" y="76" width="111" height="23"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
<buttonCell key="cell" type="roundTextured" title="Launch" bezelStyle="texturedRounded" image="NSAppleMenuImage" imagePosition="left" alignment="center" borderStyle="border" inset="2" id="Ct1-Rb-7uI">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
<string key="keyEquivalent" base64-UTF8="YES">
DQ
</string>
<modifierMask key="keyEquivalentModifierMask" command="YES"/>
</buttonCell>
<connections>
<action selector="launchAction:" target="-2" id="a4d-zv-1CU"/>
<binding destination="-2" name="hidden" keyPath="machine" id="8Ks-FY-Tmk">
<dictionary key="options">
<string key="NSValueTransformerName">NSIsNil</string>
</dictionary>
</binding>
</connections>
</button>
</subviews>
</view>
<toolbar key="toolbar" implicitIdentifier="ACA8EE70-5505-4CFD-9F78-7A480D93260B" autosavesConfiguration="NO" allowsUserCustomization="NO" prefersToBeShown="NO" displayMode="iconAndLabel" sizeMode="regular" id="b3J-Bx-3nk">
<allowedToolbarItems>
<toolbarItem implicitItemIdentifier="NSToolbarShowColorsItem" id="uHd-dY-alN"/>
<toolbarItem implicitItemIdentifier="NSToolbarShowFontsItem" id="WEM-Gw-Utx"/>
<toolbarItem implicitItemIdentifier="NSToolbarPrintItem" id="RCG-fn-6Ue"/>
<toolbarItem implicitItemIdentifier="NSToolbarSpaceItem" id="BRc-Qf-FCk"/>
<toolbarItem implicitItemIdentifier="NSToolbarFlexibleSpaceItem" id="Dtt-KT-5NO"/>
</allowedToolbarItems>
<defaultToolbarItems/>
</toolbar>
<connections>
<outlet property="menu" destination="Aa5-Sk-gZX" id="Sj0-0o-oZb"/>
</connections>
<point key="canvasLocation" x="590" y="40"/>
<point key="canvasLocation" x="769" y="120.5"/>
</window>
<viewController title="Media View" nibName="MediaView" id="t7c-zy-czN" customClass="MediaViewController"/>
<viewController title="Slot View" nibName="SlotView" id="lyS-mc-3Tf" customClass="SlotViewController"/>
<customObject id="RgH-d9-xl8" customClass="MachineViewController"/>
<window title="Add Bookmark" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" restorable="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="yIt-hP-HBq">
<windowStyleMask key="styleMask" titled="YES"/>
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
@@ -543,10 +541,10 @@ Gw
</textFieldCell>
</textField>
<textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="fAl-Vn-x1w">
<rect key="frame" x="20" y="49" width="422" height="21"/>
<rect key="frame" x="20" y="49" width="422" height="23"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" placeholderString="bookmark name" drawsBackground="YES" id="Enq-2z-cle">
<font key="font" metaFont="system"/>
<font key="font" usesAppearanceFont="YES"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
@@ -563,69 +561,6 @@ Gw
</view>
<point key="canvasLocation" x="130" y="70"/>
</window>
<viewController nibName="MachineView" id="FSD-3v-Wni" customClass="NewMachineViewController"/>
<menu id="Aa5-Sk-gZX">
<items>
<menuItem title="Launch" image="NSAppleMenuImage" id="OSH-7C-D6z">
<modifierMask key="keyEquivalentModifierMask"/>
<connections>
<action selector="launchAction:" target="-2" id="ZY2-He-VyK"/>
</connections>
</menuItem>
<menuItem isSeparatorItem="YES" id="Iti-F9-p35"/>
<menuItem title="List Media…" id="M5h-4W-0nV">
<modifierMask key="keyEquivalentModifierMask"/>
<connections>
<action selector="listMedia:" target="-2" id="IO7-MG-zud"/>
<binding destination="-2" name="hidden" keyPath="optionKey" id="LhL-2l-iss">
<dictionary key="options">
<string key="NSValueTransformerName">NSNegateBoolean</string>
</dictionary>
</binding>
</connections>
</menuItem>
<menuItem title="List Slots…" id="cNj-Sb-KkE">
<modifierMask key="keyEquivalentModifierMask"/>
<connections>
<action selector="listSlots:" target="-2" id="3nb-mV-eUK"/>
<binding destination="-2" name="hidden" keyPath="optionKey" id="dwp-Kn-LfC">
<dictionary key="options">
<string key="NSValueTransformerName">NSNegateBoolean</string>
</dictionary>
</binding>
</connections>
</menuItem>
<menuItem isSeparatorItem="YES" id="yZx-W2-lZg"/>
<menuItem title="Reset All" id="PQ0-yO-SKz">
<modifierMask key="keyEquivalentModifierMask"/>
<connections>
<action selector="resetAll:" target="-2" id="hF5-fl-bMr"/>
</connections>
</menuItem>
<menuItem title="Reset Machine" id="1by-3B-LSd">
<modifierMask key="keyEquivalentModifierMask"/>
<connections>
<action selector="resetMachine:" target="-2" id="7au-OM-Q88"/>
</connections>
</menuItem>
<menuItem title="Reset Slots" id="ccx-xm-qeo">
<modifierMask key="keyEquivalentModifierMask"/>
<connections>
<action selector="resetSlots:" target="lyS-mc-3Tf" id="39K-rS-u9D"/>
</connections>
</menuItem>
<menuItem title="Reset Media" id="Opr-7k-fO1">
<modifierMask key="keyEquivalentModifierMask"/>
<connections>
<action selector="resetMedia:" target="-2" id="n5j-1R-NJl"/>
</connections>
</menuItem>
</items>
<connections>
<outlet property="delegate" destination="-2" id="wqC-IG-63F"/>
</connections>
<point key="canvasLocation" x="-121" y="-2"/>
</menu>
</objects>
<resources>
<image name="NSAppleMenuImage" width="11" height="14"/>
Ample/Base.lproj/MachineView.xib
-109
View File
@@ -1,109 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="15705" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<dependencies>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="15705"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="NewMachineViewController">
<connections>
<outlet property="outlineView" destination="9V6-He-b8A" id="XeC-DJ-oXY"/>
<outlet property="view" destination="t3T-qF-D0e" id="Svb-w7-hs9"/>
</connections>
</customObject>
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
<scrollView borderType="none" autohidesScrollers="YES" horizontalLineScroll="26" horizontalPageScroll="10" verticalLineScroll="26" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" horizontalScrollElasticity="none" id="t3T-qF-D0e">
<rect key="frame" x="0.0" y="0.0" width="274" height="543"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<clipView key="contentView" drawsBackground="NO" id="DyG-qq-uBF">
<rect key="frame" x="0.0" y="0.0" width="274" height="543"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<outlineView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" selectionHighlightStyle="sourceList" columnReordering="NO" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" autosaveName="machine-view" rowHeight="24" rowSizeStyle="automatic" viewBased="YES" indentationPerLevel="16" autosaveExpandedItems="YES" outlineTableColumn="e67-js-boV" id="9V6-He-b8A">
<rect key="frame" x="0.0" y="0.0" width="274" height="543"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<size key="intercellSpacing" width="3" height="2"/>
<color key="backgroundColor" white="1" alpha="0.0" colorSpace="custom" customColorSpace="calibratedWhite"/>
<color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
<tableColumns>
<tableColumn width="271" minWidth="16" maxWidth="1000" id="e67-js-boV">
<tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
</tableHeaderCell>
<textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" title="Text Cell" id="jZU-xV-PI4">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
<prototypeCellViews>
<tableCellView identifier="HeaderCell" id="2iF-4F-HfC">
<rect key="frame" x="1" y="1" width="271" height="17"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="9tU-X8-FZn">
<rect key="frame" x="0.0" y="0.0" width="271" height="17"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
<textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="HEADER CELL" id="EUi-TS-vlq">
<font key="font" metaFont="systemBold"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<connections>
<binding destination="2iF-4F-HfC" name="value" keyPath="objectValue.description" id="He3-9c-g9A"/>
</connections>
</textField>
</subviews>
<connections>
<outlet property="textField" destination="9tU-X8-FZn" id="p2B-eV-6bS"/>
</connections>
</tableCellView>
<tableCellView identifier="DataCell" id="7b4-T1-d29">
<rect key="frame" x="1" y="20" width="271" height="17"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="FkS-zP-pRB">
<rect key="frame" x="0.0" y="0.0" width="271" height="17"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
<textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="g6t-E7-0lM">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<connections>
<binding destination="7b4-T1-d29" name="value" keyPath="objectValue.description" id="kp8-ww-1aE"/>
</connections>
</textField>
</subviews>
<connections>
<outlet property="textField" destination="FkS-zP-pRB" id="JkE-pr-7px"/>
</connections>
</tableCellView>
</prototypeCellViews>
</tableColumn>
</tableColumns>
<connections>
<action selector="clickAction:" target="-2" id="O3p-cV-gwk"/>
<outlet property="dataSource" destination="-2" id="nW2-qs-3w6"/>
<outlet property="delegate" destination="-2" id="4Wc-Pe-v81"/>
</connections>
</outlineView>
</subviews>
<nil key="backgroundColor"/>
</clipView>
<scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="kig-a5-Ay0">
<rect key="frame" x="-100" y="-100" width="238" height="15"/>
<autoresizingMask key="autoresizingMask"/>
</scroller>
<scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="lLp-pv-Fbj" customClass="TransparentScroller">
<rect key="frame" x="224" y="17" width="15" height="102"/>
<autoresizingMask key="autoresizingMask"/>
</scroller>
<point key="canvasLocation" x="-91" y="132"/>
</scrollView>
</objects>
</document>
Ample/Base.lproj/MainMenu.xib
-19
View File
@@ -24,7 +24,6 @@
<outlet property="menu" destination="ha0-nx-PIl" id="vTa-TU-DS1"/>
</connections>
</customObject>
<customObject id="3aq-Tx-mno" customClass="SUUpdater"/>
<menu title="Main Menu" systemMenu="main" id="AYu-sK-qS6">
<items>
<menuItem title="Ample" id="1Xt-HY-uBw">
@@ -37,12 +36,6 @@
<action selector="orderFrontStandardAboutPanel:" target="-1" id="Exp-CZ-Vem"/>
</connections>
</menuItem>
<menuItem title="Check for Updates…" id="CPy-r4-rzr">
<modifierMask key="keyEquivalentModifierMask"/>
<connections>
<action selector="checkForUpdates:" target="3aq-Tx-mno" id="qJG-Nv-0Lu"/>
</connections>
</menuItem>
<menuItem isSeparatorItem="YES" id="VOq-y0-SEH"/>
<menuItem title="Preferences…" keyEquivalent="," id="BOF-NM-1cW">
<connections>
@@ -413,19 +406,7 @@
<menuItem title="Manage Bookmarks…" id="isI-q6-b1V">
<modifierMask key="keyEquivalentModifierMask"/>
</menuItem>
<menuItem title="Set Default" id="vbR-vS-lqO">
<modifierMask key="keyEquivalentModifierMask"/>
<connections>
<action selector="defaultSave:" target="-1" id="FP9-EX-OKP"/>
</connections>
</menuItem>
<menuItem isSeparatorItem="YES" id="gWR-Yl-mg6"/>
<menuItem title="Default" id="mXC-Lp-gem">
<modifierMask key="keyEquivalentModifierMask"/>
<connections>
<action selector="defaultLoad:" target="-1" id="ErS-k6-azP"/>
</connections>
</menuItem>
</items>
</menu>
</menuItem>
Ample/Base.lproj/MediaView.xib
-52
View File
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="15705" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<dependencies>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="15705"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
@@ -52,9 +51,6 @@
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<connections>
<binding destination="33q-UT-ur5" name="value" keyPath="objectValue.title" id="JQR-UW-ifh"/>
</connections>
</textField>
</subviews>
<connections>
@@ -73,8 +69,6 @@
</pathCell>
<connections>
<action selector="pathAction:" target="-2" id="4oX-bW-ANp"/>
<binding destination="yGq-lc-RCM" name="enabled" keyPath="objectValue.valid" id="f8P-gt-vmK"/>
<binding destination="yGq-lc-RCM" name="value" keyPath="objectValue.url" id="Ony-ph-VVo"/>
</connections>
</pathControl>
<imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" id="6g1-NT-J1w">
@@ -91,7 +85,6 @@
</buttonCell>
<connections>
<action selector="ejectAction:" target="-2" id="XAl-eQ-nUj"/>
<binding destination="yGq-lc-RCM" name="enabled" keyPath="objectValue.occupied" id="4a4-L7-ztC"/>
</connections>
</button>
</subviews>
@@ -101,51 +94,6 @@
<outlet property="pathControl" destination="f7R-TO-fmF" id="oH7-N3-JC7"/>
</connections>
</tableCellView>
<tableCellView identifier="BBItemView" id="2Nq-Xz-tkV" customClass="TablePathView">
<rect key="frame" x="1" y="46" width="296" height="22"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" id="47E-Ef-Ott">
<rect key="frame" x="0.0" y="1" width="20" height="20"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageAlignment="left" image="drag-handle-4x10" id="vwE-Ev-NBf"/>
</imageView>
<button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="zxn-1E-o34" customClass="EjectButton">
<rect key="frame" x="277" y="3" width="16" height="16"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
<buttonCell key="cell" type="bevel" bezelStyle="regularSquare" image="eject-16x16" imagePosition="only" alignment="center" alternateImage="eject-hover-16x16" imageScaling="proportionallyDown" inset="2" id="Os7-NH-tnx">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
<connections>
<action selector="ejectAction:" target="-2" id="uy2-92-9La"/>
<binding destination="2Nq-Xz-tkV" name="enabled" keyPath="objectValue.occupied" id="SNi-sQ-J2W"/>
</connections>
</button>
<textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="pNE-yJ-EK8">
<rect key="frame" x="20" y="0.0" width="244" height="21"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" placeholderString="socket.address:port or /path/to/file" drawsBackground="YES" id="h2U-ig-Cms">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<connections>
<action selector="textAction:" target="-2" id="lmX-t8-mEc"/>
<binding destination="2Nq-Xz-tkV" name="enabled" keyPath="objectValue.valid" id="ZTM-E3-Y9P"/>
<binding destination="2Nq-Xz-tkV" name="value" keyPath="objectValue.string" id="2dZ-JJ-asM">
<dictionary key="options">
<string key="NSNullPlaceholder">socket.address:port or /path/to/file</string>
</dictionary>
</binding>
</connections>
</textField>
</subviews>
<connections>
<outlet property="dragHandle" destination="47E-Ef-Ott" id="bnY-rz-24V"/>
<outlet property="ejectButton" destination="zxn-1E-o34" id="eC6-Mf-tN6"/>
</connections>
</tableCellView>
</prototypeCellViews>
</tableColumn>
</tableColumns>
Ample/BookmarkManager.m
+2 -2
View File
@@ -138,7 +138,7 @@ static BookmarkManager *singleton = nil;
return [name caseInsensitiveCompare: path] == NSOrderedAscending;
}];
NSMenuItem *item = [[NSMenuItem alloc] initWithTitle: name action: @selector(bookmarkMenu:) keyEquivalent: @""];
NSMenuItem *item = [[NSMenuItem alloc] initWithTitle: name action: @selector(loadBookmark:) keyEquivalent: @""];
[item setRepresentedObject: url];
if (ix == NSNotFound) {
@@ -205,7 +205,7 @@ static BookmarkManager *singleton = nil;
for (NSURL *url in _urls) {
NSString *title = [url lastPathComponent]; // [[url lastPathComponent] stringByDeletingPathExtension];
NSMenuItem *item = [_menu addItemWithTitle: title action: @selector(bookmarkMenu:) keyEquivalent: @""];
NSMenuItem *item = [_menu addItemWithTitle: title action: @selector(loadBookmark:) keyEquivalent: @""];
[item setRepresentedObject: url];
[item setTag: 0xdeadbeef];
}
Ample/Defaults.plist
+1 -1
View File
@@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>MameComponentsDate</key>
<date>2021-07-01T16:00:00Z</date>
<date>2021-05-27T16:00:00Z</date>
<key>UseCustomMame</key>
<false/>
<key>AutoCloseLogWindow</key>
Ample/DiskImagesWindowController.m
+17 -3
View File
@@ -211,10 +211,11 @@
-(NSMutableDictionary *)clickedItem {
NSArray *array = [_arrayController arrangedObjects];
NSInteger row = [_tableView clickedRow];
if (row < 0 || row >= [array count]) return nil;
return [array objectAtIndex: row];
if (row < 0) return nil;
NSTableCellView *v = [_tableView viewAtColumn: 0 row: row makeIfNecessary: NO];
return [v objectValue];
}
#pragma mark - IBActions
@@ -252,6 +253,19 @@
@implementation DiskImagesWindowController (TableView)
#if 0
- (NSInteger)numberOfRowsInTableView:(NSTableView *)tableView {
return 5; //[_data count];
}
- (NSView *)tableView:(NSTableView *)tableView viewForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row {
NSTableCellView *v = [tableView makeViewWithIdentifier: @"PathCell" owner: self];
return v;
}
#endif
-(id<NSPasteboardWriting>)tableView:(NSTableView *)tableView pasteboardWriterForRow:(NSInteger)row {
Ample/DownloadWindowController.h
+8
View File
@@ -26,9 +26,17 @@ NS_ASSUME_NONNULL_BEGIN
@interface DownloadWindowController (URL) <NSURLSessionTaskDelegate, NSURLSessionDownloadDelegate>
@end
@interface DownloadWindowController (Table) <NSTableViewDelegate, NSTableViewDataSource>
@end
@interface DownloadWindowController (Menu) <NSMenuDelegate, NSMenuItemValidation>
@end
@interface DownloadTableCellView : NSTableCellView
@property (weak) IBOutlet NSTextField *statusTextField;
@property (weak) IBOutlet NSProgressIndicator *activity;
@end
NS_ASSUME_NONNULL_END
Ample/DownloadWindowController.m
+90 -110
View File
@@ -90,9 +90,6 @@ enum {
@property NSUInteger status;
@property NSUInteger index;
@property (readonly) NSColor *titleColor;
@property (readonly) NSColor *descriptionColor;
-(void)cancelDownload;
-(void)beginDownloadWithTask:(NSURLSessionDownloadTask *)task;
@@ -101,21 +98,6 @@ enum {
@end
@interface DownloadItemArrayController : NSArrayController
@property(readonly, copy) NSArray<NSString *> *automaticRearrangementKeyPaths;
@end
@implementation DownloadItemArrayController
-(NSArray<NSString *> *)automaticRearrangementKeyPaths {
return @[@"localURL"]; // , @"error", @"task", @"statusDescription"];
}
@end
@interface DownloadWindowController ()
@property (weak) IBOutlet NSTableView *tableView;
@@ -123,14 +105,6 @@ enum {
@property (weak) IBOutlet NSTextField *downloadField;
@property NSString *downloadExtension;
/* filter buttons */
@property (weak) IBOutlet NSButton *allFilterButton;
@property (weak) IBOutlet NSButton *missingFilterButton;
@property (strong) IBOutlet NSArrayController *arrayController;
@end
@implementation DownloadWindowController {
@@ -143,8 +117,6 @@ enum {
NSURLSession *_session;
NSMutableDictionary *_taskIndex;
NSUserDefaults *_defaults;
NSArray<NSButton *> *_filterButtons;
}
+(instancetype)sharedInstance {
@@ -194,12 +166,6 @@ enum {
[window setRestorationClass: [self class]];
#endif
_filterButtons = @[
_allFilterButton,
_missingFilterButton
];
// Implement this method to handle any initialization after your window controller's window has been loaded from its nib file.
NSError *error = nil;
@@ -251,7 +217,6 @@ enum {
}
_items = tmp;
[self refreshROMs: nil];
[_arrayController setContent: _items];
//[_tableView reloadData];
NSURLSessionConfiguration *config = [NSURLSessionConfiguration defaultSessionConfiguration];
@@ -334,10 +299,8 @@ enum {
-(DownloadItem *)clickedItem {
NSInteger row = [_tableView clickedRow];
if (row < 0 || row >= [_items count]) return nil;
return [[_arrayController arrangedObjects] objectAtIndex: row];
//return [_items objectAtIndex: row];
return [_items objectAtIndex: row];
}
#if 0
-(void)redrawRow: (NSUInteger)row {
//NSRect r = [_tableView rectOfRow: row];
@@ -348,7 +311,7 @@ enum {
[_tableView reloadDataForRowIndexes: rIx columnIndexes: cIx];
}
#endif
-(void)initializeExtensionMenu {
@@ -386,6 +349,9 @@ enum {
[_taskIndex removeAllObjects];
[self setCurrentCount: 0];
[self setActive: NO];
[_tableView reloadData];
//[_tableView setNeedsDisplay: YES]; // doesn't work...
}
- (IBAction)downloadMissing:(id)sender {
@@ -402,6 +368,7 @@ enum {
if (delta) {
[self setActive: YES];
[_tableView reloadData];
}
}
- (IBAction)showRomFolder:(id)sender {
@@ -432,10 +399,11 @@ enum {
[item setLocalURL: [NSURL fileURLWithPath: path]];
continue;
}
[item setStatus: ItemMissing];
[item setLocalURL: nil];
}
// only needed if items aren't bound.
[_tableView reloadData];
}
- (IBAction)showInFinder:(id)sender {
@@ -454,12 +422,14 @@ enum {
[self downloadItem: item];
[self setActive: YES];
[self redrawRow: [item index]];
}
- (IBAction)cancel:(id)sender {
DownloadItem *item = [self clickedItem];
if (!item) return;
[item cancelDownload];
[self redrawRow: [item index]];
}
// binding screws up with placeholder.
@@ -479,35 +449,6 @@ enum {
[_defaults setValue: _downloadExtension forKey: kDownloadExtension];
}
- (IBAction)filterButton:(id)sender {
NSPredicate *p = nil;
NSUInteger tag = [sender tag];
[sender setState: NSControlStateValueOn];
for (NSButton *b in _filterButtons) {
if (b != sender) [b setState: NSControlStateValueOff];
}
switch (tag) {
case 1: // all
default:
[_arrayController setFilterPredicate: nil];
break;
case 2: // missing.
p = [NSPredicate predicateWithBlock: ^BOOL(DownloadItem *item, NSDictionary *bindings){
NSURL *localURL = [item localURL];
return localURL == nil;
}];
[_arrayController setFilterPredicate: p];
break;
}
}
#pragma mark - NSURLSessionDelegate
static NSInteger TaskStatusCode(NSURLSessionTask *task) {
@@ -554,6 +495,9 @@ static NSInteger TaskStatusCode(NSURLSessionTask *task) {
if (item) {
[item completeWithError: error];
NSUInteger row = [item index];
[self redrawRow: row];
}
});
@@ -577,57 +521,106 @@ static NSInteger TaskStatusCode(NSURLSessionTask *task) {
[fm moveItemAtURL: location toURL: dest error: &error];
dispatch_async(dispatch_get_main_queue(), ^(void){
NSMutableDictionary *taskIndex = self->_taskIndex;
DownloadItem *item = [taskIndex objectForKey: task];
[item setLocalURL: dest];
});
DownloadItem *item = [_taskIndex objectForKey: task];
[item setLocalURL: dest];
/*
dispatch_async(dispatch_get_main_queue(), ^(void){
[item setLocalURL: dest];
}
*/
NSLog(@"%@", src);
}
@end
@implementation DownloadWindowController (Table)
- (NSInteger)numberOfRowsInTableView:(NSTableView *)tableView {
return [_items count];
}
- (id)tableView:(NSTableView *)tableView objectValueForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row {
return [_items objectAtIndex: row];
}
- (NSView *)tableView:(NSTableView *)tableView viewForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row {
DownloadItem *item = [_items objectAtIndex: row];
DownloadTableCellView *v = [tableView makeViewWithIdentifier: @"DownloadCell" owner: self];
NSTextField *tf;
NSColor *redColor = [NSColor systemRedColor];
tf = [v textField];
[[v textField] setObjectValue: [item name]];
if ([item localURL]) {
[tf setTextColor: nil];
} else {
[tf setTextColor: redColor];
}
tf = [v statusTextField];
[tf setObjectValue: [item statusDescription]];
if ([item error]) {
[tf setTextColor: redColor];
} else {
[tf setTextColor: nil];
//if ([tableView isRowSelected: row]){
//[tf setTextColor: [NSColor whiteColor]];
//}
}
if ([item task]) {
[[v activity] startAnimation: nil];
} else {
[[v activity] stopAnimation: nil];
}
return v;
}
@end
@implementation DownloadTableCellView
@end
@implementation DownloadItem
-(void)beginDownloadWithTask:(NSURLSessionDownloadTask *)task {
[self setTask: task];
[self setError: nil];
if (task) [self setStatus: ItemDownloading];
_task = task;
_error = nil;
if (task) _status = ItemDownloading;
}
-(void)cancelDownload {
if (!_task) return;
[_task cancel];
[self setTask: nil];
[self setStatus: ItemCanceled];
_task = nil;
_status = ItemCanceled;
}
-(void)completeWithError: (NSError *)error {
[self setTask: nil];
_task = nil;
if (error) {
[self setError: error];
[self setStatus: ItemError];
_error = error;
_status = ItemError;
} else {
// what if there was an error moving it?
[self setError: nil];
[self setStatus: ItemDownloaded];
_error = nil;
_status = ItemDownloaded;
}
}
#if 0
// in practice, error and status set concurrently.
+(NSSet *)keyPathsForValuesAffectingStatus {
static NSSet *set = nil;
if (!set) set = [NSSet setWithObjects: @"error", nil];
return set;
}
#endif
-(NSString *)statusDescription {
static NSString *Names[] = {
@@ -644,19 +637,6 @@ static NSInteger TaskStatusCode(NSURLSessionTask *task) {
return Names[_status];
}
+(NSSet *)keyPathsForValuesAffectingTitleColor {
return [NSSet setWithObject: @"localURL"];
}
-(NSColor *)titleColor {
return _localURL ? nil : [NSColor systemRedColor];
}
+(NSSet *)keyPathsForValuesAffectingDescriptionColor {
return [NSSet setWithObject: @"error"];
}
-(NSColor *)descriptionColor {
return _error ? [NSColor systemRedColor] : nil;
}
@end
@@ -675,7 +655,7 @@ enum {
NSInteger row = [_tableView clickedRow];
if (row < 0) return NO;
DownloadItem *item = [[_arrayController arrangedObjects] objectAtIndex: row]; //[_items objectAtIndex: row];
DownloadItem *item = [_items objectAtIndex: row];
NSUInteger status = [item status];
switch([menuItem tag]) {
Ample/Info.plist
+1 -5
View File
@@ -50,7 +50,7 @@
<key>LSMinimumSystemVersion</key>
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2020-2021 Kelvin Sherlock. All rights reserved.</string>
<string>Copyright © 2020 Kelvin Sherlock. All rights reserved.</string>
<key>NSMainNibFile</key>
<string>MainMenu</string>
<key>NSPrincipalClass</key>
@@ -59,9 +59,5 @@
<true/>
<key>NSSupportsSuddenTermination</key>
<true/>
<key>SUFeedURL</key>
<string>https://ample.ksherlock.com/updates/appcast.xml</string>
<key>SUPublicEDKey</key>
<string>MgYKY5J1nIJ9+C3IabG24ri2M0CuoMqP78fva2GI5BY=</string>
</dict>
</plist>
Ample/LaunchWindowController.h
+1 -1
View File
@@ -10,7 +10,7 @@
NS_ASSUME_NONNULL_BEGIN
@interface LaunchWindowController : NSWindowController <NSBrowserDelegate, NSMenuDelegate>
@interface LaunchWindowController : NSWindowController <NSBrowserDelegate>
@end
Ample/LaunchWindowController.m
+38 -327
View File
@@ -10,7 +10,7 @@
#import "LaunchWindowController.h"
#import "MediaViewController.h"
#import "SlotViewController.h"
#import "NewMachineViewController.h"
#import "MachineViewController.h"
#import "LogWindowController.h"
#import "AutocompleteControl.h"
@@ -26,12 +26,10 @@ static NSString *kContextMachine = @"kContextMachine";
@interface LaunchWindowController () {
BOOL _loadingBookmark;
NSString *_machine;
NSDictionary *_machineDescription;
}
@property (strong) IBOutlet MediaViewController *mediaController;
@property (strong) IBOutlet SlotViewController *slotController;
@property (strong) IBOutlet NewMachineViewController *machineViewController;
@property (strong) IBOutlet MachineViewController *machineViewController;
@property (weak) IBOutlet NSView *machineView;
@property (weak) IBOutlet NSView *slotView;
@@ -41,9 +39,7 @@ static NSString *kContextMachine = @"kContextMachine";
@property NSString *commandLine;
@property NSArray *args;
@property NSString *machine;
//@property NSString *machineName;
@property NSString *mameMachine;
@property BOOL mameDebug;
@property BOOL mameSquarePixels;
@property BOOL mameMouse;
@@ -53,14 +49,12 @@ static NSString *kContextMachine = @"kContextMachine";
@property BOOL mameAVI;
@property BOOL mameWAV;
@property BOOL mameVGM;
@property BOOL mameBitBanger;
@property BOOL mameShareDirectory;
@property NSString *mameAVIPath;
@property NSString *mameWAVPath;
@property NSString *mameVGMPath;
@property NSString *mameShareDirectoryPath;
@property NSString *mameBitBangerPath;
@property NSString *mameShareDirectory;
@property NSString *mameBitBanger;
@property NSInteger mameSpeed;
@@ -79,9 +73,6 @@ static NSString *kContextMachine = @"kContextMachine";
@property (strong) IBOutlet NSWindow *addBookmarkWindow;
@property (strong) NSString *bookmarkName;
@property (weak) IBOutlet NSTextField *bookmarkTextField;
@property BOOL optionKey;
@end
@interface LaunchWindowController (SoftwareList)
@@ -95,11 +86,8 @@ static NSString *kContextMachine = @"kContextMachine";
-(IBAction)addBookmark:(id)sender;
-(IBAction)defaultLoad:(id)sender;
@end
#define SIZEOF(x) (sizeof(x) / sizeof(x[0]))
static NSString *BackendStrings[] = {
@"",
@"metal",
@@ -116,22 +104,6 @@ static NSString *EffectsStrings[] = {
};
static int BackEndIndex(NSString *str) {
if (!str) return -1;
for (int i = 1; i < SIZEOF(BackendStrings); ++i) {
if ([str isEqualToString: BackendStrings[i]]) return i;
}
return -1;
}
static int EffectsIndex(NSString *str) {
if (!str) return -1;
for (int i = 1; i < SIZEOF(EffectsStrings); ++i) {
if ([str isEqualToString: EffectsStrings[i]]) return i;
}
return -1;
}
@implementation LaunchWindowController
@@ -139,76 +111,23 @@ static int EffectsIndex(NSString *str) {
return @"LaunchWindow";
}
-(void)reset {
// handled elsewhere.
//[self setMachine: nil];
-(void)windowWillLoad {
[self setMameSpeed: 1];
[self setMameBGFX: YES];
[self setMameMouse: NO];
[self setMameSamples: NO];
[self setMameSquarePixels: NO];
[self setMameDebug: NO];
[self setMameWindowMode: 1]; // default = 1x window.
[self setMameBackend: 0];
[self setMameEffects: 0];
[self setMameBitBangerPath: nil];
[self setMameShareDirectoryPath: nil];
[self setMameAVIPath: nil];
[self setMameWAVPath: nil];
[self setMameVGMPath: nil];
[self setMameAVI: NO];
[self setMameWAV: NO];
[self setMameVGM: NO];
[self setMameBitBanger: NO];
[self setMameShareDirectory: NO];
#if 0
[self setSoftware: nil];
//_softwareSet = nil;
[_softwareListControl setObjectValue: nil];
#endif
}
-(void)resetSoftware {
[self setSoftware: nil];
//_softwareSet = nil;
[_softwareListControl setObjectValue: nil];
}
-(void)windowWillLoad {
// if this calls [self window], it will recurse. that is bad.
//[self defaultLoad: nil];
[self reset];
}
static void AddSubview(NSView *parent, NSView *child) {
[child setFrame: [parent bounds]];
[parent addSubview: child];
[self setMameSamples: YES];
}
- (void)windowDidLoad {
[super windowDidLoad];
// Implement this method to handle any initialization after your window controller's window has been loaded from its nib file.
AddSubview(_slotView, [_slotController view]);
AddSubview(_mediaView, [_mediaController view]);
AddSubview(_machineView, [_machineViewController view]);
// can't be done until above views are set up.
[self defaultLoad: nil];
[_slotView addSubview: [_slotController view]];
[_mediaView addSubview: [_mediaController view]];
[_machineView addSubview: [_machineViewController view]];
NSArray *keys = @[
//@"mameMachine", // - handled
@@ -219,8 +138,7 @@ static void AddSubview(NSView *parent, NSView *child) {
@"mameAVI", @"mameAVIPath",
@"mameWAV", @"mameWAVPath",
@"mameVGM", @"mameVGMPath",
@"mameShareDirectory", @"mameShareDirectoryPath",
@"mameBitBanger", @"mameBitBangerPath",
@"mameShareDirectory", @"mameBitBanger",
@"mameBGFX", @"mameBackend", @"mameEffects",
@"software",
];
@@ -254,8 +172,9 @@ static void AddSubview(NSView *parent, NSView *child) {
if (_loadingBookmark) return;
NSString *machine = [_machineViewController machine];
[self setMachine: machine];
[self setMameMachine: machine];
[_slotController setMachine: machine];
[self updateSoftwareList];
[self buildCommandLine];
} else {
[super observeValueForKeyPath: keyPath ofObject: object change: change context: context];
@@ -264,35 +183,6 @@ static void AddSubview(NSView *parent, NSView *child) {
-(NSString *)machine {
return _machine;
}
-(void)setMachine:(NSString *)machine {
if (_machine == machine) return;
_machine = machine;
_machineDescription = MameMachine(machine);
#if 0
[self setMachineName: [_machineDescription objectForKey: @"description"]];
#else
NSString *title = _machineDescription
? [NSString stringWithFormat: @"Ample – %@", [_machineDescription objectForKey: @"description"]]
: @"Ample";
[[self window] setTitle: title];
#endif
// enable/disable the right-click menu
NSWindow *window = [self window];
NSView *view = [window contentView];
if (_machine) [view setMenu: [window menu]];
else [view setMenu: nil];
// software list.
[self updateSoftwareList];
}
static NSString * JoinArguments(NSArray *argv, NSString *argv0) {
@@ -434,7 +324,7 @@ static NSString *ShellQuote(NSString *s) {
NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
if (!_machine) {
if (!_mameMachine) {
[self setCommandLine: @""];
return;
}
@@ -442,11 +332,13 @@ static NSString *ShellQuote(NSString *s) {
NSMutableArray *argv = [NSMutableArray new];
//[argv addObject: @"mame"];
[argv addObject: _machine];
[argv addObject: _mameMachine];
if (_software) {
NSString *name = [_softwareSet nameForSoftware: _software];
if (name) [argv addObject: name];
NSString *name = [_software name];
if (![_softwareSet nameIsUnique: name])
name = [_software fullName];
[argv addObject: name];
}
// -confirm_quit?
@@ -564,14 +456,14 @@ static NSString *ShellQuote(NSString *s) {
}
}
if (_mameShareDirectory && [_mameShareDirectoryPath length]) {
if (_mameShareDirectory && [_mameShareDirectory length]) {
[argv addObject: @"-share_directory"];
[argv addObject: _mameShareDirectoryPath];
[argv addObject: _mameShareDirectory];
}
if (_mameBitBanger && [_mameBitBangerPath length]) {
if (_mameBitBanger && [_mameBitBanger length]) {
[argv addObject: @"-bitbanger"];
[argv addObject: _mameBitBangerPath];
[argv addObject: _mameBitBanger];
}
[self setCommandLine: JoinArguments(argv, nil)];
@@ -585,7 +477,7 @@ static NSString *ShellQuote(NSString *s) {
return [_args count] ? YES : NO;
}
if (cmd == @selector(addBookmark:)) {
return _machine ? YES : NO;
return _mameMachine ? YES : NO;
}
return YES;
@@ -603,67 +495,11 @@ static NSString *ShellQuote(NSString *s) {
}
- (IBAction)listMedia:(id)sender {
[[self window] makeFirstResponder: nil]; // in case text is being edited...
if (!_machine) return;
NSMutableArray *argv = [NSMutableArray new];
[argv addObject: _machine];
[argv addObject: @"-listmedia"];
NSArray *tmp;
tmp = [_slotController args];
if ([tmp count]) {
[argv addObjectsFromArray: tmp];
}
#if 0
tmp = [_mediaController args];
if ([tmp count]) {
[argv addObjectsFromArray: tmp];
}
#endif
[LogWindowController controllerForArgs: argv close: NO];
}
- (IBAction)listSlots:(id)sender {
[[self window] makeFirstResponder: nil]; // in case text is being edited...
if (!_machine) return;
NSMutableArray *argv = [NSMutableArray new];
[argv addObject: _machine];
[argv addObject: @"-listslots"];
NSArray *tmp;
tmp = [_slotController args];
if ([tmp count]) {
[argv addObjectsFromArray: tmp];
}
#if 0
tmp = [_mediaController args];
if ([tmp count]) {
[argv addObjectsFromArray: tmp];
}
#endif
[LogWindowController controllerForArgs: argv close: NO];
}
-(IBAction)exportShellScript: (id)sender {
NSSavePanel *p = [NSSavePanel savePanel];
NSString *defaultName = [_machine stringByAppendingString: @".sh"];
NSString *defaultName = [_mameMachine stringByAppendingString: @".sh"];
[p setTitle: @"Export Shell Script"];
[p setExtensionHidden: NO];
@@ -704,26 +540,6 @@ static NSString *ShellQuote(NSString *s) {
}];
}
-(IBAction)resetMachine:(id)sender {
[self reset];
}
-(IBAction)resetAll:(id)sender {
[self reset];
[self resetSoftware];
[_slotController resetSlots: sender];
[_mediaController resetMedia: sender];
}
-(IBAction)resetMedia:(id)sender {
[_mediaController resetMedia: sender];
[_softwareListControl setObjectValue: nil];
[self setSoftware: nil];
}
@end
@@ -731,7 +547,7 @@ static NSString *ShellQuote(NSString *s) {
-(void)updateSoftwareList {
_softwareSet = [SoftwareSet softwareSetForMachine: _machine];
_softwareSet = [SoftwareSet softwareSetForMachine: _mameMachine];
[_softwareListControl setAutocompleteDelegate: _softwareSet];
@@ -757,39 +573,11 @@ static NSString *ShellQuote(NSString *s) {
@implementation LaunchWindowController (Bookmark)
-(IBAction)defaultSave:(id)sender {
BookmarkManager *bm = [BookmarkManager sharedManager];
NSDictionary *d = [self makeBookmark];
[bm saveDefault: d];
}
-(IBAction)defaultLoad:(id)sender {
BookmarkManager *bm = [BookmarkManager sharedManager];
NSDictionary *d = [bm loadDefault];
if (!d) {
[self resetAll: sender];
[self setMachine: nil];
[_machineViewController reset];
[_slotController setMachine: nil];
return;
}
[self loadBookmark: d];
}
-(IBAction)addBookmark:(id)sender {
if (!_machine) return;
if (!_mameMachine) return;
NSString *name = nil;
if (_machineDescription) name = [_machineDescription objectForKey:@"description"];
if (!name) name = _machine;
NSString *name = _mameMachine;
if (_software) {
name = [name stringByAppendingFormat: @" - %@", [_software title]];
}
@@ -814,7 +602,10 @@ static NSString *ShellQuote(NSString *s) {
return;
}
//NSLog(@"%@", _bookmarkName);
NSDictionary *d = [self makeBookmark];
//NSLog(@"%@", d);
[bm saveBookmark: d name: _bookmarkName];
@@ -824,23 +615,13 @@ static NSString *ShellQuote(NSString *s) {
}
-(IBAction)bookmarkMenu:(id)sender {
-(IBAction)loadBookmark:(id)sender {
NSURL *url = [sender representedObject];
if (!url) return;
NSDictionary *d = [NSDictionary dictionaryWithContentsOfURL: url];
if (!d) return; // oops...
[self loadBookmark: d];
}
-(void)loadBookmark: (NSDictionary *)d {
Class StringClass = [NSString class];
Class NumberClass = [NSNumber class];
NSString *machine = [d objectForKey: @"machine"];
if (!machine) return;
@@ -849,73 +630,11 @@ static NSString *ShellQuote(NSString *s) {
[_slotController willLoadBookmark: d];
[_mediaController willLoadBookmark: d];
[self reset];
[self setMachine: machine];
[self setMameMachine: machine];
[self updateSoftwareList];
[_softwareListControl setObjectValue: nil]; // will reload the completion list.
NSString *str;
[_softwareListControl setStringValue: [d objectForKey: @"software"]];
str = [d objectForKey: @"software"];
if ([str isKindOfClass: StringClass]) {
Software *s = [_softwareSet softwareForName: str];
if (s) {
[_softwareListControl setObjectValue: s];
[self setSoftware: s];
}
}
// Boolean values.
NSNumber *n;
#undef _
#define _(a,b) n = [d objectForKey: a]; if ([n isKindOfClass: NumberClass]) [self b : [n boolValue]]
_(@"debug", setMameDebug);
_(@"squarePixels", setMameSquarePixels);
_(@"mouse", setMameMouse);
_(@"samples", setMameSamples);
_(@"bgfx", setMameBGFX);
// numeric values
// check if in range?
#undef _
#define _(a,b) n = [d objectForKey: a]; if ([n isKindOfClass: NumberClass]) [self b : [n intValue]]
_(@"windowMode", setMameWindowMode);
_(@"speed", setMameSpeed);
// string values
#undef _
#define _(a,b) str = [d objectForKey: a]; if ([str isKindOfClass: StringClass]) [self b : str]
_(@"shareDirectory", setMameShareDirectoryPath);
_(@"bitBanger", setMameBitBangerPath);
if ([_mameShareDirectoryPath length]) [self setMameShareDirectory: YES];
if ([_mameBitBangerPath length]) [self setMameBitBanger: YES];
_(@"AVIPath", setMameAVIPath);
_(@"WAVPath", setMameWAVPath);
_(@"VGMPath", setMameVGMPath);
if ([_mameAVIPath length]) [self setMameAVI: YES];
if ([_mameVGMPath length]) [self setMameVGM: YES];
if ([_mameWAVPath length]) [self setMameWAV: YES];
str = [d objectForKey: @"backend"];
if ([str isKindOfClass: [NSString class]]) {
int ix = BackEndIndex(str);
if (ix >= 0) [self setMameBackend: ix];
}
str = [d objectForKey: @"effects"];
if ([str isKindOfClass: [NSString class]]) {
int ix = EffectsIndex(str);
if (ix >= 0) [self setMameEffects: ix];
}
[_machineViewController loadBookmark: d];
[_slotController loadBookmark: d];
[_mediaController loadBookmark: d];
@@ -935,7 +654,7 @@ static NSString *ShellQuote(NSString *s) {
NSMutableDictionary *dict = [NSMutableDictionary new];
[dict setObject: _machine forKey: @"machine"];
[dict setObject: _mameMachine forKey: @"machine"];
[dict setObject: @232 forKey: @"version"];
[_machineViewController saveBookmark: dict];
[_slotController saveBookmark: dict];
@@ -966,8 +685,8 @@ static NSString *ShellQuote(NSString *s) {
if (_mameWAV && [_mameWAVPath length]) _(_mameWAVPath, @"WAVPath");
if (_mameVGM && [_mameVGMPath length]) _(_mameVGMPath, @"VGMPath");
if (_mameShareDirectory && [_mameShareDirectoryPath length]) _(_mameShareDirectoryPath, @"shareDirectory");
if (_mameBitBanger && [_mameBitBangerPath length]) _(_mameBitBangerPath, @"bitBanger");
if ([_mameShareDirectory length]) _(_mameShareDirectory, @"shareDirectory");
if ([_mameBitBanger length]) _(_mameBitBanger, @"shareDirectory");
if (_software) _([_software fullName], @"software");
@@ -983,12 +702,4 @@ static NSString *ShellQuote(NSString *s) {
}
#pragma mark - NSMenuDelegate
-(void)menuNeedsUpdate:(NSMenu *)menu {
NSEventModifierFlags modifiers = [NSEvent modifierFlags];
[self setOptionKey: modifiers & NSEventModifierFlagOption ? YES : NO];
}
@end
Ample/LogWindowController.h
-5
View File
@@ -12,13 +12,8 @@ NS_ASSUME_NONNULL_BEGIN
@interface LogWindowController : NSWindowController <NSWindowDelegate>
#if 0
+(id)controllerForTask: (NSTask *)task;
+(id)controllerForTask: (NSTask *)task close: (BOOL)close;
#endif
+(id)controllerForArgs: (NSArray *)args;
+(id)controllerForArgs: (NSArray *)args close: (BOOL)close;
@end
NS_ASSUME_NONNULL_END
Ample/LogWindowController.m
+30 -53
View File
@@ -19,10 +19,6 @@ static NSMutableSet *LogWindows;
@implementation LogWindowController {
NSTask *_task;
NSFileHandle *_handle;
NSFont *_font;
BOOL _close;
BOOL _eof;
}
+(void)initialize {
@@ -34,14 +30,17 @@ static NSMutableSet *LogWindows;
}
+(id)controllerForTask: (NSTask *)task close: (BOOL)close{
+(id)controllerForTask: (NSTask *)task {
LogWindowController *controller = [[LogWindowController alloc] initWithWindowNibName: @"LogWindow"];
[controller runTask: task close: close];
[controller runTask: task];
return controller;
}
+(id)controllerForArgs: (NSArray *)args close: (BOOL)close {
+(id)controllerForArgs: (NSArray *)args {
// NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
NSURL *url = MameURL();
@@ -65,24 +64,15 @@ static NSMutableSet *LogWindows;
[task setArguments: args];
return [LogWindowController controllerForTask: task close: close];
}
+(id)controllerForArgs: (NSArray *)args {
NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
BOOL close = [defaults boolForKey: kAutoCloseLogWindow];
return [self controllerForArgs: args close: close];
return [LogWindowController controllerForTask: task];
}
- (void)windowDidLoad {
[super windowDidLoad];
[LogWindows addObject: self];
_font = [NSFont userFixedPitchFontOfSize: 0];
// Implement this method to handle any initialization after your window controller's window has been loaded from its nib file.
}
-(void)appendString: (NSString *)string
@@ -90,10 +80,7 @@ static NSMutableSet *LogWindows;
if ([string length])
{
// needs explicit color attribute for proper dark mode support.
NSDictionary *attr = @{
NSForegroundColorAttributeName: [NSColor textColor],
NSFontAttributeName: _font,
};
NSDictionary *attr = @{ NSForegroundColorAttributeName: [NSColor textColor] };
NSAttributedString *astr = [[NSAttributedString alloc] initWithString: string attributes: attr];
[[_textView textStorage] appendAttributedString: astr];
}
@@ -106,12 +93,10 @@ static NSMutableSet *LogWindows;
}
}
-(NSError *)runTask: (NSTask *)task close: (BOOL)close {
-(NSError *)runTask: (NSTask *)task {
if (_task) return nil;
_close = close;
_eof = NO;
NSPipe *pipe = [NSPipe pipe];
@@ -145,6 +130,16 @@ static NSMutableSet *LogWindows;
}
}
#if 0
if (error) {
// NSURL *url = [task executableURL];
// NSString *path = [NSString stringWithCString: [url fileSystemRepresentation] encoding: NSUTF8StringEncoding];
NSLog(@"NSTask error. Path = %s error = %@", path, error);
// [self appendString: path];
// [self appendString: [error description]];
return error;
}
#endif
_task = task;
NSString *title = [NSString stringWithFormat: @"Ample Log - %u", [task processIdentifier]];
[[self window] setTitle: title];
@@ -155,7 +150,6 @@ static NSMutableSet *LogWindows;
NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
[nc addObserver: self
selector: @selector(taskComplete:)
name: NSTaskDidTerminateNotification
@@ -166,7 +160,6 @@ static NSMutableSet *LogWindows;
object: _handle];
[_handle readInBackgroundAndNotify];
[[self window] setDocumentEdited: YES];
return nil;
}
@@ -179,33 +172,21 @@ static NSMutableSet *LogWindows;
// read complete, queue up another.
NSDictionary *dict = [notification userInfo];
NSData *data = [dict objectForKey: NSFileHandleNotificationDataItem];
if ([data length])
{
NSString *string = [[NSString alloc] initWithData: data encoding: NSUTF8StringEncoding];
[self appendString: string];
[_handle readInBackgroundAndNotify];
} else {
[self appendString: @"\n"]; // -listmedia sometimes causes display issues.
_eof = YES;
//[_textView setNeedsDisplay: YES]; // -listmedia sometimes weird.
}
}
-(void)taskCompleteHack {
}
/* hask! task complete may occur while output still being processed. add a delay to compensate. */
-(void)taskComplete: (NSNotification *)notification
{
if (!_eof) {
[self performSelector: @selector(taskComplete:) withObject: notification afterDelay: 0.5];
return;
}
BOOL ok = NO;
NSTaskTerminationReason reason;
int status;
@@ -219,7 +200,7 @@ static NSMutableSet *LogWindows;
if (status == 0)
{
//string = @"\n\n[Success]\n\n";
string = @"\n\n[Success]\n\n";
ok = YES;
}
else string = @"\n\n[An error occurred]\n\n";
@@ -228,22 +209,18 @@ static NSMutableSet *LogWindows;
{
string = [NSString stringWithFormat: @"\n\n[Caught signal %d (%s)]\n\n", status, strsignal(status)];
}
if (string) {
NSDictionary *attr = @{
NSForegroundColorAttributeName: [NSColor systemRedColor],
NSFontAttributeName: _font,
};
NSAttributedString *astr = [[NSAttributedString alloc] initWithString: string attributes: attr];
[self appendAttributedString: astr];
}
[self appendString: string];
_handle = nil;
_task = nil;
[[self window] setDocumentEdited: NO];
if (ok && _close) {
if (ok && [[NSUserDefaults standardUserDefaults] boolForKey: kAutoCloseLogWindow]) {
[[self window] close];
//[LogWindows removeObject: self]; // close sends WindowWillClose notification.
}
}
Ample/Media.h
-1
View File
@@ -17,7 +17,6 @@ typedef struct Media {
unsigned floppy_5_25;
unsigned floppy_3_5;
unsigned pseudo_disk;
unsigned bitbanger;
} Media;
struct Media MediaFromDictionary(NSDictionary *);
Ample/Media.m
-144
View File
@@ -22,7 +22,6 @@ struct Media MediaFromDictionary(NSDictionary *dict) {
_(floppy_3_5);
_(floppy_5_25);
_(pseudo_disk);
_(bitbanger);
return m;
#undef _
@@ -39,7 +38,6 @@ void MediaAdd(Media *dest, const Media *src) {
_(floppy_3_5);
_(floppy_5_25);
_(pseudo_disk);
_(bitbanger);
#undef _
}
@@ -55,148 +53,6 @@ BOOL MediaEqual(const Media *lhs, const Media *rhs) {
_(floppy_3_5);
_(floppy_5_25);
_(pseudo_disk);
_(bitbanger);
return YES;
#undef _
}
#include <unistd.h>
#include <sys/stat.h>
enum {
MediaType_5_25,
MediaType_3_5,
MediaType_HardDisk,
MediaType_CD,
MediaType_Cassette,
};
#define _x2(a,b) (a | (b << 8))
#define _x3(a,b,c) (a | (b << 8) | (c << 16))
#define _x4(a,b,c, d) (a | (b << 8) | (c << 16) | (d << 24))
static unsigned hash(const char *cp) {
unsigned rv = 0;
int i, shift;
if (!cp) return 0;
for (i = 0, shift = 0; i < 4; ++i, shift += 8) {
unsigned c = cp[0];
if (!c) break;
c = tolower(c);
rv |= (c << shift);
}
if (i > 4) return 0;
return rv;
}
const char *extname(const char *path) {
const char *rv = NULL;
if (!path) return path;
for(unsigned i = 0; ; ++i) {
unsigned c = path[i];
if (c == 0) break;
if (c == '/') rv = NULL;
if (c == '.') rv = path + i + 1;
}
if (rv && !*rv) rv = NULL;
return rv;
}
int ClassifyMediaFile(NSString *file) {
struct stat st;
ssize_t size;
unsigned char buffer[128];
int fd;
const char *path = [file fileSystemRepresentation];
const char *ext = extname(path);
unsigned ext_hash = hash(ext);
memset(&st, 0, sizeof(st));
memset(buffer, 0, sizeof(buffer));
fd = open(path, O_RDONLY);
if (fd < 0) return -1;
fstat(fd, &st);
size = read(fd, buffer, sizeof(buffer));
close(fd);
if (size <= 0) return -1;
// 13 sector support ? not on an event 512 block boundary.
// = 116480 bytes.
/* woz 1/2 ? */
if (!memcmp(buffer, "WOZ1\xff\x0a\x0d\x0a", 8) || !memcmp(buffer, "WOZ2\xff\x0a\x0d\x0a", 8)) {
if (!memcmp(buffer + 12, "INFO", 4)) {
unsigned type = buffer[21]; // 1 = 5.25, 2 = 3.5
if (type == 1) return MediaType_5_25;
if (type == 2) return MediaType_3_5;
}
return -1;
}
/* 2mg? */
if (!memcmp(buffer, "2IMG", 4)) {
int format = OSReadLittleInt32(buffer, 0x0c); // 0 - dos order, 1 = prodos order, 2 = nib data
int blocks = OSReadLittleInt32(buffer, 0x14); // prodos only.
//int bytes = OSReadLittleInt32(buffer, 0x1c);
if (format == 2 || format == 0) return MediaType_5_25; // nib and dos order
if (blocks == 280) return MediaType_5_25;
if (blocks == 800 || blocks == 1600 || blocks == 1440 || blocks == 2880) return MediaType_3_5;
if (blocks > 2880) return MediaType_HardDisk; //
return -1;
}
/* chd? */
if (!memcmp(buffer, "MComprHD", 8)) {
static int offsets[] = { 0, 0, 0, 28, 28, 32}; // offset for logival bytes.
int version = OSReadBigInt32(buffer, 12);
if (version >= 3 && version <= 5) {
long bytes = OSReadBigInt64(buffer, offsets[version]);
long blocks = bytes >> 9;
if ((bytes & 511) == 0) {
if (blocks == 800 || blocks == 1600 || blocks == 1440 || blocks == 2880) return MediaType_3_5;
if (blocks == 280) return MediaType_5_25;
if (blocks > 2880) return MediaType_HardDisk; // iso?
}
}
return -1;
}
/* dc 4.2? magic is pretty weak. */
if (buffer[0x52] == 0x01 && buffer[0x53] == 0x00 && buffer[0] >= 1 && buffer[0] <= 0x3f) {
int dsize = OSReadBigInt32(buffer, 0x40);
int tsize = OSReadBigInt32(buffer, 0x44);
if (dsize + tsize + 0x54 == st.st_size && (size & 511) == 0) {
int blocks = dsize >>= 9;
if (blocks == 800 || blocks == 1600 || blocks == 1440 || blocks == 2880) return MediaType_3_5;
}
}
switch(ext_hash) {
case _x3('n', 'i', 'b'): return MediaType_5_25;
case _x3('w', 'a', 'v'): return MediaType_Cassette;
case _x3('i', 's', 'o'):
case _x3('c', 'u', 'e'):
case _x3('c', 'd', 'r'):
return MediaType_CD;
// po, do, hdv, dsk - based on size
case _x2('d', 'o'):
case _x3('d', 's', 'k'):
case _x2('p', 'o'):
case _x3('h', 'd', 'v'): // usually 3.5 or hard drive
if (st.st_size <= 143360) return MediaType_5_25;
if (st.st_size <= 1474560) return MediaType_3_5;
return MediaType_HardDisk;
return MediaType_HardDisk;
}
return -1;
}
Ample/MediaViewController.h
-2
View File
@@ -21,8 +21,6 @@ NS_ASSUME_NONNULL_BEGIN
- (IBAction)ejectAction:(id)sender;
- (IBAction)pathAction:(id)sender;
-(IBAction)resetMedia:(id)sender;
@end
@interface MediaViewController (Bookmark) <Bookmark>
Ample/MediaViewController.m
+130 -195
View File
@@ -9,25 +9,11 @@
#import "MediaViewController.h"
#import "TableCellView.h"
enum {
kIndexFloppy525 = 0,
kIndexFloppy35,
kIndexHardDrive,
kIndexCDROM,
kIndexCassette,
kIndexDiskImage,
kIndexBitBanger,
};
#define CATEGORY_COUNT 7
#define SIZEOF(x) (sizeof(x) / sizeof(x[0]))
@protocol MediaNode
-(BOOL)isGroupItem;
-(BOOL)isExpandable;
-(NSInteger)count;
-(NSInteger)category;
-(NSInteger) count;
-(NSString *)viewIdentifier;
-(void)prepareView: (NSTableCellView *)view;
@@ -42,7 +28,6 @@ enum {
@property NSMutableArray *children; // URLs?
@property NSString *title;
@property NSInteger index;
@property NSInteger category;
-(NSInteger)count;
-(id)objectAtIndex:(NSInteger)index;
@@ -51,13 +36,9 @@ enum {
@interface MediaItem : NSObject <MediaNode>
@property NSString *string;
@property NSURL *url;
@property BOOL valid;
@property NSInteger index;
@property NSInteger category;
@property (readonly) BOOL occupied;
-(NSInteger)count;
-(id)objectAtIndex:(NSInteger)index;
@@ -100,6 +81,8 @@ enum {
-(void)prepareView: (NSTableCellView *)view {
[view setObjectValue: self];
[[view textField] setStringValue: _title];
}
-(CGFloat)height {
@@ -121,7 +104,6 @@ enum {
for (unsigned i = count; i < newCount; ++i) {
MediaItem *item = [MediaItem new];
[item setIndex: i];
[item setCategory: _category];
[_children addObject: item];
}
@@ -133,7 +115,7 @@ enum {
for (unsigned i = newCount; i < count; ++i) {
MediaItem *item = [_children lastObject];
if ([item occupied]) break;
if ([item url]) break;
[_children removeLastObject];
}
@@ -149,7 +131,7 @@ enum {
for (NSInteger i = _validCount; i < count; ++i) {
MediaItem *item = [_children lastObject];
if ([item occupied]) break;
if ([item url]) break;
[_children removeLastObject];
[set addIndex: [_children count]];
@@ -199,37 +181,11 @@ enum {
@implementation MediaItem
-(instancetype)initWithURL: (NSURL *)url {
_url = url;
[self setUrl: url];
return self;
}
-(instancetype)initWithString: (NSString *)string {
_string = string;
return self;
}
-(NSString *)argument {
if (_string)
return _string;
// todo -- have setURL also update _string?
if (_url)
return [NSString stringWithCString: [_url fileSystemRepresentation] encoding: NSUTF8StringEncoding];
return nil;
}
+(NSSet *)keyPathsForValuesAffectingOccupied {
return [NSSet setWithObjects: @"url", @"string", nil];
}
-(BOOL)occupied {
return _url || _string;
}
-(NSInteger) count {
return 0;
}
@@ -247,12 +203,44 @@ enum {
}
-(NSString *)viewIdentifier {
if (_category == kIndexBitBanger) return @"BBItemView";
return @"ItemView";
}
-(void)prepareView: (TablePathView *)view {
NSValueTransformer *t;
NSDictionary *options;
[view setObjectValue: self];
NSPathControl *pc = [view pathControl];
NSButton *button = [view ejectButton];
[pc unbind: @"value"];
[pc unbind: @"enabled"];
[pc bind: @"value" toObject: self withKeyPath: @"url" options: nil];
[pc bind: @"enabled" toObject: self withKeyPath: @"valid" options: options];
[button unbind: @"enabled"];
t = [NSValueTransformer valueTransformerForName: NSIsNotNilTransformerName];
options = @{ NSValueTransformerBindingOption: t};
[button bind: @"enabled" toObject: self withKeyPath: @"url" options: options];
if (@available(macOS 10.14, *)) {
[button unbind: @"contentTintColor"];
t = [NSValueTransformer valueTransformerForName: @"ValidColorTransformer"];
options = @{ NSValueTransformerBindingOption: t};
[button bind: @"contentTintColor" toObject: self withKeyPath: @"valid" options: options];
} else {
// El Capitan TODO...
}
#if 0
NSColor *tintColor = nil;
if (!_valid) tintColor = [NSColor systemRedColor];
[button setContentTintColor: tintColor];
#endif
}
-(CGFloat)height {
@@ -266,7 +254,8 @@ enum {
@end
#define CATEGORY_COUNT 6
#define SIZEOF(x) (sizeof(x) / sizeof(x[0]))
@interface MediaViewController () {
@@ -281,6 +270,14 @@ enum {
@implementation MediaViewController
enum {
kIndexFloppy525 = 0,
kIndexFloppy35,
kIndexHardDrive,
kIndexCDROM,
kIndexCassette,
kIndexDiskImage,
};
-(void)awakeFromNib {
@@ -296,11 +293,7 @@ enum {
_data[kIndexCDROM] = [MediaCategory categoryWithTitle: @"CD-ROMs"];
_data[kIndexCassette] = [MediaCategory categoryWithTitle: @"Cassettes"];
_data[kIndexDiskImage] = [MediaCategory categoryWithTitle: @"Hard Disk Images"]; // Mac Nubus psuedo image device
_data[kIndexBitBanger] = [MediaCategory categoryWithTitle: @"Serial Bit Banger"]; // null_modem
for (unsigned i = 0; i < CATEGORY_COUNT; ++i)
[_data[i] setCategory: i];
_root = @[];
}
@@ -310,7 +303,7 @@ enum {
-(void)rebuildArgs {
static char* prefix[] = {
"flop", "flop", "hard", "cdrm", "cass", "disk", "bitb",
"flop", "flop", "hard", "cdrm", "cass", "disk"
};
static_assert(SIZEOF(prefix) == CATEGORY_COUNT, "Missing item");
NSMutableArray *args = [NSMutableArray new];
@@ -325,12 +318,12 @@ enum {
counts[j]++;
MediaItem *item = [cat objectAtIndex: i];
NSString *arg = [item argument];
if (arg) {
[args addObject: [NSString stringWithFormat: @"-%s%u", prefix[j], counts[j]]];
[args addObject: arg];
}
NSURL *url = [item url];
if (!url) continue;
[args addObject: [NSString stringWithFormat: @"-%s%u", prefix[j], counts[j]]];
NSString *s = [NSString stringWithCString: [url fileSystemRepresentation] encoding: NSUTF8StringEncoding];
[args addObject: s];
}
if (j == 0) counts[1] = counts[0]; // 3.5/5.25
}
@@ -354,10 +347,8 @@ enum {
// todo - switch this to use removeItemsAtIndexes:inParent:withAnimation:
// and insertItemsAtIndexes:inParent:withAnimation:
if (!_loadingBookmark) {
[_outlineView reloadData];
[_outlineView expandItem: nil expandChildren: YES];
}
[_outlineView reloadData];
[_outlineView expandItem: nil expandChildren: YES];
}
-(void)setMedia: (Media)media {
@@ -379,12 +370,11 @@ x = media.name; cat = _data[index]; delta |= [cat setItemCount: x]
_(floppy_3_5, kIndexFloppy35);
_(floppy_5_25, kIndexFloppy525);
_(pseudo_disk, kIndexDiskImage);
_(bitbanger, kIndexBitBanger);
if (delta) {
[self rebuildRoot];
if (!_loadingBookmark) [self rebuildArgs];
[self rebuildArgs];
}
}
@@ -398,16 +388,15 @@ x = media.name; cat = _data[index]; delta |= [cat setItemCount: x]
for (NSInteger i = 0; i < count; ++i) {
MediaItem *item = [cat objectAtIndex: i];
if (![item occupied]) continue;
NSURL *url = [item url];
if (!url) continue;
[item setUrl: nil];
[item setString: nil];
delta = YES;
}
if ([cat pruneChildrenWithOutlineView: _outlineView]) delta = YES;
}
if (delta) {
[self rebuildRoot];
if (!_loadingBookmark) [self rebuildArgs];
[self rebuildArgs];
}
}
@@ -437,14 +426,15 @@ static NSString *kDragType = @"private.ample.media";
}
//- (NSTableRowView *)outlineView:(NSOutlineView *)outlineView rowViewForItem:(id)item;
- (NSView *)outlineView:(NSOutlineView *)outlineView viewForTableColumn:(NSTableColumn *)tableColumn item:(id<MediaNode>)item {
NSString *ident = [item viewIdentifier];
if (!ident) return nil;
NSTableCellView *v = [outlineView makeViewWithIdentifier: ident owner: self];
[v setObjectValue: item];
[(id<MediaNode>)item prepareView: v];
[v setObjectValue: item];
return v;
}
@@ -476,6 +466,12 @@ static NSString *kDragType = @"private.ample.media";
}
- (NSCell *)outlineView:(NSOutlineView *)outlineView dataCellForTableColumn:(NSTableColumn *)tableColumn item:(id)item {
//return nil;
return [[item cellClass] new];
}
#pragma mark - NSOutlineViewDataSource
@@ -638,9 +634,10 @@ static NSString *kDragType = @"private.ample.media";
NSInteger row = [_outlineView rowForView: sender];
if (row < 0) return;
//TablePathView *pv = [_outlineView viewAtColumn: 0 row: row makeIfNecessary: NO];
MediaItem *item = [_outlineView itemAtRow: row];
[item setUrl: nil];
[item setString: nil];
//[[pv pathControl] setURL: nil];
// if item is invalid, should attempt to remove...
if (![item valid]) {
@@ -657,11 +654,11 @@ static NSString *kDragType = @"private.ample.media";
}
- (IBAction)pathAction:(id)sender {
// need to update the eject button...
NSURL *url = [(NSPathControl *)sender URL];
NSInteger tag = [sender tag];
// TODO - don't add to recent disks if this is a bitbanger / midi / printer device.
if (url && tag == 0) {
if (url) {
NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
[nc postNotificationName: @"DiskImageAdded" object: url];
}
@@ -669,147 +666,79 @@ static NSString *kDragType = @"private.ample.media";
[self rebuildArgs];
}
-(IBAction)textAction: (id)sender {
[self rebuildArgs];
}
-(IBAction)resetMedia:(id)sender {
[self resetDiskImages];
}
@end
@implementation MediaViewController (Bookmark)
-(void)willLoadBookmark:(NSDictionary *)bookmark {
_loadingBookmark = YES;
[self resetDiskImages];
}
-(void)didLoadBookmark:(NSDictionary *)bookmark {
_loadingBookmark = NO;
[self rebuildRoot];
[self rebuildArgs];
}
static NSString * BookmarkStrings[] = {
@"flop_525", @"flop_35", @"hard", @"cdrm", @"cass", @"disk", @"bitb",
};
static_assert(SIZEOF(BookmarkStrings) == CATEGORY_COUNT, "Missing item");
static int BookmarkIndex(NSString *str) {
if (!str) return -1;
for (int i = 0; i < SIZEOF(BookmarkStrings); ++i) {
if ([str isEqualToString: BookmarkStrings[i]]) return i;
}
return -1;
}
-(BOOL)loadBookmark: (NSDictionary *)bookmark {
// fragile - depends on order
id media = [bookmark objectForKey: @"media"];
#if 0
// hmmm... should rely on machine/slots to set media
// so it doesn't go out of sync after an update.
NSDictionary *d = [bookmark objectForKey: @"media"];
Media m = EmptyMedia;
if (d) m = MediaFromDictionary(d);
[self setMedia: m];
#endif
if ([media isKindOfClass: [NSArray class]]) {
unsigned ix = 0;
for (NSArray *a in (NSArray *)media) {
if (ix >= CATEGORY_COUNT) {
NSLog(@"MediaViewController: too many categories.");
break;
}
MediaCategory *cat = _data[ix];
NSInteger count = [cat count];
unsigned i = 0;
for (NSString *path in a) {
if (i >= count) {
NSLog(@"MediaViewController: too many files.");
break; //
}
MediaItem *item = [cat objectAtIndex: i++];
if (![path length]) continue;
if (ix == kIndexBitBanger) {
[item setString: path];
} else {
NSURL *url = [NSURL fileURLWithPath: path];
[item setUrl: url];
}
}
++ix;
}
return YES;
}
if ([media isKindOfClass: [NSDictionary class]]) {
for (NSString *key in (NSDictionary *)media) {
NSInteger ix = BookmarkIndex(key);
if (ix < 0) {
NSLog(@"MediaViewController: unrecognized category: %@", key);
continue;
}
MediaCategory *cat = _data[ix];
NSInteger count = [cat count];
NSArray *a = [(NSDictionary *)media objectForKey: key];
unsigned i = 0;
for (NSString *path in a) {
if (i >= count) {
NSLog(@"MediaViewController: too many files.");
break; //
}
MediaItem *item = [cat objectAtIndex: i++];
if (![path length]) continue;
if (ix == kIndexBitBanger) {
[item setString: path];
} else {
NSURL *url = [NSURL fileURLWithPath: path];
[item setUrl: url];
}
}
}
return YES;
}
return NO;
}
static void CompressArray(NSMutableArray *array) {
// reset all media
[self resetDiskImages];
for(;;) {
NSString *s = [array lastObject];
if (!s) return;
if ([s length]) return;
[array removeLastObject];
// if order of indexes change, would need to do a version check.
NSArray *media = [bookmark objectForKey: @"media"];
unsigned ix = 0;
for (NSArray *a in media) {
if (ix >= CATEGORY_COUNT) {
NSLog(@"MediaViewController: too many categories.");
break;
}
MediaCategory *cat = _data[ix++];
NSInteger count = [cat count];
unsigned i = 0;
for (NSString *path in a) {
if (i >= count) {
NSLog(@"MediaViewController: too many files.");
break; //
}
MediaItem *item = [cat objectAtIndex: i++];
NSURL *url = nil;
if ([path length])
url = [NSURL fileURLWithPath: path];
[item setUrl: url];
}
}
// add will load bookmark / did load bookmark to block all the rebuilding ?
[self rebuildRoot];
[self rebuildArgs];
return YES;
}
-(BOOL)saveBookmark: (NSMutableDictionary *)bookmark {
NSMutableDictionary *media = [NSMutableDictionary new];
NSMutableArray *media = [NSMutableArray arrayWithCapacity: CATEGORY_COUNT];
for (unsigned ix = 0; ix < CATEGORY_COUNT; ++ix) {
MediaCategory *cat = _data[ix];
NSInteger count = [cat validCount];
if (!count) continue;
NSMutableArray *array = [NSMutableArray new];
for (NSInteger i = 0; i < count; ++i) {
MediaItem *item = [cat objectAtIndex: i];
NSString *s = [item argument];
if (!s) s = @"";
NSURL *url = [item url];
NSString *s = @"";
if (url)
s = [NSString stringWithCString: [url fileSystemRepresentation] encoding: NSUTF8StringEncoding];
[array addObject: s];
}
CompressArray(array);
if ([array count])
[media setObject: array forKey: BookmarkStrings[ix]];
[media addObject: array];
}
[bookmark setObject: media forKey: @"media"];
@@ -817,5 +746,11 @@ static void CompressArray(NSMutableArray *array) {
return YES;
}
-(void)willLoadBookmark:(NSDictionary *)bookmark {
_loadingBookmark = YES;
}
-(void)didLoadBookmark:(NSDictionary *)bookmark {
_loadingBookmark = NO;
}
@end
Ample/NewMachineViewController.h
-30
View File
@@ -1,30 +0,0 @@
//
// NewMachineViewController.h
// Ample
//
// Created by Kelvin Sherlock on 6/8/2021.
// Copyright © 2021 Kelvin Sherlock. All rights reserved.
//
#import <Cocoa/Cocoa.h>
#import "Ample.h"
NS_ASSUME_NONNULL_BEGIN
@interface NewMachineViewController : NSViewController
@property (nullable) NSString *machine;
-(void)reset;
@end
@interface NewMachineViewController (Table) <NSOutlineViewDelegate, NSOutlineViewDataSource>
@end
@interface NewMachineViewController (Bookmark) <Bookmark>
@end
NS_ASSUME_NONNULL_END
Ample/NewMachineViewController.m
-234
View File
@@ -1,234 +0,0 @@
//
// NewMachineViewController.m
// Ample
//
// Created by Kelvin Sherlock on 6/8/2021.
// Copyright © 2021 Kelvin Sherlock. All rights reserved.
//
#import "NewMachineViewController.h"
@interface NewMachineViewController () {
NSArray *_data;
}
@property (weak) IBOutlet NSOutlineView *outlineView;
@end
@implementation NewMachineViewController
-(void)awakeFromNib {
static unsigned first = 0;
if (first) return;
first++;
NSBundle *bundle = [NSBundle mainBundle];
NSString *path = [bundle pathForResource: @"models" ofType: @"plist"];
_data = [NSArray arrayWithContentsOfFile: path];
}
-(void)viewDidLoad {
[super viewDidLoad];
//[_outlineView reloadData];
//[_outlineView setAutosaveExpandedItems: YES];
//[_outlineView expandItem: nil expandChildren: YES];
}
#pragma mark - IBActions
- (IBAction)clickAction:(id)sender {
NSInteger row = [_outlineView clickedRow];
if (row < 0) return;
NSDictionary *item = [_outlineView itemAtRow: row];
if (!item) return;
NSString *value = [item objectForKey: @"value"];
NSArray *children = [item objectForKey: @"children"];
if (value) {
[self setMachine: value];
} else if (children) {
id ap = [_outlineView animator];
[_outlineView isItemExpanded: item] ? [ap collapseItem: item] : [ap expandItem: item];
}
}
-(void)reset {
[_outlineView deselectAll: nil];
[self setMachine: nil];
}
@end
@implementation NewMachineViewController (Table)
#if 0
- (BOOL)outlineView:(NSOutlineView *)outlineView shouldExpandItem:(id)item {
return YES;
}
- (BOOL)outlineView:(NSOutlineView *)outlineView shouldCollapseItem:(id)item {
return NO;
}
#endif
- (BOOL)outlineView:(NSOutlineView *)outlineView shouldShowOutlineCellForItem:(id)item {
// disclosure triangle.
if (!item) return YES;
NSArray *children = [(NSDictionary *)item objectForKey: @"children"];
return [children count] > 0;
}
- (BOOL)outlineView:(NSOutlineView *)outlineView isItemExpandable:(id)item {
if (!item) return YES;
NSArray *children = [(NSDictionary *)item objectForKey: @"children"];
return [children count] > 0;
}
- (BOOL)outlineView:(NSOutlineView *)outlineView isGroupItem:(id)item {
#if 0
NSArray *children = [(NSDictionary *)item objectForKey: @"children"];
return [children count] > 0;
#else
return NO;
#endif
}
- (NSView *)outlineView:(NSOutlineView *)outlineView viewForTableColumn:(NSTableColumn *)tableColumn item:(id)item {
#if 0
NSArray *children = [(NSDictionary *)item objectForKey: @"children"];
if ([children count]) {
return [outlineView makeViewWithIdentifier: @"HeaderCell" owner: self];
}
#endif
NSTableCellView *v = [outlineView makeViewWithIdentifier: @"DataCell" owner: self];
//[v setObjectValue: item];
return v;
}
- (NSInteger)outlineView:(NSOutlineView *)outlineView numberOfChildrenOfItem:(id)item {
if (!item) return [_data count];
NSArray *children = [(NSDictionary *)item objectForKey: @"children"];
return [children count];
}
- (id)outlineView:(NSOutlineView *)outlineView child:(NSInteger)index ofItem:(id)item {
if (item == nil) {
return [_data objectAtIndex: index];
}
NSArray *children = [(NSDictionary *)item objectForKey: @"children"];
return [children objectAtIndex: index];
}
- (id)outlineView:(NSOutlineView *)outlineView objectValueForTableColumn:(NSTableColumn *)tableColumn byItem:(id)item {
return item;
}
- (BOOL)outlineView:(NSOutlineView *)outlineView shouldSelectItem:(id)item {
if (!item) return NO;
return [(NSDictionary *)item objectForKey: @"value"] != nil;
}
// saving/restoring expanded items
- (id)outlineView:(NSOutlineView *)outlineView persistentObjectForItem:(id)item {
return [item objectForKey: @"description"];
}
- (id)outlineView:(NSOutlineView *)outlineView itemForPersistentObject:(id)object {
if ([object isKindOfClass: [NSString class]]) {
for(NSDictionary *d in _data) {
if ([(NSString *)object isEqualToString: [d objectForKey: @"description"]])
return d;
}
}
return nil;
//return object;
}
@end
@implementation NewMachineViewController (Bookmark)
- (void)didLoadBookmark:(NSDictionary *)bookmark {
}
- (BOOL)loadBookmark:(NSDictionary *)bookmark {
NSString *machine = [bookmark objectForKey: @"machine"];
//NSInteger row = [_outlineView selectedRow];
if (!machine) {
[self setMachine: nil];
[_outlineView deselectAll: nil];
return NO;
}
for (NSDictionary *parent in _data) {
NSArray *children = [parent objectForKey: @"children"];
for (NSDictionary *child in children) {
if ([machine isEqualToString: [child objectForKey: @"value"]]) {
id ap = [_outlineView animator];
[ap expandItem: parent];
NSInteger row = [_outlineView rowForItem: child];
if (row >= 0) {
NSIndexSet *set = [NSIndexSet indexSetWithIndex: row];
[_outlineView selectRowIndexes: set byExtendingSelection: NO];
[_outlineView scrollRowToVisible: row];
return YES;
}
return NO;
}
}
// could also match parent.
if ([machine isEqualToString: [parent objectForKey: @"value"]]) {
NSInteger row = [_outlineView rowForItem: parent];
if (row >= 0) {
NSIndexSet *set = [NSIndexSet indexSetWithIndex: row];
[_outlineView selectRowIndexes: set byExtendingSelection: NO];
[_outlineView scrollRowToVisible: row];
return YES;
}
return NO;
}
}
return NO;
}
- (BOOL)saveBookmark:(NSMutableDictionary *)bookmark {
// machine saved in parent.
return YES;
}
- (void)willLoadBookmark:(NSDictionary *)bookmark {
}
@end
Ample/Resources/CheatSheet.html
+4 -9
View File
@@ -56,25 +56,20 @@
}
</style>
<script type="text/javascript">
/* os x 10.11 */
if (window.NodeList && !NodeList.prototype.forEach) {
NodeList.prototype.forEach = Array.prototype.forEach;
}
function macbook(onoff) {
function macbook(onoff) {
var nodes = document.querySelectorAll("[data-macbook]");
nodes.forEach( function(e) {
nodes.forEach( (e) => {
var m = (e.dataset.macbook == "true");
e.hidden = m ^ onoff;
});
}
window.addEventListener('load', function(event) {
window.addEventListener('load', (event)=> {
macbook(false);
var e = document.getElementById('macbook');
if (e) {
e.checked = false;
e.addEventListener('click', function (event) {
e.addEventListener('click', (event) => {
macbook(e.checked);
});
}
Ample/Resources/ace100.plist
-40
View File
@@ -3975,11 +3975,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -3988,11 +3983,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5234,11 +5224,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5247,11 +5232,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5640,11 +5620,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5653,11 +5628,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5776,11 +5746,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5789,11 +5754,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
Ample/Resources/ace1000.plist
-40
View File
@@ -3915,11 +3915,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -3928,11 +3923,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5174,11 +5164,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5187,11 +5172,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5580,11 +5560,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5593,11 +5568,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5716,11 +5686,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5729,11 +5694,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
Ample/Resources/albert.plist
-40
View File
@@ -3915,11 +3915,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -3928,11 +3923,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5174,11 +5164,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5187,11 +5172,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5580,11 +5560,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5593,11 +5568,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5716,11 +5686,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5729,11 +5694,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
Ample/Resources/am100.plist
-40
View File
@@ -3915,11 +3915,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -3928,11 +3923,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5174,11 +5164,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5187,11 +5172,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5580,11 +5560,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5593,11 +5568,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5716,11 +5686,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5729,11 +5694,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
Ample/Resources/am64.plist
-40
View File
@@ -3915,11 +3915,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -3928,11 +3923,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5174,11 +5164,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5187,11 +5172,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5580,11 +5560,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5593,11 +5568,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5716,11 +5686,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5729,11 +5694,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
Ample/Resources/apple2.plist
-40
View File
@@ -3975,11 +3975,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -3988,11 +3983,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5234,11 +5224,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5247,11 +5232,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5640,11 +5620,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5653,11 +5628,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5776,11 +5746,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5789,11 +5754,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
Ample/Resources/apple2c.plist
-20
View File
@@ -165,11 +165,6 @@
<string>RS232 Null Modem</string>
<key>devname</key>
<string>null_modem</string>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -178,11 +173,6 @@
<string>RS232 Synchronous I/O</string>
<key>devname</key>
<string>rs232_sync_io</string>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -296,11 +286,6 @@
<string>RS232 Null Modem</string>
<key>devname</key>
<string>null_modem</string>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -309,11 +294,6 @@
<string>RS232 Synchronous I/O</string>
<key>devname</key>
<string>rs232_sync_io</string>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
Ample/Resources/apple2cp.plist
-20
View File
@@ -190,11 +190,6 @@
<string>RS232 Null Modem</string>
<key>devname</key>
<string>null_modem</string>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -203,11 +198,6 @@
<string>RS232 Synchronous I/O</string>
<key>devname</key>
<string>rs232_sync_io</string>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -321,11 +311,6 @@
<string>RS232 Null Modem</string>
<key>devname</key>
<string>null_modem</string>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -334,11 +319,6 @@
<string>RS232 Synchronous I/O</string>
<key>devname</key>
<string>rs232_sync_io</string>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
Ample/Resources/apple2e.plist
-40
View File
@@ -4287,11 +4287,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -4300,11 +4295,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -6579,11 +6569,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -6592,11 +6577,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -7074,11 +7054,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -7087,11 +7062,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -7210,11 +7180,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -7223,11 +7188,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
Ample/Resources/apple2ee.plist
-40
View File
@@ -4287,11 +4287,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -4300,11 +4295,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -6579,11 +6569,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -6592,11 +6577,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -7074,11 +7054,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -7087,11 +7062,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -7210,11 +7180,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -7223,11 +7188,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
Ample/Resources/apple2eefr.plist
-40
View File
@@ -4287,11 +4287,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -4300,11 +4295,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -6579,11 +6569,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -6592,11 +6577,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -7074,11 +7054,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -7087,11 +7062,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -7210,11 +7180,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -7223,11 +7188,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
Ample/Resources/apple2ees.plist
-40
View File
@@ -4287,11 +4287,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -4300,11 +4295,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -6579,11 +6569,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -6592,11 +6577,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -7074,11 +7054,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -7087,11 +7062,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -7210,11 +7180,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -7223,11 +7188,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
Ample/Resources/apple2eeuk.plist
-40
View File
@@ -4287,11 +4287,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -4300,11 +4295,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -6579,11 +6569,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -6592,11 +6577,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -7074,11 +7054,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -7087,11 +7062,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -7210,11 +7180,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -7223,11 +7188,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
Ample/Resources/apple2ep.plist
-40
View File
@@ -4287,11 +4287,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -4300,11 +4295,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -6579,11 +6569,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -6592,11 +6577,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -7074,11 +7054,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -7087,11 +7062,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -7210,11 +7180,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -7223,11 +7188,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
Ample/Resources/apple2euk.plist
-40
View File
@@ -4287,11 +4287,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -4300,11 +4295,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -6579,11 +6569,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -6592,11 +6577,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -7074,11 +7054,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -7087,11 +7062,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -7210,11 +7180,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -7223,11 +7188,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
Ample/Resources/apple2gs.plist
+1 -62
View File
@@ -3602,11 +3602,6 @@
<string>RS232 Null Modem</string>
<key>devname</key>
<string>null_modem</string>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -3615,11 +3610,6 @@
<string>RS232 Synchronous I/O</string>
<key>devname</key>
<string>rs232_sync_io</string>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -3733,11 +3723,6 @@
<string>RS232 Null Modem</string>
<key>devname</key>
<string>null_modem</string>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -3746,11 +3731,6 @@
<string>RS232 Synchronous I/O</string>
<key>devname</key>
<string>rs232_sync_io</string>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -4277,11 +4257,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -4290,11 +4265,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -6444,11 +6414,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -6457,11 +6422,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -6965,11 +6925,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -6978,11 +6933,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -7101,11 +7051,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -7114,11 +7059,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -7539,8 +7479,7 @@
</array>
<key>software</key>
<array>
<string>apple2gs_flop_orig.xml</string>
<string>apple2gs_flop_misc.xml</string>
<string>apple2gs.xml</string>
<string>apple2_flop_clcracked.xml</string>
<dict>
<key>name</key>
Ample/Resources/apple2gsr0.plist
+1 -62
View File
@@ -3642,11 +3642,6 @@
<string>RS232 Null Modem</string>
<key>devname</key>
<string>null_modem</string>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -3655,11 +3650,6 @@
<string>RS232 Synchronous I/O</string>
<key>devname</key>
<string>rs232_sync_io</string>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -3773,11 +3763,6 @@
<string>RS232 Null Modem</string>
<key>devname</key>
<string>null_modem</string>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -3786,11 +3771,6 @@
<string>RS232 Synchronous I/O</string>
<key>devname</key>
<string>rs232_sync_io</string>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -4317,11 +4297,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -4330,11 +4305,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -6484,11 +6454,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -6497,11 +6462,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -7005,11 +6965,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -7018,11 +6973,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -7141,11 +7091,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -7154,11 +7099,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -7579,8 +7519,7 @@
</array>
<key>software</key>
<array>
<string>apple2gs_flop_orig.xml</string>
<string>apple2gs_flop_misc.xml</string>
<string>apple2gs.xml</string>
<string>apple2_flop_clcracked.xml</string>
<dict>
<key>name</key>
Ample/Resources/apple2gsr1.plist
+1 -62
View File
@@ -3642,11 +3642,6 @@
<string>RS232 Null Modem</string>
<key>devname</key>
<string>null_modem</string>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -3655,11 +3650,6 @@
<string>RS232 Synchronous I/O</string>
<key>devname</key>
<string>rs232_sync_io</string>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -3773,11 +3763,6 @@
<string>RS232 Null Modem</string>
<key>devname</key>
<string>null_modem</string>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -3786,11 +3771,6 @@
<string>RS232 Synchronous I/O</string>
<key>devname</key>
<string>rs232_sync_io</string>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -4317,11 +4297,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -4330,11 +4305,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -6484,11 +6454,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -6497,11 +6462,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -7005,11 +6965,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -7018,11 +6973,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -7141,11 +7091,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -7154,11 +7099,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -7579,8 +7519,7 @@
</array>
<key>software</key>
<array>
<string>apple2gs_flop_orig.xml</string>
<string>apple2gs_flop_misc.xml</string>
<string>apple2gs.xml</string>
<string>apple2_flop_clcracked.xml</string>
<dict>
<key>name</key>
Ample/Resources/apple2jp.plist
-40
View File
@@ -3915,11 +3915,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -3928,11 +3923,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5174,11 +5164,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5187,11 +5172,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5580,11 +5560,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5593,11 +5568,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5716,11 +5686,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5729,11 +5694,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
Ample/Resources/apple2p.plist
-40
View File
@@ -3915,11 +3915,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -3928,11 +3923,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5174,11 +5164,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5187,11 +5172,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5580,11 +5560,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5593,11 +5568,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5716,11 +5686,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5729,11 +5694,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
Ample/Resources/apple3.plist
-128
View File
@@ -129,14 +129,6 @@
<key>devname</key>
<string>a2aplcrd</string>
</dict>
<dict>
<key>value</key>
<string>mockingboard</string>
<key>description</key>
<string>Sweet Micro Systems Mockingboard Sound/Speech I</string>
<key>devname</key>
<string>a2mockbd</string>
</dict>
<dict>
<key>value</key>
<string>thclock</string>
@@ -145,14 +137,6 @@
<key>devname</key>
<string>a2thunpl</string>
</dict>
<dict>
<key>value</key>
<string>titan3plus2</string>
<key>description</key>
<string>Titan /// Plus //</string>
<key>devname</key>
<string>titan3p2</string>
</dict>
</array>
</dict>
<dict>
@@ -210,14 +194,6 @@
<key>devname</key>
<string>a2aplcrd</string>
</dict>
<dict>
<key>value</key>
<string>mockingboard</string>
<key>description</key>
<string>Sweet Micro Systems Mockingboard Sound/Speech I</string>
<key>devname</key>
<string>a2mockbd</string>
</dict>
<dict>
<key>value</key>
<string>thclock</string>
@@ -226,14 +202,6 @@
<key>devname</key>
<string>a2thunpl</string>
</dict>
<dict>
<key>value</key>
<string>titan3plus2</string>
<key>description</key>
<string>Titan /// Plus //</string>
<key>devname</key>
<string>titan3p2</string>
</dict>
</array>
</dict>
<dict>
@@ -291,14 +259,6 @@
<key>devname</key>
<string>a2aplcrd</string>
</dict>
<dict>
<key>value</key>
<string>mockingboard</string>
<key>description</key>
<string>Sweet Micro Systems Mockingboard Sound/Speech I</string>
<key>devname</key>
<string>a2mockbd</string>
</dict>
<dict>
<key>value</key>
<string>thclock</string>
@@ -307,14 +267,6 @@
<key>devname</key>
<string>a2thunpl</string>
</dict>
<dict>
<key>value</key>
<string>titan3plus2</string>
<key>description</key>
<string>Titan /// Plus //</string>
<key>devname</key>
<string>titan3p2</string>
</dict>
</array>
</dict>
<dict>
@@ -372,14 +324,6 @@
<key>devname</key>
<string>a2aplcrd</string>
</dict>
<dict>
<key>value</key>
<string>mockingboard</string>
<key>description</key>
<string>Sweet Micro Systems Mockingboard Sound/Speech I</string>
<key>devname</key>
<string>a2mockbd</string>
</dict>
<dict>
<key>value</key>
<string>thclock</string>
@@ -388,14 +332,6 @@
<key>devname</key>
<string>a2thunpl</string>
</dict>
<dict>
<key>value</key>
<string>titan3plus2</string>
<key>description</key>
<string>Titan /// Plus //</string>
<key>devname</key>
<string>titan3p2</string>
</dict>
</array>
</dict>
<dict>
@@ -460,11 +396,6 @@
<string>RS232 Null Modem</string>
<key>devname</key>
<string>null_modem</string>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -473,11 +404,6 @@
<string>RS232 Synchronous I/O</string>
<key>devname</key>
<string>rs232_sync_io</string>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -1193,60 +1119,6 @@
</dict>
</array>
</dict>
<dict>
<key>name</key>
<string>titan3p2</string>
<key>slots</key>
<array>
<dict>
<key>name</key>
<string>:gameio</string>
<key>options</key>
<array>
<dict>
<key>value</key>
<string></string>
<key>description</key>
<string>—None—</string>
<key>default</key>
<true/>
</dict>
<dict>
<key>value</key>
<string>joy</string>
<key>description</key>
<string>Apple II analog joysticks</string>
<key>default</key>
<false/>
</dict>
<dict>
<key>value</key>
<string>paddles</string>
<key>description</key>
<string>Apple II paddles</string>
<key>default</key>
<false/>
</dict>
<dict>
<key>value</key>
<string>compeyes</string>
<key>description</key>
<string>Digital Vision ComputerEyes</string>
<key>default</key>
<false/>
</dict>
<dict>
<key>value</key>
<string>gizmo</string>
<key>description</key>
<string>HAL Labs Gizmo</string>
<key>default</key>
<false/>
</dict>
</array>
</dict>
</array>
</dict>
</array>
<key>software</key>
<array>
Ample/Resources/basis108.plist
-40
View File
@@ -3975,11 +3975,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -3988,11 +3983,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5234,11 +5224,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5247,11 +5232,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5640,11 +5620,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5653,11 +5628,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5776,11 +5746,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5789,11 +5754,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
Ample/Resources/cec2000.plist
-40
View File
@@ -3224,11 +3224,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -3237,11 +3232,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5516,11 +5506,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5529,11 +5514,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -6011,11 +5991,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -6024,11 +5999,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -6147,11 +6117,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -6160,11 +6125,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
Ample/Resources/cece.plist
-40
View File
@@ -3224,11 +3224,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -3237,11 +3232,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5516,11 +5506,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5529,11 +5514,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -6011,11 +5991,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -6024,11 +5999,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -6147,11 +6117,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -6160,11 +6125,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
Ample/Resources/cecg.plist
-40
View File
@@ -3224,11 +3224,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -3237,11 +3232,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5516,11 +5506,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5529,11 +5514,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -6011,11 +5991,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -6024,11 +5999,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -6147,11 +6117,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -6160,11 +6125,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
Ample/Resources/ceci.plist
-40
View File
@@ -3224,11 +3224,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -3237,11 +3232,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5516,11 +5506,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5529,11 +5514,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -6011,11 +5991,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -6024,11 +5999,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -6147,11 +6117,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -6160,11 +6125,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
Ample/Resources/cecm.plist
-40
View File
@@ -3224,11 +3224,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -3237,11 +3232,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5516,11 +5506,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5529,11 +5514,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -6011,11 +5991,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -6024,11 +5999,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -6147,11 +6117,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -6160,11 +6125,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
Ample/Resources/craft2p.plist
-40
View File
@@ -3915,11 +3915,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -3928,11 +3923,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5174,11 +5164,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5187,11 +5172,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5580,11 +5560,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5593,11 +5568,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5716,11 +5686,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5729,11 +5694,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
Ample/Resources/dodo.plist
-40
View File
@@ -3915,11 +3915,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -3928,11 +3923,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5174,11 +5164,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5187,11 +5172,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5580,11 +5560,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5593,11 +5568,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5716,11 +5686,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5729,11 +5694,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
Ample/Resources/elppa.plist
-40
View File
@@ -3915,11 +3915,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -3928,11 +3923,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5174,11 +5164,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5187,11 +5172,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5580,11 +5560,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5593,11 +5568,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5716,11 +5686,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5729,11 +5694,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
Ample/Resources/hkc8800a.plist
-40
View File
@@ -3915,11 +3915,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -3928,11 +3923,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5174,11 +5164,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5187,11 +5172,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5580,11 +5560,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5593,11 +5568,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5716,11 +5686,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5729,11 +5694,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
Ample/Resources/ivelultr.plist
-40
View File
@@ -3915,11 +3915,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -3928,11 +3923,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5174,11 +5164,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5187,11 +5172,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5580,11 +5560,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5593,11 +5568,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5716,11 +5686,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5729,11 +5694,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
Ample/Resources/las128e2.plist
-20
View File
@@ -188,11 +188,6 @@
<string>RS232 Null Modem</string>
<key>devname</key>
<string>null_modem</string>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -201,11 +196,6 @@
<string>RS232 Synchronous I/O</string>
<key>devname</key>
<string>rs232_sync_io</string>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -319,11 +309,6 @@
<string>RS232 Null Modem</string>
<key>devname</key>
<string>null_modem</string>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -332,11 +317,6 @@
<string>RS232 Synchronous I/O</string>
<key>devname</key>
<string>rs232_sync_io</string>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
Ample/Resources/las128ex.plist
-60
View File
@@ -1288,11 +1288,6 @@
<string>RS232 Null Modem</string>
<key>devname</key>
<string>null_modem</string>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -1301,11 +1296,6 @@
<string>RS232 Synchronous I/O</string>
<key>devname</key>
<string>rs232_sync_io</string>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -1419,11 +1409,6 @@
<string>RS232 Null Modem</string>
<key>devname</key>
<string>null_modem</string>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -1432,11 +1417,6 @@
<string>RS232 Synchronous I/O</string>
<key>devname</key>
<string>rs232_sync_io</string>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -1792,11 +1772,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -1805,11 +1780,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -4084,11 +4054,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -4097,11 +4062,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -4579,11 +4539,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -4592,11 +4547,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -4715,11 +4665,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -4728,11 +4673,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
Ample/Resources/laser128.plist
-60
View File
@@ -1288,11 +1288,6 @@
<string>RS232 Null Modem</string>
<key>devname</key>
<string>null_modem</string>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -1301,11 +1296,6 @@
<string>RS232 Synchronous I/O</string>
<key>devname</key>
<string>rs232_sync_io</string>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -1419,11 +1409,6 @@
<string>RS232 Null Modem</string>
<key>devname</key>
<string>null_modem</string>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -1432,11 +1417,6 @@
<string>RS232 Synchronous I/O</string>
<key>devname</key>
<string>rs232_sync_io</string>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -1792,11 +1772,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -1805,11 +1780,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -4084,11 +4054,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -4097,11 +4062,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -4579,11 +4539,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -4592,11 +4547,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -4715,11 +4665,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -4728,11 +4673,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
Ample/Resources/laser2c.plist
-40
View File
@@ -3915,11 +3915,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -3928,11 +3923,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5174,11 +5164,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5187,11 +5172,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5580,11 +5560,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5593,11 +5568,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5716,11 +5686,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5729,11 +5694,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
Ample/Resources/mac2fdhd.plist
-26
View File
@@ -1436,11 +1436,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -1479,11 +1474,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -1515,11 +1505,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -1551,11 +1536,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -1587,11 +1567,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -1610,7 +1585,6 @@
<array>
<string>mac_hdd.xml</string>
<string>mac_flop.xml</string>
<string>mac_hdflop.xml</string>
</array>
</dict>
</plist>
Ample/Resources/macclas2.plist
-1
View File
@@ -502,7 +502,6 @@
</array>
<key>software</key>
<array>
<string>mac_hdflop.xml</string>
<string>mac_hdd.xml</string>
<string>mac_flop.xml</string>
</array>
Ample/Resources/macclasc.plist
-1
View File
@@ -484,7 +484,6 @@
<array>
<string>mac_flop.xml</string>
<string>mac_hdd.xml</string>
<string>mac_hdflop.xml</string>
</array>
</dict>
</plist>
Ample/Resources/macii.plist
-25
View File
@@ -1436,11 +1436,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -1479,11 +1474,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -1515,11 +1505,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -1551,11 +1536,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -1587,11 +1567,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
Ample/Resources/maciici.plist
-26
View File
@@ -1004,11 +1004,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -1047,11 +1042,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -1083,11 +1073,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -1119,11 +1104,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -1155,11 +1135,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -1176,7 +1151,6 @@
</array>
<key>software</key>
<array>
<string>mac_hdflop.xml</string>
<string>mac_hdd.xml</string>
<string>mac_flop.xml</string>
</array>
Ample/Resources/maciicx.plist
-26
View File
@@ -986,11 +986,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -1029,11 +1024,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -1065,11 +1055,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -1101,11 +1086,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -1137,11 +1117,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -1160,7 +1135,6 @@
<array>
<string>mac_hdd.xml</string>
<string>mac_flop.xml</string>
<string>mac_hdflop.xml</string>
</array>
</dict>
</plist>
Ample/Resources/maciihmu.plist
-25
View File
@@ -1436,11 +1436,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -1479,11 +1474,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -1515,11 +1505,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -1551,11 +1536,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -1587,11 +1567,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
Ample/Resources/maciisi.plist
-1
View File
@@ -532,7 +532,6 @@
</array>
<key>software</key>
<array>
<string>mac_hdflop.xml</string>
<string>mac_hdd.xml</string>
<string>mac_flop.xml</string>
</array>
Ample/Resources/maciivi.plist
-26
View File
@@ -1084,11 +1084,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -1127,11 +1122,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -1163,11 +1153,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -1199,11 +1184,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -1235,11 +1215,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -1256,7 +1231,6 @@
</array>
<key>software</key>
<array>
<string>mac_hdflop.xml</string>
<string>mac_hdd.xml</string>
<string>mac_flop.xml</string>
</array>
Ample/Resources/maciivx.plist
-26
View File
@@ -1084,11 +1084,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -1127,11 +1122,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -1163,11 +1153,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -1199,11 +1184,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -1235,11 +1215,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -1256,7 +1231,6 @@
</array>
<key>software</key>
<array>
<string>mac_hdflop.xml</string>
<string>mac_hdd.xml</string>
<string>mac_flop.xml</string>
</array>
Ample/Resources/maciix.plist
-26
View File
@@ -1436,11 +1436,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -1479,11 +1474,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -1515,11 +1505,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -1551,11 +1536,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -1587,11 +1567,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -1610,7 +1585,6 @@
<array>
<string>mac_hdd.xml</string>
<string>mac_flop.xml</string>
<string>mac_hdflop.xml</string>
</array>
</dict>
</plist>
Ample/Resources/maclc.plist
-1
View File
@@ -502,7 +502,6 @@
</array>
<key>software</key>
<array>
<string>mac_hdflop.xml</string>
<string>mac_hdd.xml</string>
<string>mac_flop.xml</string>
</array>
Ample/Resources/maclc2.plist
-1
View File
@@ -492,7 +492,6 @@
</array>
<key>software</key>
<array>
<string>mac_hdflop.xml</string>
<string>mac_hdd.xml</string>
<string>mac_flop.xml</string>
</array>
Ample/Resources/maclc3.plist
-1
View File
@@ -522,7 +522,6 @@
</array>
<key>software</key>
<array>
<string>mac_hdflop.xml</string>
<string>mac_hdd.xml</string>
<string>mac_flop.xml</string>
</array>
Ample/Resources/macse30.plist
-1
View File
@@ -532,7 +532,6 @@
</array>
<key>software</key>
<array>
<string>mac_hdflop.xml</string>
<string>mac_hdd.xml</string>
<string>mac_flop.xml</string>
</array>
Ample/Resources/macsefd.plist
-1
View File
@@ -484,7 +484,6 @@
<array>
<string>mac_flop.xml</string>
<string>mac_hdd.xml</string>
<string>mac_hdflop.xml</string>
</array>
</dict>
</plist>
Ample/Resources/maxxi.plist
-40
View File
@@ -3915,11 +3915,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -3928,11 +3923,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5174,11 +5164,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5187,11 +5172,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5580,11 +5560,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5593,11 +5568,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5716,11 +5686,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5729,11 +5694,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
Ample/Resources/microeng.plist
-40
View File
@@ -3915,11 +3915,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -3928,11 +3923,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5174,11 +5164,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5187,11 +5172,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5580,11 +5560,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5593,11 +5568,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5716,11 +5686,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5729,11 +5694,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
Ample/Resources/mprof3.plist
-40
View File
@@ -4287,11 +4287,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -4300,11 +4295,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -6579,11 +6569,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -6592,11 +6577,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -7074,11 +7054,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -7087,11 +7062,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -7210,11 +7180,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -7223,11 +7188,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
Ample/Resources/prav82.plist
-40
View File
@@ -3915,11 +3915,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -3928,11 +3923,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5174,11 +5164,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5187,11 +5172,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5580,11 +5560,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5593,11 +5568,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5716,11 +5686,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5729,11 +5694,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
Ample/Resources/prav8c.plist
-40
View File
@@ -4287,11 +4287,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -4300,11 +4295,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -6579,11 +6569,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -6592,11 +6577,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -7074,11 +7054,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -7087,11 +7062,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -7210,11 +7180,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -7223,11 +7188,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
Ample/Resources/prav8m.plist
-40
View File
@@ -3915,11 +3915,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -3928,11 +3923,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5174,11 +5164,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5187,11 +5172,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5580,11 +5560,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5593,11 +5568,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5716,11 +5686,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5729,11 +5694,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
Ample/Resources/space84.plist
-40
View File
@@ -3915,11 +3915,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -3928,11 +3923,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5174,11 +5164,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5187,11 +5172,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5580,11 +5560,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5593,11 +5568,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5716,11 +5686,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5729,11 +5694,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
Ample/Resources/spectred.plist
-40
View File
@@ -4287,11 +4287,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -4300,11 +4295,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -6579,11 +6569,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -6592,11 +6577,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -7074,11 +7054,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -7087,11 +7062,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -7210,11 +7180,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -7223,11 +7188,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
Ample/Resources/tk3000.plist
-40
View File
@@ -4287,11 +4287,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -4300,11 +4295,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -6579,11 +6569,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -6592,11 +6577,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -7074,11 +7054,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -7087,11 +7062,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -7210,11 +7180,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -7223,11 +7188,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
Ample/Resources/uniap2en.plist
-40
View File
@@ -3915,11 +3915,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -3928,11 +3923,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5174,11 +5164,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5187,11 +5172,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5580,11 +5560,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5593,11 +5568,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5716,11 +5686,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5729,11 +5694,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
Ample/Resources/uniap2pt.plist
-40
View File
@@ -3915,11 +3915,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -3928,11 +3923,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5174,11 +5164,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5187,11 +5172,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5580,11 +5560,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5593,11 +5568,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5716,11 +5686,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5729,11 +5694,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
Ample/Resources/uniap2ti.plist
-40
View File
@@ -3915,11 +3915,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -3928,11 +3923,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5174,11 +5164,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5187,11 +5172,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5580,11 +5560,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5593,11 +5568,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5716,11 +5686,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5729,11 +5694,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
Ample/Resources/zijini.plist
-40
View File
@@ -3224,11 +3224,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -3237,11 +3232,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5516,11 +5506,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -5529,11 +5514,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -6011,11 +5991,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -6024,11 +5999,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -6147,11 +6117,6 @@
<string>RS232 Null Modem</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
@@ -6160,11 +6125,6 @@
<string>RS232 Synchronous I/O</string>
<key>default</key>
<false/>
<key>media</key>
<dict>
<key>bitbanger</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
Ample/Slot.m
+1 -30
View File
@@ -57,7 +57,6 @@ static NSArray *DeepCopyArray(NSArray *src) {
-(void)reset;
-(NSString *)keyPath;
-(void)setKeyPath: (NSString *)path;
-(void)buildArgs: (NSMutableArray *)args;
-(void)buildMedia: (Media *)media;
@@ -161,28 +160,6 @@ static NSDictionary *IndexMap = nil;
[option reserialize: dict];
return;
}
// special case for child options since _name is incorrect.
// _name is :rs232. should be set to -sl3:ssc:rs232 :/
#if 0
if (!_title) {
BOOL found = NO;
unsigned ix = 0;
for (SlotOption *option in _options) {
NSString *keyPath = [option keyPath];
NSString *value = [dict objectForKey: keyPath];
if (value && [value isEqualToString: [option value]]) {
[self setSelectedIndex: ix];
[option reserialize: dict];
found = YES;
break;
}
++ix;
}
return;
}
#endif
NSString *value = [dict objectForKey: _name];
if (!value) {
//[self reset];
@@ -264,9 +241,6 @@ static NSDictionary *IndexMap = nil;
for (SlotOption *o in _options) {
[o setKeyPath: p];
}
// set up child name so bookmarks work.
if (c == ':') _name = p;
}
@@ -511,7 +485,6 @@ https://developer.apple.com/library/archive/documentation/Cocoa/Conceptual/KeyVa
_(floppy_3_5);
_(floppy_5_25);
_(pseudo_disk);
_(bitbanger);
#undef _
for (Slot *s in _children) {
@@ -555,9 +528,7 @@ https://developer.apple.com/library/archive/documentation/Cocoa/Conceptual/KeyVa
[s setKeyPath: p];
}
}
-(NSString *)keyPath {
return _keyPath;
}
#if 0
-(BOOL)loadDeviceSlots: (NSDictionary *)devices {
Ample/SlotViewController.h
+1 -3
View File
@@ -17,9 +17,7 @@ NS_ASSUME_NONNULL_BEGIN
@property NSArray *args;
@property Media media;
@property NSSize resolution;
@property (nonatomic, nullable) NSString *machine;
-(IBAction)resetSlots:(nullable id)sender;
@property (nonatomic) NSString *machine;
@end
Ample/SlotViewController.m
+10 -16
View File
@@ -348,24 +348,13 @@ static unsigned RootKey = 0;
@implementation SlotViewController (Bookmark)
-(void)willLoadBookmark:(NSDictionary *)bookmark {
_loadingBookmark = YES;
[self setMachine: nil];
}
-(void)didLoadBookmark:(NSDictionary *)bookmark {
_loadingBookmark = NO;
[self rebuildArgs];
}
-(BOOL)loadBookmark: (NSDictionary *)bookmark {
NSDictionary *dict = [bookmark objectForKey: @"slots"];
[self setMachine: [bookmark objectForKey: @"machine"]];
[self resetSlots: nil];
for (Slot *item in _root) {
[item reserialize: dict];
@@ -373,19 +362,18 @@ static unsigned RootKey = 0;
if (index >= 0 && index < SLOT_COUNT) {
unsigned mask = 1 << index;
if ([item defaultIndex] != [item selectedIndex]) {
if ([item defaultIndex] != [item selectedIndex])
_slots_explicit |= mask; // grrr.
_slot_value[index] = [[item selectedItem] value];
}
_slot_media[index] = [item selectedMedia];
_slot_value[index] = [[item selectedItem] value];
}
++index;
}
// need to do it here so it propogate to media view.
[self rebuildMedia];
[self rebuildArgs];
return YES;
}
-(BOOL)saveBookmark: (NSMutableDictionary *)bookmark {
@@ -401,5 +389,11 @@ static unsigned RootKey = 0;
}
-(void)willLoadBookmark:(NSDictionary *)bookmark {
_loadingBookmark = YES;
}
-(void)didLoadBookmark:(NSDictionary *)bookmark {
_loadingBookmark = NO;
}
@end
Ample/SoftwareList.h
-4
View File
@@ -37,10 +37,6 @@
+(instancetype)softwareSetForMachine: (NSString *)machine;
-(BOOL)nameIsUnique: (NSString *)name;
-(NSString *)nameForSoftware: (Software *)software;
-(Software *)softwareForName: (NSString *)name;
-(BOOL)hasSoftware: (Software *)software;
@end
Ample/SoftwareList.m
+1 -69
View File
@@ -425,44 +425,6 @@ NSArray<SoftwareList *> *SoftwareListForMachine(NSString *machine) {
return [_set countForObject: name] <= 1;
}
-(NSString *)nameForSoftware: (Software *)software {
if (!software) return nil;
if (!_set) [self buildSet];
NSString *name = [software name];
if ([_set countForObject: name] > 1) {
return [software fullName];
}
return name;
}
-(Software *)softwareForName: (NSString *)name {
/* name will be name or set:name */
NSString *set = nil;
NSArray *tmp = [name componentsSeparatedByString: @":"];
switch([tmp count]) {
case 1: break;
case 2:
set = [tmp objectAtIndex: 0];
name = [tmp objectAtIndex: 1];
break;
default: return nil;
}
if (_set && ![_set containsObject: name]) return nil;
for (SoftwareList *list in _items) {
if (set && ![set isEqualToString: [list name]]) continue;
for (Software *s in [list items]) {
if ([name isEqualToString: [s name]]) return s;
}
}
return nil;
}
+(instancetype)softwareSetForMachine:(NSString *)machine {
static NSCache *cache;
@@ -535,24 +497,6 @@ NSArray<SoftwareList *> *SoftwareListForMachine(NSString *machine) {
return s;
}
-(BOOL)hasSoftware: (Software *)software {
if (_set) {
NSString *name = [software name];
if (![_set containsObject: name]) return NO;
}
NSString *slist = [software list];
for (SoftwareList *list in _items) {
if (![slist isEqualToString: [list name]]) continue;
return [[list items] containsObject: software];
}
return NO;
}
- (nonnull NSArray<id<AutocompleteItem>> *)autocomplete:(AutocompleteControl *)control completionsForItem:(id<AutocompleteItem>)item {
for (SoftwareList *list in _items) {
@@ -564,15 +508,6 @@ NSArray<SoftwareList *> *SoftwareListForMachine(NSString *machine) {
return nil;
}
// NSStringTransformStripDiacritics
// pre-process all entries to lowercase and remove diacritics (second string for search text?)
#if 0
static unichar diacritics[][2] = {
{ 0xd8, 'O' }, // Ø
{ 0xf8, 'o' }, // ø
};
#endif
- (nonnull NSArray<id<AutocompleteItem>> *)autocomplete:(nonnull AutocompleteControl *)control completionsForString:(nonnull NSString *)string {
if (!_cache) {
@@ -580,8 +515,7 @@ static unichar diacritics[][2] = {
[_cache setCountLimit: 10];
}
// todo -- diacritic normalization.
// déjá vu -> deja vu
enum { max_haystack_length = 256, max_needle_length = 256 };
@@ -589,8 +523,6 @@ static unichar diacritics[][2] = {
if (!_items) return @[];
//string = [string stringByApplyingTransform: NSStringTransformStripDiacritics reverse: NO];
NSUInteger needle_length = [string length];
needle_length = MIN(needle_length, max_needle_length);
Ample/TableCellView.m
-18
View File
@@ -14,24 +14,6 @@
NSTrackingRectTag _trackingRect;
}
-(void)awakeFromNib {
// need to do it here for 10.11 compatibility.
if (@available(macOS 10.14, *)) {
NSValueTransformer *t;
NSDictionary *options;
t = [NSValueTransformer valueTransformerForName: @"ValidColorTransformer"];
options = @{ NSValueTransformerBindingOption: t};
[_ejectButton bind: @"contentTintColor" toObject: self withKeyPath: @"objectValue.valid" options: options];
} else {
// El Capitan TODO...
}
}
#if 0
-(void)awakeFromNib {
Loaded 100 of 109 files, more files were not shown because too many files have changed in this diff. Show more