Skip to content

Commit 52b0acc

Browse files
committed
Merge branch 'main' of https://github.com/CapSoftware/Cap
2 parents d80308f + c3df6e4 commit 52b0acc

49 files changed

Lines changed: 3211 additions & 289 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Cargo.lock

Lines changed: 40 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/desktop/src-tauri/Cargo.toml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ log = "0.4.20"
7878

7979
cap-audio = { path = "../../../crates/audio" }
8080
cap-camera = { path = "../../../crates/camera", features = ["serde", "specta"] }
81+
cap-camera-effects = { path = "../../../crates/camera-effects" }
8182
cap-utils = { path = "../../../crates/utils" }
8283
cap-project = { path = "../../../crates/project" }
8384
cap-rendering = { path = "../../../crates/rendering" }
@@ -102,6 +103,7 @@ tokio-stream = { version = "0.1.17", features = ["sync"] }
102103
md5 = "0.7.0"
103104
tokio-util = "0.7.15"
104105
wgpu.workspace = true
106+
pollster = "0.4"
105107
bytemuck = "1.23.1"
106108
kameo = "0.17.2"
107109
tauri-plugin-sentry = "0.5.0"
@@ -128,6 +130,14 @@ objc2-app-kit = { version = "0.3.0", features = [
128130
"NSWindow",
129131
"NSResponder",
130132
"NSHapticFeedback",
133+
"NSWorkspace",
134+
"NSRunningApplication",
135+
] }
136+
objc2 = "0.6.0"
137+
objc2-foundation = { version = "0.3.0", features = [
138+
"NSNotification",
139+
"NSString",
140+
"NSThread",
131141
] }
132142
cocoa = "0.26.0"
133143
objc = "0.2.7"
@@ -142,6 +152,7 @@ parakeet-rs = "0.3.4"
142152
windows = { workspace = true, features = [
143153
"Win32_Foundation",
144154
"Win32_System",
155+
"Win32_System_Power",
145156
"Win32_UI_WindowsAndMessaging",
146157
"Win32_Graphics_Gdi",
147158
] }
-342 KB
Loading
-314 KB
Loading
-391 KB
Loading
-262 KB
Loading
-351 KB
Loading
486 KB
Loading
488 KB
Loading
473 KB
Loading

0 commit comments

Comments
 (0)