make audio mixer work with 2 inputs that stop and start at different times

Author: Brendonovich

crates/recording/examples/recording-cli.rs

@@ -1,7 +1,7 @@
 use cap_recording::{feeds::microphone, screen_capture::ScreenCaptureTarget, *};
 use kameo::Actor;
 use scap_targets::Display;
-use std::{sync::Arc, time::Duration};
+use std::time::Duration;
 use tracing::info;
 
 #[tokio::main]
@@ -36,19 +36,25 @@ pub async fn main() {
     //     .await
     //     .unwrap();
 
-    // let (error_tx, _) = flume::bounded(1);
-    // let mic_feed = MicrophoneFeed::spawn(MicrophoneFeed::new(error_tx));
-
-    // mic_feed
-    //     .ask(microphone::SetInput {
-    //         label: MicrophoneFeed::default().map(|v| v.0).unwrap(),
-    //     })
-    //     .await
-    //     .unwrap()
-    //     .await
-    //     .unwrap();
-
-    // tokio::time::sleep(Duration::from_millis(10)).await;
+    let (error_tx, _) = flume::bounded(1);
+    let mic_feed = MicrophoneFeed::spawn(MicrophoneFeed::new(error_tx));
+
+    mic_feed
+        .ask(microphone::SetInput {
+            label:
+            // MicrophoneFeed::list()
+            //     .into_iter()
+            //     .find(|(k, _)| k.contains("Focusrite"))
+            MicrophoneFeed::default()
+                .map(|v| v.0)
+                .unwrap(),
+        })
+        .await
+        .unwrap()
+        .await
+        .unwrap();
+
+    tokio::time::sleep(Duration::from_millis(10)).await;
 
     let (handle, _ready_rx) = instant_recording::Actor::builder(
         dir.path().into(),

crates/recording/src/capture_pipeline.rs

@@ -502,15 +502,13 @@ impl MakeCapturePipeline for screen_capture::Direct3DCapture {
 
                 while let Ok((mut frame, timestamp)) = audio_rx.recv() {
                     let ts_offset = timestamp.duration_since(start_time);
-                    dbg!(ts_offset);
 
                     let Some(ts_offset) = ts_offset.checked_sub(screen_first_offset) else {
                         continue;
                     };
 
                     let pts = (ts_offset.as_secs_f64() * frame.rate() as f64) as i64;
                     frame.set_pts(Some(pts));
-                    dbg!(pts);
 
                     if let Ok(mut output) = output.lock() {
                         audio_encoder.queue_frame(frame, &mut output)