Skip to content

Commit a1fd6cb

Browse files
Merge pull request #1429 from CapSoftware/0.4.0-bits
feat: 0.4.0 goodies - Captions/Masking/Text/Perf stuff
2 parents bdf23c8 + 245111c commit a1fd6cb

File tree

226 files changed

+14087
-3295
lines changed

Some content is hidden

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

226 files changed

+14087
-3295
lines changed

.claude/settings.local.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55
"Bash(pnpm lint:*)",
66
"Bash(pnpm build:*)",
77
"Bash(cargo check:*)",
8-
"Bash(cargo fmt:*)"
8+
"Bash(cargo fmt:*)",
9+
"Bash(pnpm format:*)",
10+
"Bash(pnpm exec biome check:*)"
911
],
1012
"deny": [],
1113
"ask": []

Cargo.lock

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

apps/desktop/scripts/prepare.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ async function semverToWIXCompatibleVersion(cargoFilePath) {
3131
let build = 0;
3232
if (buildOrPrerelease) {
3333
const numMatch = buildOrPrerelease.match(/\d+$/);
34-
build = numMatch ? parseInt(numMatch[0]) : 0;
34+
build = numMatch ? parseInt(numMatch[0], 10) : 0;
3535
}
3636
const wixVersion = `${major}.${minor}.${patch}${
3737
build === 0 ? "" : `.${build}`

apps/desktop/src-tauri/src/camera.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,11 @@ impl CameraPreviewManager {
123123
) -> anyhow::Result<()> {
124124
let (camera_tx, camera_rx) = flume::bounded(4);
125125

126+
actor
127+
.ask(feeds::camera::AddSender(camera_tx))
128+
.await
129+
.context("Error attaching camera feed consumer")?;
130+
126131
let default_state = self
127132
.get_state()
128133
.map_err(|err| error!("Error getting camera preview state: {err}"))
@@ -144,11 +149,6 @@ impl CameraPreviewManager {
144149

145150
self.preview = Some(InitializedCameraPreview { reconfigure });
146151

147-
actor
148-
.ask(feeds::camera::AddSender(camera_tx))
149-
.await
150-
.context("Error attaching camera feed consumer")?;
151-
152152
Ok(())
153153
}
154154

0 commit comments

Comments
 (0)