Fix volume control issue when only internal display is present (MonitorControl#680)

waydabber · web-flow · commit 8a10fcdd3159 · 2021-10-07T18:04:48.000+02:00
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>6440</string>
+	<string>6443</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>
diff --git a/MonitorControl/Support/MediaKeyTapManager.swift b/MonitorControl/Support/MediaKeyTapManager.swift
@@ -173,7 +173,7 @@ class MediaKeyTapManager: MediaKeyTapDelegate {
       keys.removeAll { keysToDelete.contains($0) }
     }
     // Remove volume related keys if audio device is controllable
-    if !isInternalDisplayOnly, let defaultAudioDevice = app.coreAudio.defaultOutputDevice {
+    if let defaultAudioDevice = app.coreAudio.defaultOutputDevice {
       let keysToDelete: [MediaKey] = [.volumeUp, .volumeDown, .mute]
       if !prefs.bool(forKey: PrefKey.allScreensVolume.rawValue), prefs.bool(forKey: PrefKey.useAudioDeviceNameMatching.rawValue) {
         if DisplayManager.shared.updateAudioControlTargetDisplays(deviceName: defaultAudioDevice.name) == 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>6440</string>
+	<string>6443</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSBackgroundOnly</key>

Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ class MediaKeyTapManager: MediaKeyTapDelegate {`
`173`	`173`	`keys.removeAll { keysToDelete.contains($0) }`
`174`	`174`	`}`
`175`	`175`	`// Remove volume related keys if audio device is controllable`
`176`		`- if !isInternalDisplayOnly, let defaultAudioDevice = app.coreAudio.defaultOutputDevice {`
	`176`	`+ if let defaultAudioDevice = app.coreAudio.defaultOutputDevice {`
`177`	`177`	`let keysToDelete: [MediaKey] = [.volumeUp, .volumeDown, .mute]`
`178`	`178`	`if !prefs.bool(forKey: PrefKey.allScreensVolume.rawValue), prefs.bool(forKey: PrefKey.useAudioDeviceNameMatching.rawValue) {`
`179`	`179`	`if DisplayManager.shared.updateAudioControlTargetDisplays(deviceName: defaultAudioDevice.name) == 0 {`