Merge branch 'maddsV2' into bigUpdate

Boxer/Application Delegate/BXSampleGamesCopy.m

@@ -7,7 +7,7 @@
 
 
 #import "BXSampleGamesCopy.h"
-#import "BXCoverArt.h"
+#import "Boxer-Swift.h"
 
 @implementation BXSampleGamesCopy
 
@@ -58,9 +58,9 @@ - (void) main
                 NSImage *image = [[NSImage alloc] initWithContentsOfURL: iconURL];
                 if (image)
                 {
-                    NSImage *iconForGame = [BXCoverArt coverArtWithImage: image];
+                    NSImage *iconForGame = [CoverArt coverArtWithImage: image];
 
-                    [[NSWorkspace sharedWorkspace] setIcon: iconForGame forFile: destinationURL.path options: 0];
+                    [[NSWorkspace sharedWorkspace] setIcon: iconForGame forFile: destinationURL.path options: NSExcludeQuickDrawElementsIconCreationOption];
                 }
             }
         }

Boxer/BXBezelController.m

@@ -48,20 +48,29 @@ @implementation BXBezelController
 
 + (NSImage *) bezelIconForDrive: (BXDrive *)drive
 {
-    NSString *iconName;
+    NSImage *icon;
     switch (drive.type)
     {
         case BXDriveCDROM:
-            iconName = @"CDROMTemplate";
+            if (@available(macOS 13.0, *)) {
+                icon = [NSImage imageWithSystemSymbolName: @"opticaldisc.fill" accessibilityDescription: nil];
+            } else {
+                icon = [NSImage imageNamed: @"CDROMTemplate"];
+            }
             break;
         case BXDriveFloppyDisk:
-            iconName = @"DisketteTemplate";
+            icon = [NSImage imageNamed: @"DisketteTemplate"];
             break;
         default:
-            iconName = @"HardDiskTemplate";
+            if (@available(macOS 11.0, *)) {
+                icon = [NSImage imageWithSystemSymbolName: @"internaldrive.fill" accessibilityDescription: nil];
+            } else {
+                icon = [NSImage imageNamed: @"HardDiskTemplate"];
+            }
+            break;
     }
 
-    return [NSImage imageNamed: iconName];
+    return icon;
 }
 
 + (id) controller

Boxer/BXBinCueImageImport.m

@@ -24,9 +24,9 @@ typedef NS_ENUM(NSInteger, BXDADiskOperationStatus)
 	BXDADiskOperationSucceeded = 1
 };
 
-BOOL _mountSynchronously(DASessionRef, DADiskRef disk, CFURLRef path, DADiskUnmountOptions options);
-BOOL _unmountSynchronously(DASessionRef session, DADiskRef disk, DADiskMountOptions options);
-void _mountCallback(DADiskRef disk, DADissenterRef dissenter, void *status);
+static BOOL _mountSynchronously(DASessionRef, DADiskRef disk, CFURLRef path, DADiskUnmountOptions options);
+static BOOL _unmountSynchronously(DASessionRef session, DADiskRef disk, DADiskMountOptions options);
+static void _mountCallback(DADiskRef disk, DADissenterRef dissenter, void *status);
 
 #pragma mark -
 #pragma mark Implementation

Boxer/BXBootlegCoverArt.h

@@ -8,6 +8,8 @@
 
 #import <Cocoa/Cocoa.h>
 
+NS_ASSUME_NONNULL_BEGIN
+
 /// BXBootlegCoverArt is similar to BXCoverArt, but creates generic cover art based on a title string
 /// rather than a box image. Implementing classes create artwork to resemble bootleg floppy disks and
 /// CD-ROM jewel-cases.
@@ -22,8 +24,8 @@
 /// Draws the source image as cover art into the specified frame in the current graphics context.
 - (void) drawInRect: (NSRect)frame;
 
-/// Returns a cover art image representation from the instance's title rendered at the specified size.
-- (NSImageRep *) representationForSize: (NSSize)iconSize;
+/// Returns a cover art image representation from the instance's title rendered at the specified size and scale.
+- (NSImageRep *) representationForSize: (NSSize)iconSize scale: (CGFloat)scale;
 
 /// Returns a cover art image rendered from the instance's title, suitable for use as an OS X icon.
 - (NSImage *) coverArt;
@@ -33,41 +35,4 @@
 
 @end
 
-
-@interface BXJewelCase : NSObject <BXBootlegCoverArt>
-
-/// The game title to display on this cover art.
-@property (copy, nonatomic) NSString *title;
-
-/// Returns the font family name used for printing the title.
-@property (class, readonly, copy) NSString *fontName;
-
-/// Returns the color used for printing the title.
-@property (class, readonly, copy) NSColor *textColor;
-
-/// Returns the line height used for printing the title.
-+ (CGFloat) lineHeightForSize:	(NSSize)size;
-/// Returns the font size used for printing the title.
-+ (CGFloat) fontSizeForSize:	(NSSize)size;
-
-/// Returns a dictionary of \c NSAttributedString text attributes used for printing the title.
-/// This is a collection of the return values of the methods above.
-+ (NSDictionary<NSAttributedStringKey,id> *) textAttributesForSize: (NSSize)size;
-
-/// Returns the image to render underneath the text.
-+ (NSImage *) baseLayerForSize: (NSSize)size;
-
-/// Returns the image to render over the top of the text.
-+ (NSImage *) topLayerForSize: (NSSize)size;
-
-/// Returns the region of the image in which to print the text.
-/// Will be \c NSZeroRect if text should not be printed at this size.
-+ (NSRect) textRegionForRect: (NSRect)rect;
-
-@end
-
-@interface BX35Diskette : BXJewelCase
-@end
-
-@interface BX525Diskette : BXJewelCase
-@end
+NS_ASSUME_NONNULL_END