From 8886e7b2c7ad647b9328c678eb02533fbcdaa925 Mon Sep 17 00:00:00 2001
From: Kelvin Sherlock <ksherlock@gmail.com>
Date: Sun, 16 Aug 2020 21:22:45 -0400
Subject: [PATCH] updates

---
 MA2ME/AppDelegate.m           |  31 ++++++--
 MA2ME/Base.lproj/Models.plist | 137 +++++++++++++++++++++++++++++++++-
 2 files changed, 157 insertions(+), 11 deletions(-)

diff --git a/MA2ME/AppDelegate.m b/MA2ME/AppDelegate.m
index 65ad706..e62126a 100644
--- a/MA2ME/AppDelegate.m
+++ b/MA2ME/AppDelegate.m
@@ -73,6 +73,10 @@ static NSString *kMyContext = @"kMyContext";
     // Insert code here to tear down your application
 }
 
+- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)sender {
+    return YES;
+}
+
 
 -(void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSKeyValueChangeKey,id> *)change context:(void *)context {
 
@@ -96,17 +100,28 @@ static NSString *kMyContext = @"kMyContext";
     [argv addObject: @"mame"];
     [argv addObject: _mameROM];
     
-    if (_mameDebug) { [argv addObject: @"-debug"]; }
-    if (_mameWindow) { [argv addObject: @"-window"]; }
+    if (_mameDebug) [argv addObject: @"-debug"];
+    if (_mameWindow) [argv addObject: @"-window"];
+    
+    // -nounevenstretch -video soft
     if (_mameWindow && _mameSquarePixels) {
-        [argv addObject: @"-resolution"];
-        [argv addObject: @"704x462"];
-        [argv addObject: @"-video"];
-        [argv addObject: @"-soft"];
-        [argv addObject: @"-aspect"];
-        [argv addObject: @"704:462"];
+
+        if ([_mameROM hasPrefix: @"apple2gs"]) {
+            [argv addObject: @"-resolution"];
+            [argv addObject: @"704x462"];
+            [argv addObject: @"-video"];
+            [argv addObject: @"soft"];
+            [argv addObject: @"-aspect"];
+            [argv addObject: @"704:462"];
+        } else {
+            [argv addObject: @"-resolution"];
+            [argv addObject: @"560x384"];
+            
+        }
     }
 
+    if (_mameNoThrottle) [argv addObject: @"-nothrottle"];
+    
     [self setCommandLine: [argv componentsJoinedByString:@" "]];
 }
 
diff --git a/MA2ME/Base.lproj/Models.plist b/MA2ME/Base.lproj/Models.plist
index fe67c95..46995e7 100644
--- a/MA2ME/Base.lproj/Models.plist
+++ b/MA2ME/Base.lproj/Models.plist
@@ -8,7 +8,26 @@
 		<key>Mame</key>
 		<string>apple2gs</string>
 		<key>Children</key>
-		<array/>
+        <array>
+            <dict>
+                <key>Name</key>
+                <string>Apple IIgs ROM 0</string>
+                <key>Mame</key>
+                <string>applegsr0</string>
+            </dict>
+            <dict>
+                <key>Name</key>
+                <string>Apple IIgs ROM 1</string>
+                <key>Mame</key>
+                <string>applegsr1</string>
+            </dict>
+            <dict>
+                <key>Name</key>
+                <string>Apple IIgs ROM 3</string>
+                <key>Mame</key>
+                <string>applegs</string>
+            </dict>
+        </array>
 	</dict>
 	<dict>
 		<key>Name</key>
@@ -25,11 +44,123 @@
 			</dict>
 			<dict>
 				<key>Name</key>
-				<string>Apple IIe (enhanced)</string>
+				<string>Apple IIe (Enhanced)</string>
 				<key>Mame</key>
 				<string>apple2ee</string>
 			</dict>
-		</array>
+            <dict>
+                <key>Name</key>
+                <string>Apple IIe (Platinum)</string>
+                <key>Mame</key>
+                <string>apple2ep</string>
+            </dict>
+            <dict>
+                <key>Name</key>
+                <string>Apple IIe (Spain)</string>
+                <key>Mame</key>
+                <string>apple2ees</string>
+            </dict>
+            <dict>
+                <key>Name</key>
+                <string>Apple IIe (UK)</string>
+                <key>Mame</key>
+                <string>apple2euk</string>
+            </dict>
+        </array>
 	</dict>
+
+    <dict>
+        <key>Name</key>
+        <string>Apple //c</string>
+        <key>Mame</key>
+        <string>apple2c</string>
+        <key>Children</key>
+        <array>
+            <dict>
+                <key>Name</key>
+                <string>Apple //c</string>
+                <key>Mame</key>
+                <string>apple2c</string>
+            </dict>
+            <dict>
+                <key>Name</key>
+                <string>Apple //c+</string>
+                <key>Mame</key>
+                <string>apple2cp</string>
+            </dict>
+
+        </array>
+    </dict>
+
+    <dict>
+        <key>Name</key>
+        <string>Apple ][</string>
+        <key>Mame</key>
+        <string>apple2</string>
+        <key>Children</key>
+        <array>
+            <dict>
+                <key>Name</key>
+                <string>Apple ][</string>
+                <key>Mame</key>
+                <string>apple2</string>
+            </dict>
+            <dict>
+                <key>Name</key>
+                <string>Apple ][+</string>
+                <key>Mame</key>
+                <string>apple2p</string>
+            </dict>
+            <dict>
+                <key>Name</key>
+                <string>Apple ][ J-Plus</string>
+                <key>Mame</key>
+                <string>apple2jp</string>
+            </dict>
+        </array>
+    </dict>
+
+    <dict>
+        <key>Name</key>
+        <string>Apple I</string>
+        <key>Mame</key>
+        <string>apple1</string>
+    </dict>
+
+    <dict>
+        <key>Name</key>
+        <string>Apple ///</string>
+        <key>Mame</key>
+        <string>apple3</string>
+    </dict>
+
+    <dict>
+        <key>Name</key>
+        <string>Laser 128</string>
+        <key>Mame</key>
+        <string>laser128</string>
+        <key>Children</key>
+        <array>
+            <dict>
+                <key>Name</key>
+                <string>Laser 128</string>
+                <key>Mame</key>
+                <string>laser128</string>
+            </dict>
+            <dict>
+                <key>Name</key>
+                <string>Laser 128 EX</string>
+                <key>Mame</key>
+                <string>laser128ex</string>
+            </dict>
+            <dict>
+                <key>Name</key>
+                <string>Laser 128 EX2</string>
+                <key>Mame</key>
+                <string>laser128e2</string>
+            </dict>
+        </array>
+    </dict>
+
 </array>
 </plist>