Allow text on multiple screens in mirrored mode (finally)

amorist · Dec 6, 2019 · fbd89bf · fbd89bf
1 parent 4639132
commit fbd89bf
Show file tree

Hide file tree

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

diff --git a/Aerial/Source/Views/AerialView+Player.swift b/Aerial/Source/Views/AerialView+Player.swift
@@ -92,4 +92,19 @@ extension AerialView {
         debugLog("\(self.description) playing next video for player \(String(describing: player))")
     }
 
+    // Video fade-in/out
+    func addPlayerFades(view: AerialView, player: AVPlayer, video: AerialVideo) {
+        // We only fade in/out if we have duration
+        if video.duration > 0 && AerialView.shouldFade {
+            view.playerLayer.opacity = 0
+            let fadeAnimation = CAKeyframeAnimation(keyPath: "opacity")
+            fadeAnimation.values = [0, 1, 1, 0] as [Int]
+            fadeAnimation.keyTimes = [0, AerialView.fadeDuration/video.duration, 1-(AerialView.fadeDuration/video.duration), 1] as [NSNumber]
+            fadeAnimation.duration = video.duration
+            fadeAnimation.calculationMode = CAAnimationCalculationMode.cubic
+            view.playerLayer.add(fadeAnimation, forKey: "mainfade")
+        } else {
+            view.playerLayer.opacity = 1.0
+        }
+    }
 }