Compare commits

...
5 Commits
34 changed files with 816 additions and 620 deletions

No files matched your search

+4 -4
View File
@@ -1714,7 +1714,7 @@
CODE_SIGN_ENTITLEMENTS = Ample/Ample.entitlements;
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 50;
CURRENT_PROJECT_VERSION = 51;
ENABLE_HARDENED_RUNTIME = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
@@ -1726,7 +1726,7 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.13;
MARKETING_VERSION = "0.259-u2-1";
MARKETING_VERSION = "0.260-u2";
PRODUCT_BUNDLE_IDENTIFIER = com.ksherlock.ample;
PRODUCT_NAME = "$(TARGET_NAME)";
};
@@ -1739,7 +1739,7 @@
CODE_SIGN_ENTITLEMENTS = Ample/Ample.entitlements;
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 50;
CURRENT_PROJECT_VERSION = 51;
ENABLE_HARDENED_RUNTIME = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
@@ -1751,7 +1751,7 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.13;
MARKETING_VERSION = "0.259-u2-1";
MARKETING_VERSION = "0.260-u2";
PRODUCT_BUNDLE_IDENTIFIER = com.ksherlock.ample;
PRODUCT_NAME = "$(TARGET_NAME)";
};
+1 -1
View File
@@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>MameComponentsDate</key>
<date>2023-09-29T12:00:00Z</date>
<date>2023-11-04T12:00:00Z</date>
<key>UseCustomMame</key>
<false/>
<key>AutoCloseLogWindow</key>
+48
View File
@@ -494,6 +494,14 @@
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
<string>thunder4gx</string>
<key>description</key>
<string>Radius Thunder IV GX video card</string>
<key>devname</key>
<string>nb_thungx</string>
</dict>
<dict>
<key>value</key>
<string>radiustpd</string>
@@ -644,6 +652,14 @@
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
<string>thunder4gx</string>
<key>description</key>
<string>Radius Thunder IV GX video card</string>
<key>devname</key>
<string>nb_thungx</string>
</dict>
<dict>
<key>value</key>
<string>radiustpd</string>
@@ -794,6 +810,14 @@
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
<string>thunder4gx</string>
<key>description</key>
<string>Radius Thunder IV GX video card</string>
<key>devname</key>
<string>nb_thungx</string>
</dict>
<dict>
<key>value</key>
<string>radiustpd</string>
@@ -944,6 +968,14 @@
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
<string>thunder4gx</string>
<key>description</key>
<string>Radius Thunder IV GX video card</string>
<key>devname</key>
<string>nb_thungx</string>
</dict>
<dict>
<key>value</key>
<string>radiustpd</string>
@@ -1094,6 +1126,14 @@
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
<string>thunder4gx</string>
<key>description</key>
<string>Radius Thunder IV GX video card</string>
<key>devname</key>
<string>nb_thungx</string>
</dict>
<dict>
<key>value</key>
<string>radiustpd</string>
@@ -1244,6 +1284,14 @@
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
<string>thunder4gx</string>
<key>description</key>
<string>Radius Thunder IV GX video card</string>
<key>devname</key>
<string>nb_thungx</string>
</dict>
<dict>
<key>value</key>
<string>radiustpd</string>
+25
View File
@@ -364,6 +364,31 @@
</dict>
</array>
</dict>
<dict>
<key>name</key>
<string>lcpds</string>
<key>description</key>
<string>PDS</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>macconilc</string>
<key>description</key>
<string>Asante MacCON i LC Ethernet card</string>
<key>devname</key>
<string>pdslc_macconlc</string>
</dict>
</array>
</dict>
</array>
<key>devices</key>
<array>
+24
View File
@@ -581,6 +581,14 @@
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
<string>thunder4gx</string>
<key>description</key>
<string>Radius Thunder IV GX video card</string>
<key>devname</key>
<string>nb_thungx</string>
</dict>
<dict>
<key>value</key>
<string>radiustpd</string>
@@ -731,6 +739,14 @@
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
<string>thunder4gx</string>
<key>description</key>
<string>Radius Thunder IV GX video card</string>
<key>devname</key>
<string>nb_thungx</string>
</dict>
<dict>
<key>value</key>
<string>radiustpd</string>
@@ -881,6 +897,14 @@
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
<string>thunder4gx</string>
<key>description</key>
<string>Radius Thunder IV GX video card</string>
<key>devname</key>
<string>nb_thungx</string>
</dict>
<dict>
<key>value</key>
<string>radiustpd</string>
+24
View File
@@ -581,6 +581,14 @@
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
<string>thunder4gx</string>
<key>description</key>
<string>Radius Thunder IV GX video card</string>
<key>devname</key>
<string>nb_thungx</string>
</dict>
<dict>
<key>value</key>
<string>radiustpd</string>
@@ -731,6 +739,14 @@
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
<string>thunder4gx</string>
<key>description</key>
<string>Radius Thunder IV GX video card</string>
<key>devname</key>
<string>nb_thungx</string>
</dict>
<dict>
<key>value</key>
<string>radiustpd</string>
@@ -881,6 +897,14 @@
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
<string>thunder4gx</string>
<key>description</key>
<string>Radius Thunder IV GX video card</string>
<key>devname</key>
<string>nb_thungx</string>
</dict>
<dict>
<key>value</key>
<string>radiustpd</string>
+48
View File
@@ -523,6 +523,14 @@
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
<string>thunder4gx</string>
<key>description</key>
<string>Radius Thunder IV GX video card</string>
<key>devname</key>
<string>nb_thungx</string>
</dict>
<dict>
<key>value</key>
<string>radiustpd</string>
@@ -673,6 +681,14 @@
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
<string>thunder4gx</string>
<key>description</key>
<string>Radius Thunder IV GX video card</string>
<key>devname</key>
<string>nb_thungx</string>
</dict>
<dict>
<key>value</key>
<string>radiustpd</string>
@@ -823,6 +839,14 @@
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
<string>thunder4gx</string>
<key>description</key>
<string>Radius Thunder IV GX video card</string>
<key>devname</key>
<string>nb_thungx</string>
</dict>
<dict>
<key>value</key>
<string>radiustpd</string>
@@ -973,6 +997,14 @@
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
<string>thunder4gx</string>
<key>description</key>
<string>Radius Thunder IV GX video card</string>
<key>devname</key>
<string>nb_thungx</string>
</dict>
<dict>
<key>value</key>
<string>radiustpd</string>
@@ -1123,6 +1155,14 @@
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
<string>thunder4gx</string>
<key>description</key>
<string>Radius Thunder IV GX video card</string>
<key>devname</key>
<string>nb_thungx</string>
</dict>
<dict>
<key>value</key>
<string>radiustpd</string>
@@ -1273,6 +1313,14 @@
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
<string>thunder4gx</string>
<key>description</key>
<string>Radius Thunder IV GX video card</string>
<key>devname</key>
<string>nb_thungx</string>
</dict>
<dict>
<key>value</key>
<string>radiustpd</string>
+24
View File
@@ -512,6 +512,14 @@
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
<string>thunder4gx</string>
<key>description</key>
<string>Radius Thunder IV GX video card</string>
<key>devname</key>
<string>nb_thungx</string>
</dict>
<dict>
<key>value</key>
<string>radiustpd</string>
@@ -662,6 +670,14 @@
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
<string>thunder4gx</string>
<key>description</key>
<string>Radius Thunder IV GX video card</string>
<key>devname</key>
<string>nb_thungx</string>
</dict>
<dict>
<key>value</key>
<string>radiustpd</string>
@@ -812,6 +828,14 @@
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
<string>thunder4gx</string>
<key>description</key>
<string>Radius Thunder IV GX video card</string>
<key>devname</key>
<string>nb_thungx</string>
</dict>
<dict>
<key>value</key>
<string>radiustpd</string>
+24
View File
@@ -494,6 +494,14 @@
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
<string>thunder4gx</string>
<key>description</key>
<string>Radius Thunder IV GX video card</string>
<key>devname</key>
<string>nb_thungx</string>
</dict>
<dict>
<key>value</key>
<string>radiustpd</string>
@@ -644,6 +652,14 @@
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
<string>thunder4gx</string>
<key>description</key>
<string>Radius Thunder IV GX video card</string>
<key>devname</key>
<string>nb_thungx</string>
</dict>
<dict>
<key>value</key>
<string>radiustpd</string>
@@ -794,6 +810,14 @@
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
<string>thunder4gx</string>
<key>description</key>
<string>Radius Thunder IV GX video card</string>
<key>devname</key>
<string>nb_thungx</string>
</dict>
<dict>
<key>value</key>
<string>radiustpd</string>
+48
View File
@@ -523,6 +523,14 @@
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
<string>thunder4gx</string>
<key>description</key>
<string>Radius Thunder IV GX video card</string>
<key>devname</key>
<string>nb_thungx</string>
</dict>
<dict>
<key>value</key>
<string>radiustpd</string>
@@ -673,6 +681,14 @@
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
<string>thunder4gx</string>
<key>description</key>
<string>Radius Thunder IV GX video card</string>
<key>devname</key>
<string>nb_thungx</string>
</dict>
<dict>
<key>value</key>
<string>radiustpd</string>
@@ -823,6 +839,14 @@
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
<string>thunder4gx</string>
<key>description</key>
<string>Radius Thunder IV GX video card</string>
<key>devname</key>
<string>nb_thungx</string>
</dict>
<dict>
<key>value</key>
<string>radiustpd</string>
@@ -973,6 +997,14 @@
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
<string>thunder4gx</string>
<key>description</key>
<string>Radius Thunder IV GX video card</string>
<key>devname</key>
<string>nb_thungx</string>
</dict>
<dict>
<key>value</key>
<string>radiustpd</string>
@@ -1123,6 +1155,14 @@
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
<string>thunder4gx</string>
<key>description</key>
<string>Radius Thunder IV GX video card</string>
<key>devname</key>
<string>nb_thungx</string>
</dict>
<dict>
<key>value</key>
<string>radiustpd</string>
@@ -1273,6 +1313,14 @@
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
<string>thunder4gx</string>
<key>description</key>
<string>Radius Thunder IV GX video card</string>
<key>devname</key>
<string>nb_thungx</string>
</dict>
<dict>
<key>value</key>
<string>radiustpd</string>
-450
View File
@@ -404,456 +404,6 @@
</dict>
</array>
</dict>
<dict>
<key>name</key>
<string>nbc</string>
<key>description</key>
<string>Slot C</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>mdc48</string>
<key>description</key>
<string>Apple Macintosh Display Card 4/8 (MDC 1.0.1)</string>
<key>devname</key>
<string>nb_mdc48</string>
</dict>
<dict>
<key>value</key>
<string>mdc824</string>
<key>description</key>
<string>Apple Macintosh Display Card 8/24 (MDC 1.2)</string>
<key>devname</key>
<string>nb_mdc824</string>
</dict>
<dict>
<key>value</key>
<string>m2hires</string>
<key>description</key>
<string>Apple Macintosh II High Resolution Video Card</string>
<key>devname</key>
<string>nb_m2hr</string>
</dict>
<dict>
<key>value</key>
<string>m2video</string>
<key>description</key>
<string>Apple Macintosh II Video Card</string>
<key>devname</key>
<string>nb_m2vc</string>
</dict>
<dict>
<key>value</key>
<string>enetnb</string>
<key>description</key>
<string>Apple NuBus Ethernet card</string>
<key>devname</key>
<string>nb_aenet</string>
</dict>
<dict>
<key>value</key>
<string>quadralink</string>
<key>description</key>
<string>Applied Engineering Quadralink serial card</string>
<key>devname</key>
<string>nb_qdlink</string>
</dict>
<dict>
<key>value</key>
<string>asmc3nb</string>
<key>description</key>
<string>Asante MC3NB Ethernet card</string>
<key>devname</key>
<string>nb_amc3b</string>
</dict>
<dict>
<key>value</key>
<string>bootbug</string>
<key>description</key>
<string>Brigent BootBug debugger card</string>
<key>devname</key>
<string>nb_btbug</string>
</dict>
<dict>
<key>value</key>
<string>portrait</string>
<key>description</key>
<string>Macintosh II Portrait Video Card</string>
<key>devname</key>
<string>nb_wspt</string>
</dict>
<dict>
<key>value</key>
<string>vikbw</string>
<key>description</key>
<string>Moniterm Viking video card</string>
<key>devname</key>
<string>nb_vikbw</string>
</dict>
<dict>
<key>value</key>
<string>image</string>
<key>description</key>
<string>NuBus Disk Image Pseudo-Card</string>
<key>devname</key>
<string>nb_image</string>
<key>media</key>
<dict>
<key>pseudo_disk</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
<string>radiustpd</string>
<key>description</key>
<string>Radius Two Page Display video card</string>
<key>devname</key>
<string>nb_rtpd</string>
</dict>
<dict>
<key>value</key>
<string>cb264</string>
<key>description</key>
<string>RasterOps ColorBoard 264 video card</string>
<key>devname</key>
<string>nb_c264</string>
</dict>
<dict>
<key>value</key>
<string>laserview</string>
<key>description</key>
<string>Sigma Designs LaserView video card</string>
<key>devname</key>
<string>nb_laserview</string>
</dict>
<dict>
<key>value</key>
<string>specpdq</string>
<key>description</key>
<string>SuperMac Spectrum PDQ video card</string>
<key>devname</key>
<string>nb_spdq</string>
</dict>
<dict>
<key>value</key>
<string>spec8s3</string>
<key>description</key>
<string>SuperMac Spectrum/8 Series III video card</string>
<key>devname</key>
<string>nb_sp8s3</string>
</dict>
</array>
</dict>
<dict>
<key>name</key>
<string>nbd</string>
<key>description</key>
<string>Slot D</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>mdc48</string>
<key>description</key>
<string>Apple Macintosh Display Card 4/8 (MDC 1.0.1)</string>
<key>devname</key>
<string>nb_mdc48</string>
</dict>
<dict>
<key>value</key>
<string>mdc824</string>
<key>description</key>
<string>Apple Macintosh Display Card 8/24 (MDC 1.2)</string>
<key>devname</key>
<string>nb_mdc824</string>
</dict>
<dict>
<key>value</key>
<string>m2hires</string>
<key>description</key>
<string>Apple Macintosh II High Resolution Video Card</string>
<key>devname</key>
<string>nb_m2hr</string>
</dict>
<dict>
<key>value</key>
<string>m2video</string>
<key>description</key>
<string>Apple Macintosh II Video Card</string>
<key>devname</key>
<string>nb_m2vc</string>
</dict>
<dict>
<key>value</key>
<string>enetnb</string>
<key>description</key>
<string>Apple NuBus Ethernet card</string>
<key>devname</key>
<string>nb_aenet</string>
</dict>
<dict>
<key>value</key>
<string>quadralink</string>
<key>description</key>
<string>Applied Engineering Quadralink serial card</string>
<key>devname</key>
<string>nb_qdlink</string>
</dict>
<dict>
<key>value</key>
<string>asmc3nb</string>
<key>description</key>
<string>Asante MC3NB Ethernet card</string>
<key>devname</key>
<string>nb_amc3b</string>
</dict>
<dict>
<key>value</key>
<string>bootbug</string>
<key>description</key>
<string>Brigent BootBug debugger card</string>
<key>devname</key>
<string>nb_btbug</string>
</dict>
<dict>
<key>value</key>
<string>portrait</string>
<key>description</key>
<string>Macintosh II Portrait Video Card</string>
<key>devname</key>
<string>nb_wspt</string>
</dict>
<dict>
<key>value</key>
<string>vikbw</string>
<key>description</key>
<string>Moniterm Viking video card</string>
<key>devname</key>
<string>nb_vikbw</string>
</dict>
<dict>
<key>value</key>
<string>image</string>
<key>description</key>
<string>NuBus Disk Image Pseudo-Card</string>
<key>devname</key>
<string>nb_image</string>
<key>media</key>
<dict>
<key>pseudo_disk</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
<string>radiustpd</string>
<key>description</key>
<string>Radius Two Page Display video card</string>
<key>devname</key>
<string>nb_rtpd</string>
</dict>
<dict>
<key>value</key>
<string>cb264</string>
<key>description</key>
<string>RasterOps ColorBoard 264 video card</string>
<key>devname</key>
<string>nb_c264</string>
</dict>
<dict>
<key>value</key>
<string>laserview</string>
<key>description</key>
<string>Sigma Designs LaserView video card</string>
<key>devname</key>
<string>nb_laserview</string>
</dict>
<dict>
<key>value</key>
<string>specpdq</string>
<key>description</key>
<string>SuperMac Spectrum PDQ video card</string>
<key>devname</key>
<string>nb_spdq</string>
</dict>
<dict>
<key>value</key>
<string>spec8s3</string>
<key>description</key>
<string>SuperMac Spectrum/8 Series III video card</string>
<key>devname</key>
<string>nb_sp8s3</string>
</dict>
</array>
</dict>
<dict>
<key>name</key>
<string>nbe</string>
<key>description</key>
<string>Slot E</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>mdc48</string>
<key>description</key>
<string>Apple Macintosh Display Card 4/8 (MDC 1.0.1)</string>
<key>devname</key>
<string>nb_mdc48</string>
</dict>
<dict>
<key>value</key>
<string>mdc824</string>
<key>description</key>
<string>Apple Macintosh Display Card 8/24 (MDC 1.2)</string>
<key>devname</key>
<string>nb_mdc824</string>
</dict>
<dict>
<key>value</key>
<string>m2hires</string>
<key>description</key>
<string>Apple Macintosh II High Resolution Video Card</string>
<key>devname</key>
<string>nb_m2hr</string>
</dict>
<dict>
<key>value</key>
<string>m2video</string>
<key>description</key>
<string>Apple Macintosh II Video Card</string>
<key>devname</key>
<string>nb_m2vc</string>
</dict>
<dict>
<key>value</key>
<string>enetnb</string>
<key>description</key>
<string>Apple NuBus Ethernet card</string>
<key>devname</key>
<string>nb_aenet</string>
</dict>
<dict>
<key>value</key>
<string>quadralink</string>
<key>description</key>
<string>Applied Engineering Quadralink serial card</string>
<key>devname</key>
<string>nb_qdlink</string>
</dict>
<dict>
<key>value</key>
<string>asmc3nb</string>
<key>description</key>
<string>Asante MC3NB Ethernet card</string>
<key>devname</key>
<string>nb_amc3b</string>
</dict>
<dict>
<key>value</key>
<string>bootbug</string>
<key>description</key>
<string>Brigent BootBug debugger card</string>
<key>devname</key>
<string>nb_btbug</string>
</dict>
<dict>
<key>value</key>
<string>portrait</string>
<key>description</key>
<string>Macintosh II Portrait Video Card</string>
<key>devname</key>
<string>nb_wspt</string>
</dict>
<dict>
<key>value</key>
<string>vikbw</string>
<key>description</key>
<string>Moniterm Viking video card</string>
<key>devname</key>
<string>nb_vikbw</string>
</dict>
<dict>
<key>value</key>
<string>image</string>
<key>description</key>
<string>NuBus Disk Image Pseudo-Card</string>
<key>devname</key>
<string>nb_image</string>
<key>media</key>
<dict>
<key>pseudo_disk</key>
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
<string>radiustpd</string>
<key>description</key>
<string>Radius Two Page Display video card</string>
<key>devname</key>
<string>nb_rtpd</string>
</dict>
<dict>
<key>value</key>
<string>cb264</string>
<key>description</key>
<string>RasterOps ColorBoard 264 video card</string>
<key>devname</key>
<string>nb_c264</string>
</dict>
<dict>
<key>value</key>
<string>laserview</string>
<key>description</key>
<string>Sigma Designs LaserView video card</string>
<key>devname</key>
<string>nb_laserview</string>
</dict>
<dict>
<key>value</key>
<string>specpdq</string>
<key>description</key>
<string>SuperMac Spectrum PDQ video card</string>
<key>devname</key>
<string>nb_spdq</string>
</dict>
<dict>
<key>value</key>
<string>spec8s3</string>
<key>description</key>
<string>SuperMac Spectrum/8 Series III video card</string>
<key>devname</key>
<string>nb_sp8s3</string>
</dict>
</array>
</dict>
</array>
<key>devices</key>
<array>
+24
View File
@@ -512,6 +512,14 @@
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
<string>thunder4gx</string>
<key>description</key>
<string>Radius Thunder IV GX video card</string>
<key>devname</key>
<string>nb_thungx</string>
</dict>
<dict>
<key>value</key>
<string>radiustpd</string>
@@ -662,6 +670,14 @@
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
<string>thunder4gx</string>
<key>description</key>
<string>Radius Thunder IV GX video card</string>
<key>devname</key>
<string>nb_thungx</string>
</dict>
<dict>
<key>value</key>
<string>radiustpd</string>
@@ -812,6 +828,14 @@
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
<string>thunder4gx</string>
<key>description</key>
<string>Radius Thunder IV GX video card</string>
<key>devname</key>
<string>nb_thungx</string>
</dict>
<dict>
<key>value</key>
<string>radiustpd</string>
+24
View File
@@ -512,6 +512,14 @@
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
<string>thunder4gx</string>
<key>description</key>
<string>Radius Thunder IV GX video card</string>
<key>devname</key>
<string>nb_thungx</string>
</dict>
<dict>
<key>value</key>
<string>radiustpd</string>
@@ -662,6 +670,14 @@
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
<string>thunder4gx</string>
<key>description</key>
<string>Radius Thunder IV GX video card</string>
<key>devname</key>
<string>nb_thungx</string>
</dict>
<dict>
<key>value</key>
<string>radiustpd</string>
@@ -812,6 +828,14 @@
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
<string>thunder4gx</string>
<key>description</key>
<string>Radius Thunder IV GX video card</string>
<key>devname</key>
<string>nb_thungx</string>
</dict>
<dict>
<key>value</key>
<string>radiustpd</string>
+48
View File
@@ -494,6 +494,14 @@
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
<string>thunder4gx</string>
<key>description</key>
<string>Radius Thunder IV GX video card</string>
<key>devname</key>
<string>nb_thungx</string>
</dict>
<dict>
<key>value</key>
<string>radiustpd</string>
@@ -644,6 +652,14 @@
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
<string>thunder4gx</string>
<key>description</key>
<string>Radius Thunder IV GX video card</string>
<key>devname</key>
<string>nb_thungx</string>
</dict>
<dict>
<key>value</key>
<string>radiustpd</string>
@@ -794,6 +810,14 @@
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
<string>thunder4gx</string>
<key>description</key>
<string>Radius Thunder IV GX video card</string>
<key>devname</key>
<string>nb_thungx</string>
</dict>
<dict>
<key>value</key>
<string>radiustpd</string>
@@ -944,6 +968,14 @@
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
<string>thunder4gx</string>
<key>description</key>
<string>Radius Thunder IV GX video card</string>
<key>devname</key>
<string>nb_thungx</string>
</dict>
<dict>
<key>value</key>
<string>radiustpd</string>
@@ -1094,6 +1126,14 @@
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
<string>thunder4gx</string>
<key>description</key>
<string>Radius Thunder IV GX video card</string>
<key>devname</key>
<string>nb_thungx</string>
</dict>
<dict>
<key>value</key>
<string>radiustpd</string>
@@ -1244,6 +1284,14 @@
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
<string>thunder4gx</string>
<key>description</key>
<string>Radius Thunder IV GX video card</string>
<key>devname</key>
<string>nb_thungx</string>
</dict>
<dict>
<key>value</key>
<string>radiustpd</string>
+33
View File
@@ -364,6 +364,39 @@
</dict>
</array>
</dict>
<dict>
<key>name</key>
<string>lcpds</string>
<key>description</key>
<string>PDS</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>macconilc</string>
<key>description</key>
<string>Asante MacCON i LC Ethernet card</string>
<key>devname</key>
<string>pdslc_macconlc</string>
</dict>
<dict>
<key>value</key>
<string>ro8lc</string>
<key>description</key>
<string>RasterOps ColorVue 8LC video card</string>
<key>devname</key>
<string>cv8lc</string>
</dict>
</array>
</dict>
</array>
<key>devices</key>
<array>
+25
View File
@@ -364,6 +364,31 @@
</dict>
</array>
</dict>
<dict>
<key>name</key>
<string>lcpds</string>
<key>description</key>
<string>PDS</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>macconilc</string>
<key>description</key>
<string>Asante MacCON i LC Ethernet card</string>
<key>devname</key>
<string>pdslc_macconlc</string>
</dict>
</array>
</dict>
</array>
<key>devices</key>
<array>
+25
View File
@@ -394,6 +394,31 @@
</dict>
</array>
</dict>
<dict>
<key>name</key>
<string>lcpds</string>
<key>description</key>
<string>PDS</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>macconilc</string>
<key>description</key>
<string>Asante MacCON i LC Ethernet card</string>
<key>devname</key>
<string>pdslc_macconlc</string>
</dict>
</array>
</dict>
</array>
<key>devices</key>
<array>
+25
View File
@@ -394,6 +394,31 @@
</dict>
</array>
</dict>
<dict>
<key>name</key>
<string>lcpds</string>
<key>description</key>
<string>PDS</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>macconilc</string>
<key>description</key>
<string>Asante MacCON i LC Ethernet card</string>
<key>devname</key>
<string>pdslc_macconlc</string>
</dict>
</array>
</dict>
</array>
<key>devices</key>
<array>
+25
View File
@@ -454,6 +454,31 @@
</dict>
</array>
</dict>
<dict>
<key>name</key>
<string>lcpds</string>
<key>description</key>
<string>PDS</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>macconilc</string>
<key>description</key>
<string>Asante MacCON i LC Ethernet card</string>
<key>devname</key>
<string>pdslc_macconlc</string>
</dict>
</array>
</dict>
</array>
<key>devices</key>
<array>
+25
View File
@@ -394,6 +394,31 @@
</dict>
</array>
</dict>
<dict>
<key>name</key>
<string>lcpds</string>
<key>description</key>
<string>PDS</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>macconilc</string>
<key>description</key>
<string>Asante MacCON i LC Ethernet card</string>
<key>devname</key>
<string>pdslc_macconlc</string>
</dict>
</array>
</dict>
</array>
<key>devices</key>
<array>
+25
View File
@@ -394,6 +394,31 @@
</dict>
</array>
</dict>
<dict>
<key>name</key>
<string>lcpds</string>
<key>description</key>
<string>PDS</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>macconilc</string>
<key>description</key>
<string>Asante MacCON i LC Ethernet card</string>
<key>devname</key>
<string>pdslc_macconlc</string>
</dict>
</array>
</dict>
</array>
<key>devices</key>
<array>
+25
View File
@@ -454,6 +454,31 @@
</dict>
</array>
</dict>
<dict>
<key>name</key>
<string>lcpds</string>
<key>description</key>
<string>PDS</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>macconilc</string>
<key>description</key>
<string>Asante MacCON i LC Ethernet card</string>
<key>devname</key>
<string>pdslc_macconlc</string>
</dict>
</array>
</dict>
</array>
<key>devices</key>
<array>
+25
View File
@@ -454,6 +454,31 @@
</dict>
</array>
</dict>
<dict>
<key>name</key>
<string>lcpds</string>
<key>description</key>
<string>PDS</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>macconilc</string>
<key>description</key>
<string>Asante MacCON i LC Ethernet card</string>
<key>devname</key>
<string>pdslc_macconlc</string>
</dict>
</array>
</dict>
</array>
<key>devices</key>
<array>
+24
View File
@@ -581,6 +581,14 @@
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
<string>thunder4gx</string>
<key>description</key>
<string>Radius Thunder IV GX video card</string>
<key>devname</key>
<string>nb_thungx</string>
</dict>
<dict>
<key>value</key>
<string>radiustpd</string>
@@ -731,6 +739,14 @@
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
<string>thunder4gx</string>
<key>description</key>
<string>Radius Thunder IV GX video card</string>
<key>devname</key>
<string>nb_thungx</string>
</dict>
<dict>
<key>value</key>
<string>radiustpd</string>
@@ -881,6 +897,14 @@
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
<string>thunder4gx</string>
<key>description</key>
<string>Radius Thunder IV GX video card</string>
<key>devname</key>
<string>nb_thungx</string>
</dict>
<dict>
<key>value</key>
<string>radiustpd</string>
+24
View File
@@ -581,6 +581,14 @@
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
<string>thunder4gx</string>
<key>description</key>
<string>Radius Thunder IV GX video card</string>
<key>devname</key>
<string>nb_thungx</string>
</dict>
<dict>
<key>value</key>
<string>radiustpd</string>
@@ -731,6 +739,14 @@
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
<string>thunder4gx</string>
<key>description</key>
<string>Radius Thunder IV GX video card</string>
<key>devname</key>
<string>nb_thungx</string>
</dict>
<dict>
<key>value</key>
<string>radiustpd</string>
@@ -881,6 +897,14 @@
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
<string>thunder4gx</string>
<key>description</key>
<string>Radius Thunder IV GX video card</string>
<key>devname</key>
<string>nb_thungx</string>
</dict>
<dict>
<key>value</key>
<string>radiustpd</string>
+16
View File
@@ -532,6 +532,14 @@
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
<string>thunder4gx</string>
<key>description</key>
<string>Radius Thunder IV GX video card</string>
<key>devname</key>
<string>nb_thungx</string>
</dict>
<dict>
<key>value</key>
<string>radiustpd</string>
@@ -682,6 +690,14 @@
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
<string>thunder4gx</string>
<key>description</key>
<string>Radius Thunder IV GX video card</string>
<key>devname</key>
<string>nb_thungx</string>
</dict>
<dict>
<key>value</key>
<string>radiustpd</string>
+24
View File
@@ -581,6 +581,14 @@
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
<string>thunder4gx</string>
<key>description</key>
<string>Radius Thunder IV GX video card</string>
<key>devname</key>
<string>nb_thungx</string>
</dict>
<dict>
<key>value</key>
<string>radiustpd</string>
@@ -731,6 +739,14 @@
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
<string>thunder4gx</string>
<key>description</key>
<string>Radius Thunder IV GX video card</string>
<key>devname</key>
<string>nb_thungx</string>
</dict>
<dict>
<key>value</key>
<string>radiustpd</string>
@@ -881,6 +897,14 @@
<integer>1</integer>
</dict>
</dict>
<dict>
<key>value</key>
<string>thunder4gx</string>
<key>description</key>
<string>Radius Thunder IV GX video card</string>
<key>devname</key>
<string>nb_thungx</string>
</dict>
<dict>
<key>value</key>
<string>radiustpd</string>
+9 -1
View File
@@ -399,6 +399,14 @@
<key>default</key>
<true/>
</dict>
<dict>
<key>value</key>
<string>ethermac30</string>
<key>description</key>
<string>Farallon EtherMac 30i-TH Ethernet card</string>
<key>devname</key>
<string>pds30_emac</string>
</dict>
<dict>
<key>value</key>
<string>pc816</string>
@@ -425,7 +433,7 @@
</dict>
<dict>
<key>value</key>
<string>cb264</string>
<string>cb264se30</string>
<key>description</key>
<string>RasterOps Colorboard 264/SE30</string>
<key>devname</key>
+24
View File
@@ -416,6 +416,12 @@
<key>description</key>
<string>Asante MC3NB Ethernet card</string>
</dict>
<dict>
<key>value</key>
<string>pdslc_macconlc</string>
<key>description</key>
<string>Asante MacCON i LC Ethernet card</string>
</dict>
<dict>
<key>value</key>
<string>megast</string>
@@ -578,6 +584,12 @@
<key>description</key>
<string>Epson LX-810L</string>
</dict>
<dict>
<key>value</key>
<string>pds30_emac</string>
<key>description</key>
<string>Farallon EtherMac 30i-TH Ethernet card</string>
</dict>
<dict>
<key>value</key>
<string>a2sider1</string>
@@ -1088,6 +1100,12 @@
<key>description</key>
<string>Radius SE Full Page Display</string>
</dict>
<dict>
<key>value</key>
<string>nb_thungx</string>
<key>description</key>
<string>Radius Thunder IV GX video card</string>
</dict>
<dict>
<key>value</key>
<string>nb_rtpd</string>
@@ -1100,6 +1118,12 @@
<key>description</key>
<string>RasterOps ColorBoard 264 video card</string>
</dict>
<dict>
<key>value</key>
<string>cv8lc</string>
<key>description</key>
<string>RasterOps ColorVue 8LC video card</string>
</dict>
<dict>
<key>value</key>
<string>pd3_c264</string>
+8 -10
View File
@@ -10,21 +10,17 @@
#import <Cocoa/Cocoa.h>
#import "Media.h"
/* number of slot types. bitmask used so should be < sizeof(unsigned *8) */
#define SLOT_COUNT 28
static_assert(SLOT_COUNT <= sizeof(unsigned) * 8, "too many slot types");
#define kSMARTPORT_SLOT 1
#define kBIOS_SLOT 2
#ifndef SIZEOF
#define SIZEOF(x) (sizeof(x) / sizeof(x[0]))
#endif
//NS_ASSUME_NONNULL_BEGIN
@class Slot, SlotOption, SlotTableCellView;
typedef enum SlotType {
kSlotRAM = 1,
kSlotBIOS,
kSlotFDC,
} SlotType;
@interface Slot : NSObject<NSCopying>
@property NSInteger defaultIndex;
@@ -34,8 +30,10 @@ static_assert(SLOT_COUNT <= sizeof(unsigned) * 8, "too many slot types");
@property (readonly) NSString *name;
@property (readonly) NSString *title;
@property (readonly) NSArray *menuItems;
@property (readonly) SlotType type;
@property (readonly) SlotOption *selectedItem;
@property (readonly) NSString *selectedValue;
-(NSArray *)args;
-(NSDictionary *)serialize;
+36 -84
View File
@@ -72,47 +72,17 @@ static NSArray *DeepCopyArray(NSArray *src) {
@implementation Slot
static NSDictionary *IndexMap = nil;
@synthesize type = _type;
static NSDictionary *TypeMap = nil;
+(void)load {
IndexMap = @{
@"ramsize": @0,
@"smartport": @1,
@"bios": @2,
@"sl0": @3,
@"sl1": @4,
@"sl2": @5,
@"sl3": @6,
@"sl4": @7,
@"sl5": @8,
@"sl6": @9,
@"sl7": @10,
@"exp": @11,
@"aux": @12,
@"rs232": @13,
@"gameio": @14,
@"modem": @15,
@"printer": @16,
//nubus mac
@"nb9": @17,
@"nba": @18,
@"nbb": @19,
@"nbc": @20,
@"nbd": @21,
@"nbe": @22,
@"pds": @23,
@"pds030": @24,
@"centronics": @25,
@"mdin": @26,
@"mdout": @27
};
static_assert(kSMARTPORT_SLOT == 1, "Smartport != 1");
static_assert(kBIOS_SLOT == 2, "Bios != 2");
TypeMap = @{
@"ramsize": @(kSlotRAM),
@"smartport": @(kSlotFDC),
@"bios": @(kSlotBIOS),
};
}
-(void)reset {
@@ -171,7 +141,7 @@ static NSDictionary *IndexMap = nil;
// { 'sl3' : 'uthernet' }
// special case for smartport since the name isn't used.
if (_index == kSMARTPORT_SLOT) {
if (_type == kSlotFDC) {
SlotOption *option = [_options objectAtIndex: _selectedIndex];
[option reserialize: dict];
return;
@@ -230,9 +200,14 @@ static NSDictionary *IndexMap = nil;
[option buildMedia: &media];
return media;
}
-(NSString *)selectedValue {
if (_selectedIndex < 0) return nil;
if (_selectedIndex >= [_options count]) return nil;
return [[_options objectAtIndex: _selectedIndex] value];
}
-(NSArray *)selectedChildren {
if (_selectedIndex < 0) return nil;
@@ -288,21 +263,26 @@ static NSDictionary *IndexMap = nil;
if (c != '-') _name = p;
}
-(instancetype)initWithDictionary: (NSDictionary *)data devices: (NSDictionary *)devices {
return [self initWithDictionary: data devices: devices index: 0];
}
-(instancetype)initWithDictionary: (NSDictionary *)data devices: (NSDictionary *)devices index: (NSInteger)index {
BOOL topLevel = NO;
_selectedIndex = -1;
_defaultIndex = -1;
_index = -1;
_index = index;
_name = [data objectForKey: @"name"];
_title = [data objectForKey: @"description"];
NSNumber *x = [IndexMap objectForKey: _name];
if (x) {
NSNumber *x = [TypeMap objectForKey: _name];
if (x) _type = [x intValue];
if (index < 0x10000) {
topLevel = YES;
_index = [x integerValue];
_name = [@"-" stringByAppendingString: _name];
_title = [_title stringByAppendingString: @":"];
}
@@ -310,14 +290,13 @@ static NSDictionary *IndexMap = nil;
NSArray *op = [data objectForKey: @"options"];
NSMutableArray *options = [NSMutableArray arrayWithCapacity: [op count]];
NSInteger index = 0;
NSInteger ix = 0;
for (NSDictionary *d in op) {
SlotOption *o = [[SlotOption alloc] initWithDictionary: d devices: devices];
if ([o isDefault]) {
_defaultIndex = index;
_defaultIndex = ix;
}
++index;
++ix;
if (topLevel) {
[o setKeyPath: _name];
NSArray *tmp = [o children];
@@ -338,36 +317,6 @@ static NSDictionary *IndexMap = nil;
return self;
}
#if 0
-(instancetype)initWithName: (NSString *)name title: (NSString *)title data: (NSArray *)data {
_name = [name copy];
_title = [title copy];
_selectedIndex = -1;
_defaultIndex = -1;
_index = -1;
NSMutableArray *options = [NSMutableArray arrayWithCapacity: [data count]];
//NSMutableArray *menuItems = [NSMutableArray arrayWithCapacity: [data count]];
NSInteger index = 0;
for (NSDictionary *d in data) {
SlotOption *o = [[SlotOption alloc] initWithDictionary: d];
if ([o isDefault]) {
_defaultIndex = index;
}
++index;
[options addObject: o];
}
_options = options;
//_menuItems = menuItems;
_selectedIndex = _defaultIndex;
if (_selectedIndex < 0) _selectedIndex = 0;
return self;
}
#endif
-(NSArray *)menuItems {
//if (_menuItems) return _menuItems;
@@ -406,7 +355,8 @@ static NSDictionary *IndexMap = nil;
// [menu setItemArray: ] doesn't work prior to 10.14, apparently.
[menu removeAllItems];
if (_index == kSMARTPORT_SLOT) {
if (_type == kSlotFDC) {
//[menu setItemArray: @[]];
[button setHidden: YES];
} else {
@@ -630,7 +580,7 @@ NSDictionary *BuildDevices(NSArray *array) {
NSArray *data = MapArray(slots, ^(id o){
Slot *s = [[Slot alloc] initWithDictionary: o devices: nil];
Slot *s = [[Slot alloc] initWithDictionary: o devices: nil index: 0];
return s;
});
@@ -658,9 +608,11 @@ NSArray *BuildSlots(NSString *name, NSDictionary *data) {
NSMutableArray *rv = [NSMutableArray arrayWithCapacity: [slots count]];
NSDictionary *devices = BuildDevices([data objectForKey: @"devices"]);
unsigned ix = 0;
for (NSDictionary *d in slots) {
Slot *s = [[Slot alloc] initWithDictionary: d devices: devices];
Slot *s = [[Slot alloc] initWithDictionary: d devices: devices index: ++ix];
[rv addObject: s];
}
+49 -68
View File
@@ -16,7 +16,7 @@
#import <objc/runtime.h>
#define MAX_SLOTS 32
static unsigned RootKey = 0;
@@ -31,18 +31,13 @@ static unsigned RootKey = 0;
@implementation SlotViewController {
NSArray *_root;
unsigned _slots_explicit;
unsigned _slots_valid;
unsigned _slots_default;
Slot *_slot_object[SLOT_COUNT];
NSString *_slot_value[SLOT_COUNT]; // when explicitely set.
Media _slot_media[SLOT_COUNT];
Media _slot_media[MAX_SLOTS];
Media _machine_media;
NSDictionary *_machine_data;
NSMutableDictionary *_slotValues;
IBOutlet NSPopover *_popover;
BOOL _loadingBookmark;
@@ -55,6 +50,7 @@ static unsigned RootKey = 0;
_root = @[];
objc_setAssociatedObject(_outlineView, &RootKey, _root, OBJC_ASSOCIATION_RETAIN);
_slotValues = [NSMutableDictionary new];
//[_outlineView setIndentationPerLevel: 2.0];
}
@@ -66,16 +62,13 @@ static unsigned RootKey = 0;
[_outlineView reloadData];
_slots_valid = 0;
_slots_explicit = 0;
_slots_default = 0;
[_slotValues removeAllObjects];
_machine_media = EmptyMedia;
_machine_data = nil;
for (unsigned i = 0; i < SLOT_COUNT; ++i) {
for (unsigned i = 0; i < MAX_SLOTS; ++i) {
_slot_media[i] = EmptyMedia;
_slot_object[i] = nil;
_slot_value[i] = nil;
}
[self setResolution: NSMakeSize(0, 0)];
@@ -86,10 +79,8 @@ static unsigned RootKey = 0;
-(void)loadMachine {
NSDictionary *d = MameMachine(_machine);
if (!d) {
[self resetMachine];
return;
@@ -103,39 +94,33 @@ static unsigned RootKey = 0;
}
[self setResolution: res];
_slots_valid = 0;
//_slots_explicit = 0;
_slots_default = 0;
_machine_media = MediaFromDictionary([d objectForKey: @"media"]);
_machine_data = d;
for (unsigned i = 0; i < SLOT_COUNT; ++i) {
for (unsigned i = 0; i < MAX_SLOTS; ++i) {
_slot_media[i] = EmptyMedia;
_slot_object[i] = nil;
}
_slot_value[kBIOS_SLOT] = nil; // don't copy over to other machines.
extern NSArray *BuildSlots(NSString *name, NSDictionary *data);
_root = BuildSlots(_machine, d);
objc_setAssociatedObject(_outlineView, &RootKey, _root, OBJC_ASSOCIATION_RETAIN);
for (Slot *item in _root) {
NSInteger index = [item index];
if (index < 0) continue;
unsigned mask = 1 << index;
NSString *name = [item name];
NSInteger index = [item index] - 1;
if (index < 0 || index >= MAX_SLOTS) continue;
_slots_valid |= mask;
if ([item defaultIndex] >= 0)
_slots_default |= mask;
if (_slot_value[index])
[item selectValue: _slot_value[index]];
if ([item type] == kSlotBIOS) continue;
NSString *v = [_slotValues objectForKey: name];
if (v) {
[item selectValue: v];
}
// TODO -- reset to default index???
_slot_media[index] = [item selectedMedia];
_slot_object[index] = item;
}
@@ -165,12 +150,9 @@ static unsigned RootKey = 0;
Media media = EmptyMedia;
unsigned mask = 1;
for (unsigned i = 0; i < SLOT_COUNT; ++i, mask <<= 1) {
for (unsigned i = 0; i < MAX_SLOTS; ++i) {
if (_slots_valid & mask) {
MediaAdd(&media, &_slot_media[i]);
}
MediaAdd(&media, &_slot_media[i]);
}
// machine media last.
MediaAdd(&media, &_machine_media);
@@ -196,34 +178,29 @@ static unsigned RootKey = 0;
BOOL direct = YES;
NSInteger index = [sender tag];
if (index < 0) return; //
if (index >= 0 && index < SLOT_COUNT) {
if (index < 0x10000) {
direct = YES;
} else {
direct = NO;
index &= ~0x10000;
}
if (index >= SLOT_COUNT) return; //
unsigned mask = 1 << index;
// index 0 = ram = special case...
index--;
if (index < 0 || index >= MAX_SLOTS) return; //
SlotOption *o = [[sender selectedItem] representedObject];
Slot *item = _slot_object[index];
Slot *item = [_root objectAtIndex: index];
if (direct) {
_slots_explicit |= mask;
_slot_value[index] = [o value];
//_slots_default &= ~mask;
if (direct && [item type] != kSlotBIOS) {
NSString *name = [item name];
NSString *value = [o value];
[_slotValues setObject: value forKey: name];
}
Media media = [item selectedMedia];
if (!MediaEqual(&media, &_slot_media[index])) {
_slot_media[index] = media;
[self rebuildMedia];
}
// needs to reload children if expanded.
@@ -244,9 +221,9 @@ static unsigned RootKey = 0;
#endif
NSInteger index = [sender tag];
if (index < 0 || index >= SLOT_COUNT) return;
Slot *item = _slot_object[index];
if (index <= 0 || index >= 0x10000) return;
index--;
Slot *item = [_root objectAtIndex: index];
NSArray *children = [item selectedChildren];
objc_setAssociatedObject(_childOutlineView, &RootKey, children, OBJC_ASSOCIATION_RETAIN);
@@ -266,15 +243,19 @@ static unsigned RootKey = 0;
-(IBAction)resetSlots:(id)sender {
_slots_explicit = 0;
for (unsigned i = 0; i < SLOT_COUNT; ++i) {
//_slots_explicit = 0;
for (unsigned i = 0; i < MAX_SLOTS; ++i) {
_slot_media[i] = EmptyMedia;
_slot_value[i] = nil;
}
for (Slot *item in _root) {
NSString *name = [item name];
[_slotValues removeObjectForKey: name];
[item reset];
// if children, reset them too...
NSInteger index = [item index];
NSInteger index = [item index] - 1;
if (index < 0) continue;
_slot_media[index] = [item selectedMedia];
}
@@ -367,19 +348,19 @@ static unsigned RootKey = 0;
for (Slot *item in _root) {
[item reserialize: dict];
NSInteger index = [item index];
if (index >= 0 && index < SLOT_COUNT) {
unsigned mask = 1 << index;
NSInteger index = [item index] - 1;
if (index >= 0 && index < MAX_SLOTS) {
NSString *name = [item name];
[_slotValues removeObjectForKey: name];
if ([item defaultIndex] != [item selectedIndex]) {
_slots_explicit |= mask; // grrr.
_slot_value[index] = [[item selectedItem] value];
NSString *v = [item selectedValue];
if (v) [_slotValues setObject: v forKey: name];
}
_slot_media[index] = [item selectedMedia];
}
++index;
}
// need to do it here so it propogate to media view.
+1 -1
View File
@@ -63,7 +63,7 @@ my @args;
# equal or changeable.
if (scalar @rpaths == 1) {
exit(0) if $rpaths[0] eq $path;
push(@args, ("-change_rpath", ${rpaths[0]}, $path))
push(@args, ("-change", ${rpaths[0]}, $path))
} else {
my @tmp;
+2 -1
View File
@@ -61,7 +61,7 @@ SLOTS = (
"nb1", "nb2", "nb3", "nb4", "nb5", "nb6", "nb7",
"nb8", "nb9", "nba", "nbb", "nbc", "nbd", "nbe",
"pds", "pds030",
"pds", "pds030", "lcpds",
# st
"centronics", "mdin", "mdout"
@@ -94,6 +94,7 @@ SLOT_NAMES = {
"pds": "PDS",
"pds030": "PDS",
"lcpds": "PDS",
"centronics": "Printer",
"mdin": "MIDI In",