Fix SimplyCoreAudio incompatibility (MonitorControl#807)

waydabber · web-flow · commit 9792facd565f · 2021-11-21T10:24:18.000+01:00
diff --git a/MonitorControl.xcodeproj/project.pbxproj b/MonitorControl.xcodeproj/project.pbxproj
@@ -939,8 +939,8 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/rnine/SimplyCoreAudio";
 			requirement = {
-				kind = upToNextMajorVersion;
-				minimumVersion = 4.0.1;
+				kind = revision;
+				revision = 75970285e2470f12a569cdff68ef5a75498a4646;
 			};
 		};
 		6CD35F5426500008001F1344 /* XCRemoteSwiftPackageReference "MediaKeyTap" */ = {
diff --git a/MonitorControl/Info.plist b/MonitorControl/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>6965</string>
+	<string>6968</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>
diff --git a/MonitorControl/Support/AppDelegate.swift b/MonitorControl/Support/AppDelegate.swift
@@ -284,7 +284,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
   @objc func audioDeviceChanged() {
     if let defaultDevice = self.coreAudio.defaultOutputDevice {
       os_log("Default output device changed to “%{public}@”.", type: .info, defaultDevice.name)
-      os_log("Can device set its own volume? %{public}@", type: .info, defaultDevice.canSetVirtualMasterVolume(scope: .output).description)
+      os_log("Can device set its own volume? %{public}@", type: .info, defaultDevice.canSetVirtualMainVolume(scope: .output).description)
     }
     self.updateMediaKeyTap()
   }
diff --git a/MonitorControl/Support/MediaKeyTapManager.swift b/MonitorControl/Support/MediaKeyTapManager.swift
@@ -173,7 +173,7 @@ class MediaKeyTapManager: MediaKeyTapDelegate {
         if DisplayManager.shared.updateAudioControlTargetDisplays(deviceName: defaultAudioDevice.name) == 0 {
           keys.removeAll { keysToDelete.contains($0) }
         }
-      } else if defaultAudioDevice.canSetVirtualMasterVolume(scope: .output) == true {
+      } else if defaultAudioDevice.canSetVirtualMainVolume(scope: .output) == true {
         keys.removeAll { keysToDelete.contains($0) }
       }
     }
diff --git a/MonitorControlHelper/Info.plist b/MonitorControlHelper/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>6965</string>
+	<string>6968</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSBackgroundOnly</key>

Original file line number	Diff line number	Diff line change
`@@ -284,7 +284,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {`
`284`	`284`	`@objc func audioDeviceChanged() {`
`285`	`285`	`if let defaultDevice = self.coreAudio.defaultOutputDevice {`
`286`	`286`	`os_log("Default output device changed to “%{public}@”.", type: .info, defaultDevice.name)`
`287`		`- os_log("Can device set its own volume? %{public}@", type: .info, defaultDevice.canSetVirtualMasterVolume(scope: .output).description)`
	`287`	`+ os_log("Can device set its own volume? %{public}@", type: .info, defaultDevice.canSetVirtualMainVolume(scope: .output).description)`
`288`	`288`	`}`
`289`	`289`	`self.updateMediaKeyTap()`
`290`	`290`	`}`
Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ class MediaKeyTapManager: MediaKeyTapDelegate {`
`173`	`173`	`if DisplayManager.shared.updateAudioControlTargetDisplays(deviceName: defaultAudioDevice.name) == 0 {`
`174`	`174`	`keys.removeAll { keysToDelete.contains($0) }`
`175`	`175`	`}`
`176`		`- } else if defaultAudioDevice.canSetVirtualMasterVolume(scope: .output) == true {`
	`176`	`+ } else if defaultAudioDevice.canSetVirtualMainVolume(scope: .output) == true {`
`177`	`177`	`keys.removeAll { keysToDelete.contains($0) }`
`178`	`178`	`}`
`179`	`179`	`}`