fixes

Author: overtake

Telegram-Mac.xcworkspace/contents.xcworkspacedata

@@ -74,10 +74,7 @@ final class DevicesContext : NSObject {
 
     private let updaterContext: UpdaterContext = UpdaterContext()
 
-    private(set) var currentCameraId: String? = nil
-    private(set) var currentMicroId: String? = nil
-    private(set) var currentOutputId: String? = nil
-    
+   
 
     func updater() -> Signal<(camera: String?, input: String?, output: String?), NoError> {
         return Signal { subscriber in
@@ -103,6 +100,21 @@ final class DevicesContext : NSObject {
 
 
     private let disposable = MetaDisposable()
+    private let devicesQueue = Queue(name: "devicesQueue")
+    
+    private let _currentCameraId: Atomic<String?> = Atomic(value: nil)
+    private let _currentMicroId: Atomic<String?> = Atomic(value: nil)
+    private let _currentOutputId: Atomic<String?> = Atomic(value: nil)
+    
+    var currentCameraId: String? {
+        return _currentCameraId.with { $0 }
+    }
+    var currentMicroId: String? {
+        return _currentMicroId.with { $0 }
+    }
+    var currentOutputId: String? {
+        return _currentOutputId.with { $0 }
+    }
 
     init(_ accountManager: AccountManager ) {
         super.init()
@@ -119,24 +131,32 @@ final class DevicesContext : NSObject {
             self?.update()
         })
 
-        disposable.set(combineLatest(queue: .mainQueue(), voiceCallSettings(accountManager), signal).start(next: { [weak self] settings, devices in
-            guard let `self` = self else {
-                return
-            }
-            let inputUpdated = self.updateMicroId(settings, devices: devices)
-            let cameraUpdated = self.updateCameraId(settings, devices: devices)
-            let outputUpdated = self.updateOutputId(settings, devices: devices)
+        let currentCameraId = self._currentCameraId
+        let currentMicroId = self._currentMicroId
+        let currentOutputId = self._currentOutputId
+        
+        let updated = combineLatest(queue: devicesQueue, voiceCallSettings(accountManager), signal) |> map { settings, devices -> (camera: String?, input: String?, output: String?) in
+            let inputUpdated = DevicesContext.updateMicroId(settings, devices: devices)
+            let cameraUpdated = DevicesContext.updateCameraId(settings, devices: devices)
+            let outputUpdated = DevicesContext.updateOutputId(settings, devices: devices)
 
             var result:(camera: String?, input: String?, output: String?) = (camera: nil, input: nil, output: nil)
 
-            if inputUpdated {
-                result.input = self.currentMicroId ?? ""
+            if currentMicroId.swap(inputUpdated) != inputUpdated {
+                result.input = inputUpdated
             }
-            if cameraUpdated {
-                result.camera = self.currentCameraId ?? ""
+            if currentCameraId.swap(cameraUpdated) != cameraUpdated {
+                result.camera = cameraUpdated
             }
-            if outputUpdated {
-                result.output = self.currentOutputId ?? ""
+            if currentOutputId.swap(outputUpdated) != outputUpdated {
+                result.output = outputUpdated
+            }
+            return result
+        } |> deliverOnMainQueue
+        
+        disposable.set(updated.start(next: { [weak self] result in
+            guard let `self` = self else {
+                return
             }
             self.updaterContext.status = result
 
@@ -156,7 +176,7 @@ final class DevicesContext : NSObject {
         self.update()
     }
 
-    @discardableResult func updateCameraId(_ settings: VoiceCallSettings, devices: IODevices) -> Bool {
+    static func updateCameraId(_ settings: VoiceCallSettings, devices: IODevices) -> String? {
         let cameraDevice = devices.camera.first(where: { $0.uniqueID == settings.cameraInputDeviceId })
 
         let activeDevice: AVCaptureDevice?
@@ -172,13 +192,9 @@ final class DevicesContext : NSObject {
             activeDevice = devices.camera.first(where: { $0.isConnected && !$0.isSuspended })
         }
 
-        defer {
-            self.currentCameraId = activeDevice?.uniqueID
-        }
-        
-        return self.currentCameraId != activeDevice?.uniqueID
+        return activeDevice?.uniqueID
     }
-    @discardableResult func updateMicroId(_ settings: VoiceCallSettings, devices: IODevices) -> Bool {
+    static func updateMicroId(_ settings: VoiceCallSettings, devices: IODevices) -> String? {
         let audiodevice = devices.audioInput.first(where: { $0.uniqueID == settings.audioInputDeviceId })
 
         let activeDevice: AVCaptureDevice?
@@ -194,15 +210,11 @@ final class DevicesContext : NSObject {
             activeDevice = devices.audioInput.first(where: { $0.isConnected && !$0.isSuspended })
         }
 
-        defer {
-            self.currentMicroId = activeDevice?.uniqueID
-        }
-        
-        return self.currentMicroId != activeDevice?.uniqueID
+        return activeDevice?.uniqueID
     }
 
-    @discardableResult func updateOutputId(_ settings: VoiceCallSettings, devices: IODevices) -> Bool {
-        var deviceUid: String = ""
+    static func updateOutputId(_ settings: VoiceCallSettings, devices: IODevices) -> String? {
+        var deviceUid: String? = nil
         var found = false
         for id in devices.audioOutput {
             let current = Audio.getDeviceUid(deviceId: id)
@@ -215,11 +227,7 @@ final class DevicesContext : NSObject {
             deviceUid = Audio.getDeviceUid(deviceId: Audio.getDefaultOutputDevice())
         }
 
-        defer {
-            self.currentOutputId = deviceUid as String
-        }
-        
-        return self.currentOutputId != deviceUid as String
+        return deviceUid
     }
 
     deinit {

Telegram-Mac/DevicesContext.swift

@@ -36,7 +36,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>210125</string>
+	<string>210126</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.social-networking</string>
 	<key>LSFileQuarantineEnabled</key>

Telegram-Mac/Info.plist

@@ -8,7 +8,7 @@
 
 /* Begin PBXBuildFile section */
 		27200F1B257C256E00574365 /* DevicesContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27200F1A257C256E00574365 /* DevicesContext.swift */; };
-		27200F1D257C407F00574365 /* HotKey.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 273F9C0A257BC486004EC51B /* HotKey.framework */; };
+		27200F21257CCFDB00574365 /* HotKey.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 273F9C0A257BC486004EC51B /* HotKey.framework */; };
 		27A9904A257A7435009044DB /* SoundEffectPlayQueue.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27A99049257A7435009044DB /* SoundEffectPlayQueue.swift */; };
 		27A9904E257A8047009044DB /* Pop.wav in Resources */ = {isa = PBXBuildFile; fileRef = 27A9904C257A8044009044DB /* Pop.wav */; };
 		27A9904F257A8047009044DB /* Purr.wav in Resources */ = {isa = PBXBuildFile; fileRef = 27A9904D257A8046009044DB /* Purr.wav */; };
@@ -1958,7 +1958,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				27200F1D257C407F00574365 /* HotKey.framework in Frameworks */,
+				27200F21257CCFDB00574365 /* HotKey.framework in Frameworks */,
 				D00746EE2577A6BE0000DF74 /* Carbon.framework in Frameworks */,
 				D0E7BD6C256AA5570068644D /* TelegramVoip.framework in Frameworks */,
 				C22E06261D7F16C000A11C88 /* TGUIKit.framework in Frameworks */,

Telegram.xcodeproj/project.pbxproj

@@ -21,7 +21,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>7.2.4</string>
 	<key>CFBundleVersion</key>
-	<string>210125</string>
+	<string>210126</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>NSExtension</key>