From e20b7e456a549e13d850f04054b2bbb20b532aea Mon Sep 17 00:00:00 2001
From: ochibani <11yzyv86j@relay.firefox.com>
Date: Tue, 28 Jan 2025 00:04:32 +0200
Subject: [PATCH] fix mic record in windows

---
 core/src/ffmpeg_linux.rs   |  2 +-
 core/src/ffmpeg_windows.rs | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/src/ffmpeg_linux.rs b/core/src/ffmpeg_linux.rs
index 73069f3..525c8dc 100644
--- a/core/src/ffmpeg_linux.rs
+++ b/core/src/ffmpeg_linux.rs
@@ -702,8 +702,8 @@ impl Ffmpeg {
         if self.audio_output_switch.is_active() {
             ffmpeg_command.format("pulse")
                           .input(&self.audio_output_id);
+            ffmpeg_command.format("ogg");
         }
-        ffmpeg_command.format("ogg");
 
         // Disable bitrate if value is zero
         if self.audio_record_bitrate.value() as u16 > 0 {
diff --git a/core/src/ffmpeg_windows.rs b/core/src/ffmpeg_windows.rs
index 1f3d207..5e2e088 100644
--- a/core/src/ffmpeg_windows.rs
+++ b/core/src/ffmpeg_windows.rs
@@ -531,7 +531,7 @@ impl Ffmpeg {
         // Record audio input
         if self.audio_input_switch.is_active() {
             ffmpeg_command.format("dshow");
-            ffmpeg_command.input(format!("audio=\"{}\"", &self.audio_input_id.active_text()
+            ffmpeg_command.input(format!("audio={}", &self.audio_input_id.active_text()
                                          .ok_or_else(|| anyhow!("Failed to get audio input source."))?)
             );
         }
@@ -539,7 +539,7 @@ impl Ffmpeg {
         // Record audio output
         if self.audio_output_switch.is_active() {
             ffmpeg_command.format("dshow");
-            ffmpeg_command.input(format!("audio=\"{}\"", &self.audio_output_id));
+            ffmpeg_command.input(format!("audio={}", &self.audio_output_id));
         }
 
         // Disable bitrate if value is zero
@@ -626,12 +626,12 @@ impl Ffmpeg {
     pub fn start_input_audio(&mut self) -> Result<()> {
         let mut ffmpeg_command = FfmpegCommand::new();
         ffmpeg_command.format("dshow")
-                      .input(format!("audio=\"{}\"", &self.audio_input_id.active_text()
+                      .input(format!("audio={}", &self.audio_input_id.active_text()
                              .ok_or_else(|| anyhow!("Failed to get audio input source."))?)
                       );
         if self.audio_output_switch.is_active() {
             ffmpeg_command.format("dshow")
-                          .input(&self.audio_output_id);
+                          .input(format!("audio={}", &self.audio_output_id));
         }
 
         // Disable bitrate if value is zero
@@ -685,7 +685,7 @@ impl Ffmpeg {
     pub fn start_output_audio(&mut self) -> Result<()> {
         let mut ffmpeg_command = FfmpegCommand::new();
         ffmpeg_command.format("dshow")
-                      .input(format!("audio=\"{}\"", &self.audio_output_id));
+                      .input(format!("audio={}", &self.audio_output_id));
 
         // Remove metadate
         ffmpeg_command.args(["-map_metadata", "-1"]);