fix(editor): allow muting split segments independently

apps/cli/src/selftest/playback.rs

@@ -903,6 +903,7 @@ mod fixture {
                     timescale: 1.0,
                     name: None,
                     speed_audio_mode: None,
+                    audio_muted: false,
                     hide_cursor: None,
                     volume: None,
                 }],

apps/desktop-gpui/src/editor_clips.rs

@@ -1967,6 +1967,7 @@ impl PreparedMp4Import {
             end: self.duration,
             name: None,
             speed_audio_mode: None,
+            audio_muted: false,
             hide_cursor: None,
             volume: None,
         });
@@ -2447,6 +2448,7 @@ fn full_timeline_for_segments(
                 end: duration,
                 name: None,
                 speed_audio_mode: None,
+                audio_muted: false,
                 hide_cursor: None,
                 volume: None,
             })
@@ -3044,6 +3046,7 @@ fn full_timeline_for_source_segments(
                 end: duration,
                 name: None,
                 speed_audio_mode: None,
+                audio_muted: false,
                 hide_cursor: None,
                 volume: None,
             })
@@ -3137,6 +3140,7 @@ fn source_timeline_segments_for_import(
             speed_audio_mode: segment.speed_audio_mode,
             hide_cursor: segment.hide_cursor,
             volume: segment.volume,
+            audio_muted: segment.audio_muted,
         });
     }
 
@@ -3367,6 +3371,7 @@ pub(crate) fn append_cap_project_to_editor(
                 end: source_segment.end,
                 name: None,
                 speed_audio_mode: source_segment.speed_audio_mode,
+                audio_muted: source_segment.audio_muted,
                 hide_cursor: source_segment.hide_cursor,
                 volume: source_segment.volume,
             });
@@ -3808,6 +3813,7 @@ mod tests {
             end,
             name: None,
             speed_audio_mode: None,
+            audio_muted: false,
             hide_cursor: None,
             volume: None,
         }

apps/desktop-gpui/src/editor_edits.rs

@@ -1809,6 +1809,7 @@ pub fn ensure_timeline(project: &mut ProjectConfiguration, clip_display_duration
                 end: *duration,
                 name: None,
                 speed_audio_mode: None,
+                audio_muted: false,
                 hide_cursor: None,
                 volume: None,
             })
