Latest mac manifest

JohnCoates · Sep 23, 2023 · 010869b · 010869b
1 parent 72193db
commit 010869b
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 47 deletions.
diff --git a/Aerial.xcodeproj/project.pbxproj b/Aerial.xcodeproj/project.pbxproj
@@ -3241,15 +3241,15 @@
 				CODE_SIGN_IDENTITY = "Developer ID Application";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 3.2.7beta9;
+				CURRENT_PROJECT_VERSION = 3.2.7beta10;
 				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.13;
-				MARKETING_VERSION = 3.2.7beta9;
+				MARKETING_VERSION = 3.2.7beta10;
 				PRODUCT_BUNDLE_IDENTIFIER = com.johncoates.Aerial;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -3270,15 +3270,15 @@
 				CODE_SIGN_IDENTITY = "Developer ID Application";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 3.2.7beta9;
+				CURRENT_PROJECT_VERSION = 3.2.7beta10;
 				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.13;
-				MARKETING_VERSION = 3.2.7beta9;
+				MARKETING_VERSION = 3.2.7beta10;
 				OTHER_CODE_SIGN_FLAGS = "--timestamp";
 				PRODUCT_BUNDLE_IDENTIFIER = com.johncoates.Aerial;
 				PRODUCT_NAME = "$(TARGET_NAME)";

diff --git a/Aerial/Source/Models/Downloads/DownloadManager.swift b/Aerial/Source/Models/Downloads/DownloadManager.swift
@@ -178,7 +178,7 @@ extension DownloadOperation: URLSessionTaskDelegate {
         } else if folder == "tvOS 12" {
             FileHelpers.unTar(file: destinationDirectory.appending("/resources.tar"), atPath: destinationDirectory)
         } else if folder == "macOS 14" {
-            FileHelpers.unTar(file: destinationDirectory.appending("/resources-14-0-9.tar"), atPath: destinationDirectory)
+            FileHelpers.unTar(file: destinationDirectory.appending("/resources-14-0-10.tar"), atPath: destinationDirectory)
         }
 
         debugLog("Finished downloading \(task.originalRequest!.url!.absoluteString)")

diff --git a/Aerial/Source/Models/Sources/SourceList.swift b/Aerial/Source/Models/Sources/SourceList.swift
@@ -18,7 +18,7 @@ struct SourceList {
     // This is the current one until next fall
     static let macOS14 = Source(name: "macOS 14",
                         description: "High framerate videos from macOS 14 Sonoma",
-                        manifestUrl: "https://sylvan.apple.com/itunes-assets/Aerials126/v4/82/2e/34/822e344c-f5d2-878c-3d56-508d5b09ed61/resources-14-0-9.tar",
+                        manifestUrl: "https://sylvan.apple.com/itunes-assets/Aerials126/v4/82/2e/34/822e344c-f5d2-878c-3d56-508d5b09ed61/resources-14-0-10.tar",
                         type: .macOS,
                         scenes: [.nature, .city, .space, .sea],
                         isCachable: true,

diff --git a/Aerial/Source/Models/Sources/VideoList.swift b/Aerial/Source/Models/Sources/VideoList.swift
@@ -34,6 +34,7 @@ class VideoList {
     var playlistRestrictedTo = ""
     var playlistHasVerticalVideos = false
     var playlist = [AerialVideo]()
+    var playlistForScreen: [String:[AerialVideo]] = [:]
     var lastPluckedFromPlaylist: AerialVideo?
 
     let cacheDownloaded = "Downloaded"

diff --git a/Resources/MainUI/PanelWindowController.xib b/Resources/MainUI/PanelWindowController.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21225" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22154" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21225"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22154"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>