Merge branch 'main' of https://github.com/CapSoftware/Cap

Author: richiemcilroy

.github/workflows/ci.yml

@@ -103,8 +103,9 @@ jobs:
         settings:
           - target: aarch64-apple-darwin
             runner: macos-latest
-          - target: x86_64-pc-windows-msvc
-            runner: windows-latest
+          # Windows can't take the disk usage lol
+          # - target: x86_64-pc-windows-msvc
+          #   runner: windows-latest
     runs-on: ${{ matrix.settings.runner }}
     permissions:
       contents: read

apps/web/app/(org)/dashboard/settings/organization/components/InviteDialog.tsx

@@ -115,10 +115,6 @@ export const InviteDialog = ({
 		},
 	});
 
-	const handleSendInvites = () => {
-		sendInvites.mutate();
-	};
-
 	return (
 		<Dialog open={isOpen} onOpenChange={setIsOpen}>
 			<DialogContent className="p-0 w-full max-w-md rounded-xl border bg-gray-2 border-gray-4">
@@ -214,7 +210,7 @@ export const InviteDialog = ({
 							inviteEmails.length === 0 ||
 							remainingSeats === 0
 						}
-						onClick={handleSendInvites}
+						onClick={() => sendInvites.mutate()}
 					>
 						Send Invites
 					</Button>

apps/web/app/(org)/dashboard/settings/organization/components/MembersCard.tsx

@@ -1,5 +1,6 @@
 "use client";
 
+import { buildEnv } from "@cap/env";
 import {
 	Button,
 	Card,
@@ -146,22 +147,24 @@ export const MembersCard = ({
 						<CardDescription>Manage your organization members.</CardDescription>
 					</CardHeader>
 					<div className="flex flex-wrap gap-3">
-						<Tooltip
-							position="top"
-							content="Once inside the Stripe dashboard, click 'Manage Plan', then increase quantity of subscriptions to purchase more seats"
-						>
-							<Button
-								type="button"
-								size="sm"
-								variant="primary"
-								className="px-6 min-w-auto"
-								spinner={loading}
-								disabled={!isOwner || loading}
-								onClick={handleManageBilling}
+						{buildEnv.NEXT_PUBLIC_IS_CAP && (
+							<Tooltip
+								position="top"
+								content="Once inside the Stripe dashboard, click 'Manage Plan', then increase quantity of subscriptions to purchase more seats"
 							>
-								{loading ? "Loading..." : "+ Purchase more seats"}
-							</Button>
-						</Tooltip>
+								<Button
+									type="button"
+									size="sm"
+									variant="primary"
+									className="px-6 min-w-auto"
+									spinner={loading}
+									disabled={!isOwner || loading}
+									onClick={handleManageBilling}
+								>
+									{loading ? "Loading..." : "+ Purchase more seats"}
+								</Button>
+							</Tooltip>
+						)}
 						<Button
 							type="button"
 							size="sm"

apps/web/content/changelog/81.mdx

@@ -0,0 +1,11 @@
+---
+title: Speed modification in editor, New Crop UI, Bug fixes
+app: Cap Desktop
+publishedAt: “2025-11-5”
+version: 0.3.82
+image:
+---
+
+- **Speed modification** - Clip segments now have a Speed option in the editor, allowing them to be slowed down or sped up. Currently, changing the speed of a segment will mute its audio.
+- **New Crop UI** - Thanks to @ItsEeleeya the area select and editor crop UI now has more features and is much smoother.
+- **Bug fixes** - macOS recording errors should be less common, and some recordings should no longer look distorted in the Editor

apps/web/utils/organization.ts

@@ -1,3 +1,5 @@
+import { buildEnv } from "@cap/env";
+
 /**
  * Calculate organization seats information
  */
@@ -10,10 +12,9 @@ export function calculateSeats(organization: {
 	const memberCount = organization?.members?.length ?? 0;
 	const pendingInvitesCount = organization?.invites?.length ?? 0;
 	const totalUsedSeats = memberCount + pendingInvitesCount;
-	const remainingSeats =
-		process.env.NODE_ENv === "development"
-			? Number.MAX_SAFE_INTEGER
-			: Math.max(0, inviteQuota - totalUsedSeats);
+	const remainingSeats = buildEnv.NEXT_PUBLIC_IS_CAP
+		? Math.max(0, inviteQuota - totalUsedSeats)
+		: Number.MAX_SAFE_INTEGER;
 
 	return {
 		inviteQuota,

crates/video-decode/src/avassetreader.rs

@@ -16,11 +16,13 @@ pub struct AVAssetReaderDecoder {
     tokio_handle: TokioHandle,
     track_output: R<av::AssetReaderTrackOutput>,
     reader: R<av::AssetReader>,
+    width: u32,
+    height: u32,
 }
 
 impl AVAssetReaderDecoder {
     pub fn new(path: PathBuf, tokio_handle: TokioHandle) -> Result<Self, String> {
-        let pixel_format = {
+        let (pixel_format, width, height) = {
             let input = ffmpeg::format::input(&path).unwrap();
 
             let input_stream = input
@@ -35,18 +37,24 @@ impl AVAssetReaderDecoder {
                 .video()
                 .map_err(|e| format!("video decoder / {e}"))?;
 
-            pixel_to_pixel_format(decoder.format())
+            (
+                pixel_to_pixel_format(decoder.format()),
+                decoder.width(),
+                decoder.height(),
+            )
         };
 
         let (track_output, reader) =
-            Self::get_reader_track_output(&path, 0.0, &tokio_handle, pixel_format)?;
+            Self::get_reader_track_output(&path, 0.0, &tokio_handle, pixel_format, width, height)?;
 
         Ok(Self {
             path,
             pixel_format,
             tokio_handle,
             track_output,
             reader,
+            width,
+            height,
         })
     }
 
@@ -57,6 +65,8 @@ impl AVAssetReaderDecoder {
             requested_time,
             &self.tokio_handle,
             self.pixel_format,
+            self.width,
+            self.height,
         )?;
 
         Ok(())
@@ -67,6 +77,8 @@ impl AVAssetReaderDecoder {
         time: f32,
         handle: &TokioHandle,
         pixel_format: cv::PixelFormat,
+        width: u32,
+        height: u32,
     ) -> Result<(R<av::AssetReaderTrackOutput>, R<av::AssetReader>), String> {
         let asset = av::UrlAsset::with_url(
             &ns::Url::with_fs_path_str(path.to_str().unwrap(), false),
@@ -93,8 +105,16 @@ impl AVAssetReaderDecoder {
         let mut reader_track_output = av::AssetReaderTrackOutput::with_track(
             &track,
             Some(&ns::Dictionary::with_keys_values(
-                &[cv::pixel_buffer::keys::pixel_format().as_ns()],
-                &[pixel_format.to_cf_number().as_ns().as_id_ref()],
+                &[
+                    cv::pixel_buffer::keys::pixel_format().as_ns(),
+                    cv::pixel_buffer::keys::width().as_ns(),
+                    cv::pixel_buffer::keys::height().as_ns(),
+                ],
+                &[
+                    pixel_format.to_cf_number().as_ns().as_id_ref(),
+                    ns::Number::with_u32(width).as_id_ref(),
+                    ns::Number::with_u32(height).as_id_ref(),
+                ],
             )),
         )
         .map_err(|e| format!("asset.reader_track_output{{{pixel_format:?}}}): {e}"))?;

packages/database/migrations/0006_hesitant_stone_men.sql

@@ -0,0 +1 @@
+ALTER TABLE `organizations` ADD `tombstoneAt` timestamp;