Merge branch 'main' into layout-fixes

Author: Brendonovich

apps/cli/src/main.rs

@@ -7,7 +7,6 @@ use std::{
 
 use cap_export::ExporterBase;
 use cap_project::XY;
-use cap_recording::feeds::CameraFeed;
 use clap::{Args, Parser, Subcommand};
 use record::RecordStart;
 use serde_json::json;
@@ -111,7 +110,7 @@ window {}:
                 }
             }
             Some(RecordCommands::Cameras) => {
-                let cameras = CameraFeed::list_cameras();
+                let cameras = cap_camera::list_cameras().collect::<Vec<_>>();
 
                 let mut info = vec![];
                 for camera_info in cameras {

apps/cli/src/record.rs

@@ -1,9 +1,8 @@
-use cap_camera::ModelID;
 use cap_recording::screen_capture::ScreenCaptureTarget;
 use clap::Args;
 use scap_targets::{DisplayId, WindowId};
-use std::{env::current_dir, path::PathBuf, sync::Arc};
-use tokio::{io::AsyncBufReadExt, sync::Mutex};
+use std::{env::current_dir, path::PathBuf};
+use tokio::io::AsyncBufReadExt;
 use uuid::Uuid;
 
 #[derive(Args)]
@@ -43,16 +42,16 @@ impl RecordStart {
             _ => Err("No target specified".to_string()),
         }?;
 
-        let camera = if let Some(model_id) = self.camera {
-            let _model_id: ModelID = model_id
-                .try_into()
-                .map_err(|_| "Invalid model ID".to_string())?;
+        // let camera = if let Some(model_id) = self.camera {
+        //     let _model_id: ModelID = model_id
+        //         .try_into()
+        //         .map_err(|_| "Invalid model ID".to_string())?;
 
-            todo!()
-            // Some(CameraFeed::init(model_id).await.unwrap())
-        } else {
-            None
-        };
+        //     todo!()
+        //     // Some(CameraFeed::init(model_id).await.unwrap())
+        // } else {
+        //     None
+        // };
 
         let id = Uuid::new_v4().to_string();
         let path = self
@@ -66,8 +65,8 @@ impl RecordStart {
                 capture_target: target_info,
                 capture_system_audio: self.system_audio,
                 mic_feed: None,
+                camera_feed: None, // camera.map(|c| Arc::new(Mutex::new(c))),
             },
-            camera.map(|c| Arc::new(Mutex::new(c))),
             false,
         )
         .await