@@ -2417,11 +2418,12 @@ pub fn set_clip_segment_timescale(
 }
 
 pub fn clip_is_muted(segment: &TimelineSegment) -> bool {
-    if (segment.timescale - 1.0).abs() < f64::EPSILON {
+    let speed_mode_muted = if (segment.timescale - 1.0).abs() < f64::EPSILON {
         segment.speed_audio_mode == Some(ClipSpeedAudioMode::Mute)
     } else {
         segment.speed_audio_mode.unwrap_or(ClipSpeedAudioMode::Mute) == ClipSpeedAudioMode::Mute
-    }
+    };
+    segment.audio_muted || speed_mode_muted
 }
 
 pub fn set_clip_volume(timeline: &mut TimelineConfiguration, index: usize, volume: f64) -> bool {
@@ -2443,17 +2445,23 @@ pub fn set_clip_muted(timeline: &mut TimelineConfiguration, index: usize, muted:
     let Some(segment) = timeline.segments.get_mut(index) else {
         return false;
     };
-    let next = if muted {
-        Some(ClipSpeedAudioMode::Mute)
-    } else if (segment.timescale - 1.0).abs() < f64::EPSILON {
-        None
-    } else {
-        Some(ClipSpeedAudioMode::MaintainPitch)
-    };
-    if segment.speed_audio_mode == next {
+    let unmute_speed = !muted
+        && if (segment.timescale - 1.0).abs() < f64::EPSILON {
+            segment.speed_audio_mode == Some(ClipSpeedAudioMode::Mute)
+        } else {
+            segment.speed_audio_mode.unwrap_or_default() == ClipSpeedAudioMode::Mute
+        };
+    if segment.audio_muted == muted && !unmute_speed {
         return false;
     }
-    segment.speed_audio_mode = next;
+    segment.audio_muted = muted;
+    if unmute_speed {
+        segment.speed_audio_mode = if (segment.timescale - 1.0).abs() < f64::EPSILON {
+            None
+        } else {
+            Some(ClipSpeedAudioMode::MaintainPitch)
+        };
+    }
     true
 }
 
@@ -2465,10 +2473,11 @@ pub fn set_clip_segment_speed_audio_mode(
     let Some(segment) = timeline.segments.get_mut(index) else {
         return false;
     };
-    if segment.speed_audio_mode == Some(mode) {
+    if segment.speed_audio_mode == Some(mode) && !segment.audio_muted {
         return false;
     }
     segment.speed_audio_mode = Some(mode);
+    segment.audio_muted = false;
     true
 }
 
@@ -2593,6 +2602,7 @@ pub fn merge_clip_segments(
         .or_else(|| custom_name(&right.name));
     left.end = right.end;
     left.speed_audio_mode = settings.speed_audio_mode;
+    left.audio_muted = settings.audio_muted;
     left.volume = settings.volume;
     left.hide_cursor = settings.hide_cursor;
 
@@ -3923,6 +3933,7 @@ mod tests {
         assert_eq!(timeline.segments.len(), 3);
         assert!(set_clip_hide_cursor(timeline, 1, true));
         assert!(set_clip_volume(timeline, 1, 0.5));
+        assert!(set_clip_muted(timeline, 1, true));
         assert!(set_clip_name(timeline, 0, "Intro"));
         timeline.transitions = vec![cap_project::ClipTransition {
             segment_index: 2,
@@ -3939,6 +3950,7 @@ mod tests {
         assert_eq!((merged.start, merged.end), (0.0, 10.0));
         assert_eq!(merged.hide_cursor, Some(true));
         assert_eq!(merged.volume, Some(0.5));
+        assert!(merged.audio_muted);
         assert_eq!(merged.name.as_deref(), Some("Intro"));
         assert_eq!(timeline.transitions.len(), 1);
         assert_eq!(timeline.transitions[0].segment_index, 1);
@@ -4017,21 +4029,47 @@ mod tests {
     }
 
     #[test]
-    fn muting_a_1x_clip_sets_speed_audio_mode() {
+    fn muting_a_1x_clip_sets_audio_muted() {
         let mut project = zoom_fixture();
         let timeline = project.timeline.as_mut().unwrap();
         assert!(!clip_is_muted(&timeline.segments[0]));
         assert!(set_clip_muted(timeline, 0, true));
         assert!(clip_is_muted(&timeline.segments[0]));
-        assert_eq!(
-            timeline.segments[0].speed_audio_mode,
-            Some(ClipSpeedAudioMode::Mute)
-        );
+        assert!(timeline.segments[0].audio_muted);
+        assert_eq!(timeline.segments[0].speed_audio_mode, None);
         assert!(set_clip_muted(timeline, 0, false));
         assert!(!clip_is_muted(&timeline.segments[0]));
+        assert!(!timeline.segments[0].audio_muted);
         assert_eq!(timeline.segments[0].speed_audio_mode, None);
     }
 
+    #[test]
+    fn split_mute_and_unmute_preserve_independent_audio_settings() {
+        let mut project = zoom_fixture();
+        let timeline = project.timeline.as_mut().unwrap();
+        timeline.segments[0].speed_audio_mode = Some(ClipSpeedAudioMode::MatchSpeed);
+        assert!(set_clip_muted(timeline, 0, true));
+        assert!(split_clip_segment(timeline, 2.0, Some(0)));
+        assert!(timeline.segments[0].audio_muted);
+        assert!(timeline.segments[1].audio_muted);
+        assert!(set_clip_muted(timeline, 1, false));
+        assert!(timeline.segments[0].audio_muted);
+        assert!(!timeline.segments[1].audio_muted);
+        assert_eq!(
+            timeline.segments[1].speed_audio_mode,
+            Some(ClipSpeedAudioMode::MatchSpeed)
+        );
+        timeline.segments[1].speed_audio_mode = Some(ClipSpeedAudioMode::Mute);
+        assert!(set_clip_muted(timeline, 1, false));
+        assert!(!clip_is_muted(&timeline.segments[1]));
+        assert!(set_clip_segment_speed_audio_mode(
+            timeline,
+            0,
+            ClipSpeedAudioMode::MatchSpeed
+        ));
+        assert!(!timeline.segments[0].audio_muted);
+    }
+
     #[test]
     fn setting_clip_speed_audio_mode_writes_the_segment() {
         let mut project = zoom_fixture();

apps/desktop-gpui/src/editor_window.rs

@@ -430,6 +430,7 @@ pub fn preflight(path: &std::path::Path) -> Result<ProjectSummary, String> {
                     end: segment.duration(),
                     name: None,
                     speed_audio_mode: None,
+                    audio_muted: false,
                     hide_cursor: None,
                     volume: None,
                 })
@@ -8263,8 +8264,11 @@ impl EditorWindow {
                     } else {
                         chip_row()
                             .children(audio_modes.into_iter().map(|(mode, label)| {
-                                let selected = audio_mode == mode
-                                    || (mode == ClipSpeedAudioMode::Mute && muted);
+                                let selected = if muted {
+                                    mode == ClipSpeedAudioMode::Mute
+                                } else {
+                                    audio_mode == mode
+                                };
                                 chip(
                                     SharedString::from(format!("clip-speed-audio-{label}")),
                                     selected,
@@ -11971,6 +11975,7 @@ mod tests {
                     timescale: 1.0,
                     name: None,
                     speed_audio_mode: None,
+                    audio_muted: false,
                     hide_cursor: None,
                     volume: None,
                 }],
@@ -12026,6 +12031,7 @@ mod tests {
                         timescale: 1.0,
                         name: None,
                         speed_audio_mode: None,
+                        audio_muted: false,
                         hide_cursor: None,
                         volume: None,
                     },
@@ -12036,6 +12042,7 @@ mod tests {
                         timescale: 1.0,
                         name: None,
                         speed_audio_mode: None,
+                        audio_muted: false,
                         hide_cursor: None,
                         volume: None,
                     },

apps/desktop-gpui/src/transcription.rs

@@ -2071,6 +2071,7 @@ pub fn apply_caption_result(
                 end: recording_duration,
                 name: None,
                 speed_audio_mode: None,
+                audio_muted: false,
                 hide_cursor: None,
                 volume: None,
             }],

apps/desktop/src-tauri/examples/desktop-display-transport-benchmark.rs

@@ -133,6 +133,7 @@ async fn load_recording(
                     timescale: 1.0,
                     name: None,
                     speed_audio_mode: None,
+                    audio_muted: false,
                     hide_cursor: None,
                     volume: None,
                 }]
@@ -154,6 +155,7 @@ async fn load_recording(
                         timescale: 1.0,
                         name: None,
                         speed_audio_mode: None,
+                        audio_muted: false,
                         hide_cursor: None,
                         volume: None,
                     })

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

@@ -1364,6 +1364,7 @@ mod presentation_guard_tests {
             timescale: 1.0,
             name: None,
             speed_audio_mode: None,
+            audio_muted: false,
             hide_cursor: None,
             volume: None,
         };