Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
waydabber merged 22 commits into from
Oct 7, 2021
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
65503d9
Change icon order
waydabber Oct 4, 2021
b3c22e5
Added option for minimum brightness, fixed text for external display …
waydabber Oct 4, 2021
10521b8
Fix cumulative darkening issue upon toggling Disable dimming as fallb…
waydabber Oct 4, 2021
6ed09c9
Further improvement.
waydabber Oct 4, 2021
4083388
New 'Avoid gammatable manipulation' option for coexistence with f.lux…
waydabber Oct 4, 2021
aa1294f
Merge branch 'master' into fix/betaissues
waydabber Oct 4, 2021
a29008e
Fix some translation errors
waydabber Oct 4, 2021
d081933
Fix signing
waydabber Oct 4, 2021
04e0a9e
Make sure that key repeat speed for custom shortcuts do not go below …
waydabber Oct 5, 2021
9f3cc5c
Reorganized PrefKey list to be less confusing.
waydabber Oct 5, 2021
5428045
Disengage custom shortcut keyboard after 100 key repeat to prevent po…
waydabber Oct 5, 2021
80b0a14
Don't relinquish control over brightness keys with no external displa…
waydabber Oct 5, 2021
04c8339
Register DDC command touched status. When write on startup enabled, a…
waydabber Oct 5, 2021
d0692d1
Merge branch 'master' into fix/betaissues
waydabber Oct 5, 2021
2b22c4d
Fixed custom shortcut keys going berserk when menu is opened during a…
waydabber Oct 5, 2021
45d4752
Refactoring + avoid creating multiple AVAudioPlayer on multi monitor …
waydabber Oct 5, 2021
43f6786
Updated screenshot
waydabber Oct 6, 2021
ddc0ee4
Fixed audio not disengaging when audio device is not controllable but…
waydabber Oct 7, 2021
8df0c43
Merge remote-tracking branch 'refs/remotes/origin/fix/betaissues'
waydabber Oct 7, 2021
48efdb4
Fix conflict
waydabber Oct 7, 2021
ede1cb4
Merge remote-tracking branch 'refs/remotes/origin/master'
waydabber Oct 7, 2021
8464d9f
Fix conflict
waydabber Oct 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion MonitorControl/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion MonitorControl/Support/MediaKeyTapManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion MonitorControlHelper/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down