Fix hideDisplayOsd lag.

reitermarkus · reitermarkus · commit 6b12e3cb6fd2 · 2019-05-10T10:35:46.000+02:00
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,4 +1,4 @@
-github "reitermarkus/DDC.swift" "a29f1975f46745580990269a3dc26873737f24bb"
+github "reitermarkus/DDC.swift" "05141d5bb5d5fd77b22701d03fbec7586aad8fd7"
 github "rnine/AMCoreAudio" "3.2.1"
 github "shpakovski/MASPreferences" "1.3"
 github "the0neyouseek/MediaKeyTap" "abfe09f53ccabb1aa14a0f4ab99cfb8812f41919"
diff --git a/MonitorControl/Display.swift b/MonitorControl/Display.swift
@@ -28,18 +28,7 @@ class Display {
     }
 
     _ = self.ddc?.write(command: .onScreenDisplay, value: 1)
-
-    DispatchQueue.global(qos: .background).asyncAfter(deadline: DispatchTime.now() + 0.000001) {
-      _ = self.ddc?.write(command: .onScreenDisplay, value: 1)
-    }
-
-    DispatchQueue.global(qos: .background).asyncAfter(deadline: DispatchTime.now() + 0.00001) {
-      _ = self.ddc?.write(command: .onScreenDisplay, value: 1)
-    }
-
-    DispatchQueue.global(qos: .background).asyncAfter(deadline: DispatchTime.now() + 0.0001) {
-      _ = self.ddc?.write(command: .onScreenDisplay, value: 1)
-    }
+    _ = self.ddc?.write(command: .onScreenDisplay, value: 1)
   }
 
   func mute() {
@@ -51,53 +40,72 @@ class Display {
       self.isMuted = true
     }
 
-    _ = self.ddc?.write(command: .audioSpeakerVolume, value: UInt8(value))
-    self.hideDisplayOsd()
+    DispatchQueue.global(qos: .userInitiated).async {
+      guard self.ddc?.write(command: .audioSpeakerVolume, value: UInt8(value)) == true else {
+        return
+      }
+
+      self.hideDisplayOsd()
+      self.showOsd(command: .audioSpeakerVolume, value: value)
+    }
 
     if let slider = volumeSliderHandler?.slider {
       slider.intValue = Int32(value)
     }
-
-    self.showOsd(command: .audioSpeakerVolume, value: value)
   }
 
   func setVolume(to value: Int) {
     if value > 0 {
       self.isMuted = false
     }
 
-    _ = self.ddc?.write(command: .audioSpeakerVolume, value: UInt8(value))
-    self.hideDisplayOsd()
+    DispatchQueue.global(qos: .userInitiated).async {
+      guard self.ddc?.write(command: .audioSpeakerVolume, value: UInt8(value)) == true else {
+        return
+      }
+
+      self.hideDisplayOsd()
+      self.showOsd(command: .audioSpeakerVolume, value: value)
+    }
 
     if let slider = volumeSliderHandler?.slider {
       slider.intValue = Int32(value)
     }
 
-    self.showOsd(command: .audioSpeakerVolume, value: value)
     self.saveValue(value, for: .audioSpeakerVolume)
   }
 
   func setBrightness(to value: Int) {
     if self.prefs.bool(forKey: Utils.PrefKeys.lowerContrast.rawValue) {
       if value == 0 {
-        _ = self.ddc?.write(command: .contrast, value: UInt8(value))
+        DispatchQueue.global(qos: .userInitiated).async {
+          _ = self.ddc?.write(command: .contrast, value: UInt8(value))
+        }
 
         if let slider = contrastSliderHandler?.slider {
           slider.intValue = Int32(value)
         }
       } else if self.prefs.integer(forKey: "\(DDC.Command.brightness.value)-\(self.identifier)") == 0 {
         let contrastValue = self.prefs.integer(forKey: "\(DDC.Command.contrast.value)-\(self.identifier)")
-        _ = self.ddc?.write(command: .contrast, value: UInt8(contrastValue))
+
+        DispatchQueue.global(qos: .userInitiated).async {
+          _ = self.ddc?.write(command: .contrast, value: UInt8(contrastValue))
+        }
       }
     }
 
-    _ = self.ddc?.write(command: .brightness, value: UInt8(value))
+    DispatchQueue.global(qos: .userInitiated).async {
+      guard self.ddc?.write(command: .brightness, value: UInt8(value)) == true else {
+        return
+      }
+
+      self.showOsd(command: .brightness, value: value)
+    }
 
     if let slider = brightnessSliderHandler?.slider {
       slider.intValue = Int32(value)
     }
 
-    self.showOsd(command: .brightness, value: value)
     self.saveValue(value, for: .brightness)
   }
 
diff --git a/MonitorControl/Info.plist b/MonitorControl/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.5.1</string>
 	<key>CFBundleVersion</key>
-	<string>289</string>
+	<string>318</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>
diff --git a/MonitorControlHelper/Info.plist b/MonitorControlHelper/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.5.1</string>
 	<key>CFBundleVersion</key>
-	<string>289</string>
+	<string>318</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSBackgroundOnly</key>
