Merge pull request #403 from ToddLa/mame-244

Update to MAME 244
yoshisuga · May 29, 2022 · 6216c92 · 6216c92
2 parents 20284b6 + a14f813
commit 6216c92
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 12 deletions.
diff --git a/WHATSNEW.md b/WHATSNEW.md
@@ -1,5 +1,5 @@
 # Version 2022.2
-* Updated to [MAME 243](https://www.mamedev.org/releases/whatsnew_0243.txt).
+* Updated to [MAME 244](https://www.mamedev.org/releases/whatsnew_0244.txt).
 * hi-res font for `MAME` Config Menu.
 * use the entire screen (ignore safe area) if `Keep Aspect Ratio` is `OFF`
 * better touch mouse support, tap is LEFT button, two finger tap is RIGHT button.

diff --git a/iOS-res/hash.zip b/iOS-res/hash.zip
diff --git a/iOS-res/plugins.zip b/iOS-res/plugins.zip
diff --git a/xcode/MAME4iOS/GameInfoController.swift b/xcode/MAME4iOS/GameInfoController.swift
@@ -122,8 +122,8 @@ public class ScaleAspectFitImageView : UIImageView {
     override func viewDidLoad() {
         super.viewDidLoad()
         #if os(iOS)
-            view.backgroundColor = UIColor.systemBackground
-            navigationItem.rightBarButtonItem = UIBarButtonItem(barButtonSystemItem:.done, target:self, action:#selector(done))
+        view.backgroundColor = UIColor.systemBackground
+        navigationItem.rightBarButtonItem = UIBarButtonItem(barButtonSystemItem:.done, target:self, action:#selector(done))
         #else
         scrollView.panGestureRecognizer.allowedTouchTypes = [NSNumber(value: UITouch.TouchType.indirect.rawValue)]
         view.backgroundColor = UIColor.black
@@ -132,11 +132,7 @@ public class ScaleAspectFitImageView : UIImageView {
         scrollView.addSubview(contentView)
         imageView.contentMode = .scaleAspectFit
         contentView.addSubview(imageView)
-        #if os(tvOS)
-        label.backgroundColor = UIColor.black
-        #else
-        label.backgroundColor = .init(white: 0.111, alpha: 1.0)
-        #endif
+        label.backgroundColor = view.backgroundColor
 
         label.numberOfLines = 0
         label.lineBreakMode = .byWordWrapping
@@ -214,7 +210,7 @@ private extension GameInfoController {
 
         let text = NSMutableAttributedString()
 
-        var keyWidth = 0.0
+        var keyWidth = CGFloat.zero
         let keys = (game.allKeys as? [String]) ?? []
         for key in keys.sorted(by:<) {
             guard var val = game[key] as? String, !val.isEmpty else { continue }

diff --git a/xcode/MAME4iOS/MAME4iOS.xcconfig b/xcode/MAME4iOS/MAME4iOS.xcconfig
@@ -17,8 +17,8 @@
 
 ORG_IDENTIFIER          = com.example   // CHANGE this to your Organization Identifier.
 DEVELOPMENT_TEAM        = ABC8675309    // CHANGE this to your Team ID. (or select in Xcode project editor)
-CURRENT_PROJECT_VERSION = 2022.1
-MARKETING_VERSION       = 2022.1
+CURRENT_PROJECT_VERSION = 2022.2
+MARKETING_VERSION       = 2022.2
 
 // 2. enable or disable entitlements
 //    tvOS TopShelf and iCloud import/export require special app entitlements

diff --git a/xcode/MAME4iOS/MAME4iOS.xcodeproj/project.pbxproj b/xcode/MAME4iOS/MAME4iOS.xcodeproj/project.pbxproj
@@ -683,6 +683,7 @@
 				CEE680B41635BB4900051BC2 /* EmulatorController.h */,
 				CEE680B51635BB4900051BC2 /* EmulatorController.m */,
 				EF31447B27BB1E81002C3C6A /* ControllerButtonPress.swift */,
+				928F7B2C27D5F18E00377C40 /* CommandLineArgsHelper.swift */,
 				CE8D87DF16541AC400685BC4 /* Globals.h */,
 				CE8D87DB1653121100685BC4 /* KeyboardView.h */,
 				CE8D87DC1653121200685BC4 /* KeyboardView.m */,
@@ -699,7 +700,6 @@
 				EF286D32253CA930007DA6D3 /* CloudSync.h */,
 				EF286D33253CA930007DA6D3 /* CloudSync.m */,
 				CEBFBC0E163C5BD300A05CD0 /* resources */,
-				928F7B2C27D5F18E00377C40 /* CommandLineArgsHelper.swift */,
 			);
 			name = RELOADED;
 			sourceTree = "<group>";