3.0.5

JohnCoates · Feb 8, 2022 · 7630d7e · 7630d7e
1 parent 91cac6d
commit 7630d7e
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 16 deletions.
diff --git a/Aerial.xcodeproj/project.pbxproj b/Aerial.xcodeproj/project.pbxproj
@@ -3190,15 +3190,15 @@
 				CODE_SIGN_IDENTITY = "Developer ID Application: Guillaume Louel (3L54M5L5KK)";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 3.0.3;
+				CURRENT_PROJECT_VERSION = 3.0.5;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 3L54M5L5KK;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = "$(SRCROOT)/Resources/Old stuff/Info.plist";
 				INSTALL_PATH = "$(HOME)/Library/Screen Savers";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.12;
-				MARKETING_VERSION = 3.0.3;
+				MARKETING_VERSION = 3.0.5;
 				PRODUCT_BUNDLE_IDENTIFIER = com.johncoates.Aerial;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -3218,15 +3218,15 @@
 				CODE_SIGN_IDENTITY = "Developer ID Application: Guillaume Louel (3L54M5L5KK)";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 3.0.3;
+				CURRENT_PROJECT_VERSION = 3.0.5;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 3L54M5L5KK;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = "$(SRCROOT)/Resources/Old stuff/Info.plist";
 				INSTALL_PATH = "$(HOME)/Library/Screen Savers";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.12;
-				MARKETING_VERSION = 3.0.3;
+				MARKETING_VERSION = 3.0.5;
 				OTHER_CODE_SIGN_FLAGS = "--timestamp";
 				PRODUCT_BUNDLE_IDENTIFIER = com.johncoates.Aerial;
 				PRODUCT_NAME = "$(TARGET_NAME)";

diff --git a/Aerial/Source/Models/Hardware/HardwareDetection.swift b/Aerial/Source/Models/Hardware/HardwareDetection.swift
@@ -137,19 +137,23 @@ final class HardwareDetection: NSObject {
     }
 
     func isAppleSilicon() -> Bool {
-        var systeminfo = utsname()
-        uname(&systeminfo)
-        let machine = withUnsafeBytes(of: &systeminfo.machine) {bufPtr->String in
-            let data = Data(bufPtr)
-            if let lastIndex = data.lastIndex(where: {$0 != 0}) {
-                return String(data: data[0...lastIndex], encoding: .isoLatin1)!
-            } else {
-                return String(data: data, encoding: .isoLatin1)!
+        if #available(macOS 12, *) {
+            var systeminfo = utsname()
+            uname(&systeminfo)
+            let machine = withUnsafeBytes(of: &systeminfo.machine) {bufPtr->String in
+                let data = Data(bufPtr)
+                if let lastIndex = data.lastIndex(where: {$0 != 0}) {
+                    return String(data: data[0...lastIndex], encoding: .isoLatin1)!
+                } else {
+                    return String(data: data, encoding: .isoLatin1)!
+                }
             }
+
+            debugLog(machine)
+            return machine != "x86_64"
+        } else {
+            return false
         }
-
-        debugLog(machine)
-        return machine != "x86_64"
     }
 
 }
diff --git a/Aerial/Source/Views/AerialView+Player.swift b/Aerial/Source/Views/AerialView+Player.swift
@@ -122,6 +122,11 @@ extension AerialView {
         }
     }
 
+    func removePlayerFades() {
+        self.playerLayer.removeAllAnimations()
+        self.playerLayer.opacity = 1.0
+    }
+
     // This works pre Catalina as of right now
     func setupGlitchWorkaroundLayer(layer: CALayer) {
         debugLog("Using dot workaround for video driver corruption")

diff --git a/Aerial/Source/Views/AerialView.swift b/Aerial/Source/Views/AerialView.swift
@@ -468,7 +468,7 @@ final class AerialView: ScreenSaverView, CAAnimationDelegate {
         } else {
             player?.pause()
         }
-        clearAllLayerAnimations()
+        removePlayerFades()
     }
 
     @objc func nextVideo() {