Add multimonitor support

[rbdr/captura] / Captura / CapturaApp.swift

diff --git a/Captura/CapturaApp.swift b/Captura/CapturaApp.swift
index d954b9f800e969554ae4bcc478e270f11759c4fb..00c5cc422f0e3728f24951a411c24c67ca1b9be5 100644 (file)
--- a/Captura/CapturaApp.swift
+++ b/Captura/CapturaApp.swift
@@ -1,5 +1,4 @@
 import SwiftUI
 import SwiftUI

-import SwiftData

 import Cocoa
 import Combine
 import AVFoundation
 import Cocoa
 import Combine
 import AVFoundation


@@ -108,7 +107,9 @@ struct CapturaApp: App {
         if let action = CapturaURLDecoder.decodeParams(url: url) {
           switch action {
             case let .configure(config):
         if let action = CapturaURLDecoder.decodeParams(url: url) {
           switch action {
             case let .configure(config):

-              CapturaSettings.apply(config)
+            NotificationCenter.default.post(name: .setConfiguration, object: nil, userInfo: [
+              "config": config
+            ])

             case let .record(config):
             NotificationCenter.default.post(name: .setCaptureSessionConfiguration, object: nil, userInfo: [
               "config": config
             case let .record(config):
             NotificationCenter.default.post(name: .setCaptureSessionConfiguration, object: nil, userInfo: [
               "config": config


@@ -131,9 +132,14 @@ struct CapturaApp: App {
   
   func menuWillOpen(_ menu: NSMenu) {
     if captureState != .idle {
   
   func menuWillOpen(_ menu: NSMenu) {
     if captureState != .idle {

-      menu.cancelTracking()
+      menu.cancelTrackingWithoutAnimation()
+      if captureState == .selectingArea {
+        NotificationCenter.default.post(name: .startRecording, object: nil, userInfo: nil)
+        return
+      }

       if captureState == .recording {
         NotificationCenter.default.post(name: .stopRecording, object: nil, userInfo: nil)
       if captureState == .recording {
         NotificationCenter.default.post(name: .stopRecording, object: nil, userInfo: nil)

+        return

       }
     }
   }
       }
     }
   }


@@ -200,8 +206,16 @@ struct CapturaApp: App {
       if let frame = notification.userInfo?["frame"] {
         receivedFrame(frame as! CVImageBuffer)
       }
       if let frame = notification.userInfo?["frame"] {
         receivedFrame(frame as! CVImageBuffer)
       }

+    case .setConfiguration:
+      DispatchQueue.main.async {
+        if let userInfo = notification.userInfo {
+          if let config = userInfo["config"] as? ConfigureAction {
+            self.setConfiguration(config)
+          }
+        }
+      }

     case .reloadConfiguration:
     case .reloadConfiguration:

-      reloadConfiguration()
+        reloadConfiguration()

     case .setCaptureSessionConfiguration:
       if let userInfo = notification.userInfo {
         if let config = userInfo["config"] as? RecordAction {
     case .setCaptureSessionConfiguration:
       if let userInfo = notification.userInfo {
         if let config = userInfo["config"] as? RecordAction {


@@ -317,7 +331,10 @@ struct CapturaApp: App {
     if now - gifCallbackTimer > .nanoseconds(1_000_000_000 / UInt64(captureSessionConfiguration.frameRate)) {
       gifCallbackTimer = now
       DispatchQueue.main.async {
     if now - gifCallbackTimer > .nanoseconds(1_000_000_000 / UInt64(captureSessionConfiguration.frameRate)) {
       gifCallbackTimer = now
       DispatchQueue.main.async {

-        if let cgImage = frame.cgImage?.resize(by: self.pixelDensity) {
+        if var cgImage = frame.cgImage {
+          if self.pixelDensity > 1 {
+            cgImage = cgImage.resize(by: self.pixelDensity) ?? cgImage
+          }

           self.images.append(cgImage)
         }
       }
           self.images.append(cgImage)
         }
       }


@@ -336,6 +353,10 @@ struct CapturaApp: App {
     }
   }
   
     }
   }
   

+  func setConfiguration(_ config: ConfigureAction) {
+    CapturaSettings.apply(config)
+  }
+  

   func reloadConfiguration() {
     self.captureSessionConfiguration = CaptureSessionConfiguration()
   }
   func reloadConfiguration() {
     self.captureSessionConfiguration = CaptureSessionConfiguration()
   }