bugfix: Mic mute doesn't sync with led some time.

MSzturc · May 8, 2020 · c53ccc2 · c53ccc2
1 parent e431a23
commit c53ccc2
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 4 deletions.
diff --git a/ThinkpadAssistant.xcodeproj/project.pbxproj b/ThinkpadAssistant.xcodeproj/project.pbxproj
@@ -558,7 +558,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 1.2.2;
+				MARKETING_VERSION = 1.3.0;
 				PRODUCT_BUNDLE_IDENTIFIER = de.mszturc.ThinkpadAssistant;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -583,7 +583,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MARKETING_VERSION = 1.2.2;
+				MARKETING_VERSION = 1.3.0;
 				PRODUCT_BUNDLE_IDENTIFIER = de.mszturc.ThinkpadAssistant;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

diff --git a/ThinkpadAssistant.xcodeproj/xcuserdata/matt.xcuserdatad/xcschemes/xcschememanagement.plist b/ThinkpadAssistant.xcodeproj/xcuserdata/matt.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -7,12 +7,12 @@
 		<key>AutoLaunchHelper.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>5</integer>
+			<integer>6</integer>
 		</dict>
 		<key>ThinkpadAssistant.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>6</integer>
+			<integer>5</integer>
 		</dict>
 	</dict>
 </dict>

diff --git a/ThinkpadAssistant/MuteMicManager.swift b/ThinkpadAssistant/MuteMicManager.swift
@@ -12,6 +12,14 @@ final class MuteMicManager {
 
     private static let shared = MuteMicManager()
 
+    static func activateMicrophone(){
+        shared.activateMicrophone()
+    }
+
+    static func deactivateMicrophone(){
+        shared.deactivateMicrophone()
+    }
+
     static func toggleMute() {
         shared.toogleMute()
     }
@@ -66,6 +74,16 @@ final class MuteMicManager {
         setMute(!isMuted())
     }
 
+    func activateMicrophone(){
+        assert(isMuteSettable())
+        setMute(false)
+    }
+
+    func deactivateMicrophone(){
+        assert(isMuteSettable())
+        setMute(true)
+    }
+
     private func isMuteSettable() -> Bool {
         var isSettable: DarwinBoolean = false
         AudioObjectIsPropertySettable(currentInputDeviceID, &mutePropertyAddress, &isSettable).handleError()

diff --git a/ThinkpadAssistant/ShortcutManager.swift b/ThinkpadAssistant/ShortcutManager.swift
@@ -16,6 +16,8 @@ final class ShortcutManager {
     static let systemPrefsShortcut = MASShortcut(keyCode: kVK_F18, modifierFlags: [])
     static let launchpadShortcut = MASShortcut(keyCode: kVK_F19, modifierFlags: [])
     static let micMuteShortcut = MASShortcut(keyCode: kVK_F20, modifierFlags: [])
+    static let micMuteShortcutActivate = MASShortcut(keyCode: kVK_F20, modifierFlags: [.control])
+    static let micMuteShortcutDeactivate = MASShortcut(keyCode: kVK_F20, modifierFlags: [.command])
 
     static func register() {
         MASShortcutMonitor.shared()?.register(systemPrefsShortcut, withAction: {
@@ -36,6 +38,20 @@ final class ShortcutManager {
             }
         })
 
+        MASShortcutMonitor.shared()?.register(micMuteShortcutActivate, withAction: {
+            if(MuteMicManager.isMuted() == true){
+                HUD.showImage(Icons.unmute, status: NSLocalizedString("Microphone\nunmuted", comment: ""))
+                MuteMicManager.activateMicrophone()
+            }
+        })
+
+        MASShortcutMonitor.shared()?.register(micMuteShortcutDeactivate, withAction: {
+            if(MuteMicManager.isMuted() == false){
+                HUD.showImage(Icons.mute, status: NSLocalizedString("Microphone\nmuted", comment: ""))
+                MuteMicManager.deactivateMicrophone()
+            }
+        })
+
         MASShortcutMonitor.shared()?.register(disableWlanShortcut, withAction: {
             if(WifiManager.isPowered() == nil){
                 return