From a065cd75be03cfdc19660ee3968ec6af783642c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Wei=C3=9F?= Date: Wed, 6 Jan 2021 14:05:06 +0100 Subject: [PATCH 1/6] Actually fix LSMinimumSystemVersion in Info.plist. --- Info.plist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Info.plist b/Info.plist index 152757515..4eb243dd8 100644 --- a/Info.plist +++ b/Info.plist @@ -1017,7 +1017,7 @@ LSApplicationCategoryType public.app-category.music LSMinimumSystemVersion - 10.13.0 + $(MACOSX_DEPLOYMENT_TARGET) NSAppTransportSecurity NSAllowsArbitraryLoads -- 2.45.2 From 10a76e3b39a8d1a876af89d8bb5c87d3a99a0e78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Wei=C3=9F?= Date: Wed, 6 Jan 2021 14:05:34 +0100 Subject: [PATCH 2/6] Info.plist touched by Xcode. --- Info.plist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Info.plist b/Info.plist index 4eb243dd8..b3c737e60 100644 --- a/Info.plist +++ b/Info.plist @@ -649,7 +649,7 @@ CFBundleTypeIconFile ape.icns CFBundleTypeName - Monkey's Audio File + Monkey's Audio File CFBundleTypeRole Viewer LSTypeIsPackage -- 2.45.2 From 6a4243128ea920f05297f2926e95191ed0f69759 Mon Sep 17 00:00:00 2001 From: Dzmitry Neviadomski Date: Thu, 7 Jan 2021 00:49:14 +0300 Subject: [PATCH 3/6] Update Toolbar items visibility. Use backported NSSearchToolbarItem to support collapsed state. Give more priority to Playback controls. Fix sizing of Playback Slider. --- Base.lproj/MainMenu.xib | 6 +++--- Cog.xcodeproj/project.pbxproj | 6 +++++- PositionSliderToolbarItem.swift | 17 +++++++++++++++++ 3 files changed, 25 insertions(+), 4 deletions(-) create mode 100644 PositionSliderToolbarItem.swift diff --git a/Base.lproj/MainMenu.xib b/Base.lproj/MainMenu.xib index 5d849c867..0a13fd58b 100644 --- a/Base.lproj/MainMenu.xib +++ b/Base.lproj/MainMenu.xib @@ -342,7 +342,7 @@ - + @@ -363,7 +363,7 @@ - + @@ -413,7 +413,7 @@ - + diff --git a/Cog.xcodeproj/project.pbxproj b/Cog.xcodeproj/project.pbxproj index 11e521016..a40f17024 100644 --- a/Cog.xcodeproj/project.pbxproj +++ b/Cog.xcodeproj/project.pbxproj @@ -207,6 +207,7 @@ 8E9A30160BA792DC0091081B /* NSFileHandle+CreateFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E9A30140BA792DC0091081B /* NSFileHandle+CreateFile.m */; }; 99EAACA80DD1BB7A00423C38 /* APL.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 566D321B0D538550004466A5 /* APL.bundle */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; B09E96630D74A7BC0064F138 /* stop_current.png in Resources */ = {isa = PBXBuildFile; fileRef = B09E96620D74A7BC0064F138 /* stop_current.png */; }; + EDAAA41F25A665C000731773 /* PositionSliderToolbarItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = EDAAA41E25A665C000731773 /* PositionSliderToolbarItem.swift */; }; F6F96719102C709000D2C9B4 /* NSString+FinderCompare.m in Sources */ = {isa = PBXBuildFile; fileRef = F6F96718102C709000D2C9B4 /* NSString+FinderCompare.m */; }; /* End PBXBuildFile section */ @@ -980,6 +981,7 @@ 8E9A30140BA792DC0091081B /* NSFileHandle+CreateFile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSFileHandle+CreateFile.m"; sourceTree = ""; }; B09E94300D747F7B0064F138 /* FFMPEG.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = FFMPEG.xcodeproj; path = Plugins/FFMPEG/FFMPEG.xcodeproj; sourceTree = ""; }; B09E96620D74A7BC0064F138 /* stop_current.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = stop_current.png; path = Images/stop_current.png; sourceTree = ""; }; + EDAAA41E25A665C000731773 /* PositionSliderToolbarItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PositionSliderToolbarItem.swift; sourceTree = ""; }; F6F96718102C709000D2C9B4 /* NSString+FinderCompare.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+FinderCompare.m"; sourceTree = ""; }; F6F9671A102C70C800D2C9B4 /* NSString+FinderCompare.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+FinderCompare.h"; sourceTree = ""; }; /* End PBXFileReference section */ @@ -1377,6 +1379,7 @@ 17E0D5E60F520F02005B6FED /* PositionSlider.m */, 17E0D5E70F520F02005B6FED /* TimeField.h */, 17E0D5E80F520F02005B6FED /* TimeField.m */, + EDAAA41E25A665C000731773 /* PositionSliderToolbarItem.swift */, ); name = Window; sourceTree = ""; @@ -1851,7 +1854,7 @@ LastUpgradeCheck = 1100; TargetAttributes = { 8D1107260486CEB800E47090 = { - DevelopmentTeam = ""; + DevelopmentTeam = RXH4D9SUXM; LastSwiftMigration = 1220; ProvisioningStyle = Automatic; }; @@ -2340,6 +2343,7 @@ 1755E1F90BA0D2B600CA3560 /* PlaylistLoader.m in Sources */, 8E9A30160BA792DC0091081B /* NSFileHandle+CreateFile.m in Sources */, 179790E10C087AB7001D6996 /* OpenURLPanel.m in Sources */, + EDAAA41F25A665C000731773 /* PositionSliderToolbarItem.swift in Sources */, 83790D501809F4980073CF51 /* NSObject+SPInvocationGrabbing.m in Sources */, 1791FF900CB43A2C0070BC5C /* MediaKeysApplication.m in Sources */, 838491211807F38A00E7332D /* NowPlayingBarView.m in Sources */, diff --git a/PositionSliderToolbarItem.swift b/PositionSliderToolbarItem.swift new file mode 100644 index 000000000..8c079e9ef --- /dev/null +++ b/PositionSliderToolbarItem.swift @@ -0,0 +1,17 @@ +// +// PositionSliderToolbarItem.swift +// Cog +// +// Created by Dzmitry Neviadomski on 7.01.21. +// + +import Cocoa + +class PositionSliderToolbarItem: NSToolbarItem { + override var minSize: NSSize{ + get { + return NSSize(width: 100, height: 28) + } + set {} + } +} -- 2.45.2 From f5039631845bea2ef3a97075f4c614c07988b602 Mon Sep 17 00:00:00 2001 From: Dzmitry Neviadomski Date: Thu, 7 Jan 2021 01:18:40 +0300 Subject: [PATCH 4/6] Updated Ogg and Vorbis targets Base SDK. Targets: - libogg (static) - libvorbis (static) - libvorbisenc (static) - libvorbisfile (static) --- Frameworks/Ogg/macosx/Ogg.xcodeproj/project.pbxproj | 2 ++ Frameworks/Vorbis/macosx/Vorbis.xcodeproj/project.pbxproj | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/Frameworks/Ogg/macosx/Ogg.xcodeproj/project.pbxproj b/Frameworks/Ogg/macosx/Ogg.xcodeproj/project.pbxproj index c6c52aad5..71d1aad85 100644 --- a/Frameworks/Ogg/macosx/Ogg.xcodeproj/project.pbxproj +++ b/Frameworks/Ogg/macosx/Ogg.xcodeproj/project.pbxproj @@ -402,6 +402,7 @@ GCC_GENERATE_DEBUGGING_SYMBOLS = YES; INSTALL_PATH = /usr/local/lib; PRODUCT_NAME = ogg; + SDKROOT = macosx; ZERO_LINK = YES; }; name = Debug; @@ -414,6 +415,7 @@ GCC_GENERATE_DEBUGGING_SYMBOLS = NO; INSTALL_PATH = /usr/local/lib; PRODUCT_NAME = ogg; + SDKROOT = macosx; ZERO_LINK = NO; }; name = Release; diff --git a/Frameworks/Vorbis/macosx/Vorbis.xcodeproj/project.pbxproj b/Frameworks/Vorbis/macosx/Vorbis.xcodeproj/project.pbxproj index b326b3e3d..0ddfd6b0e 100644 --- a/Frameworks/Vorbis/macosx/Vorbis.xcodeproj/project.pbxproj +++ b/Frameworks/Vorbis/macosx/Vorbis.xcodeproj/project.pbxproj @@ -920,6 +920,7 @@ ); INSTALL_PATH = /usr/local/lib; PRODUCT_NAME = vorbis; + SDKROOT = macosx; ZERO_LINK = YES; }; name = Debug; @@ -936,6 +937,7 @@ ); INSTALL_PATH = /usr/local/lib; PRODUCT_NAME = vorbis; + SDKROOT = macosx; ZERO_LINK = NO; }; name = Release; @@ -955,6 +957,7 @@ ); INSTALL_PATH = /usr/local/lib; PRODUCT_NAME = vorbisenc; + SDKROOT = macosx; ZERO_LINK = YES; }; name = Debug; @@ -972,6 +975,7 @@ ); INSTALL_PATH = /usr/local/lib; PRODUCT_NAME = vorbisenc; + SDKROOT = macosx; ZERO_LINK = NO; }; name = Release; @@ -990,6 +994,7 @@ ); INSTALL_PATH = /usr/local/lib; PRODUCT_NAME = vorbisfile; + SDKROOT = macosx; ZERO_LINK = YES; }; name = Debug; @@ -1006,6 +1011,7 @@ ); INSTALL_PATH = /usr/local/lib; PRODUCT_NAME = vorbisfile; + SDKROOT = macosx; ZERO_LINK = NO; }; name = Release; -- 2.45.2 From a5f0ee7d689ac59cacb0d0d80b478d65ced3baf1 Mon Sep 17 00:00:00 2001 From: Christopher Snowhill Date: Wed, 6 Jan 2021 14:39:03 -0800 Subject: [PATCH 5/6] Remove developer team --- Cog.xcodeproj/project.pbxproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cog.xcodeproj/project.pbxproj b/Cog.xcodeproj/project.pbxproj index a40f17024..98a93de37 100644 --- a/Cog.xcodeproj/project.pbxproj +++ b/Cog.xcodeproj/project.pbxproj @@ -1854,7 +1854,7 @@ LastUpgradeCheck = 1100; TargetAttributes = { 8D1107260486CEB800E47090 = { - DevelopmentTeam = RXH4D9SUXM; + DevelopmentTeam = ""; LastSwiftMigration = 1220; ProvisioningStyle = Automatic; }; -- 2.45.2 From c192fb5c411a0b67c1ebc40dbf6e09b3ebab8a9e Mon Sep 17 00:00:00 2001 From: Dzmitry Neviadomski Date: Thu, 7 Jan 2021 01:40:49 +0300 Subject: [PATCH 6/6] Fix crash when Quitting without active track set. --- Application/PlaybackEventController.m | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Application/PlaybackEventController.m b/Application/PlaybackEventController.m index 26819f3fd..64f02741e 100644 --- a/Application/PlaybackEventController.m +++ b/Application/PlaybackEventController.m @@ -108,6 +108,8 @@ didReceiveNotificationResponse:(UNNotificationResponse *)response - (NSDictionary *)fillNotificationDictionary:(PlaylistEntry *)pe status:(TrackStatus)status { NSMutableDictionary *dict = [NSMutableDictionary dictionary]; + if (pe == nil) + return dict; [dict setObject:[[pe URL] absoluteString] forKey:TrackPath]; if ([pe title]) [dict setObject:[pe title] forKey:TrackTitle]; -- 2.45.2