feat(audio): implement 3D virtual surround sound and audio filters

resolve.py

@@ -0,0 +1,20 @@
+import os
+files = ["src-tauri/src/store/ui_state_store.rs", "src/App.vue", "src/components/player-controls/RightControls.vue", "src/panels/SettingsPanel.vue", "src/styles/panels.css"]
+for f in files:
+    with open(f, 'r') as fh:
+        content = fh.read()
+    if '<<<<<<<' in content:
+        print(f"\n--- Conflicts in {f} ---")
+        lines = content.splitlines()
+        in_conflict = False
+        for i, line in enumerate(lines):
+            if line.startswith('<<<<<<<'):
+                in_conflict = True
+                print(f"Line {i+1}: {line}")
+            elif line.startswith('======='):
+                print(f"Line {i+1}: {line}")
+            elif line.startswith('>>>>>>>'):
+                print(f"Line {i+1}: {line}")
+                in_conflict = False
+            elif in_conflict:
+                print(line)

resolver.py

@@ -0,0 +1,61 @@
+import re
+
+def resolve_ui_state(content):
+    # Just need to keep surround_sound block and use upstream's playback_adjustments block
+    pattern = re.compile(r'<<<<<<< HEAD\n(.*?)\n=======\n(.*?)>>>>>>> upstream/main\n', re.DOTALL)
+    def repl(m):
+        head = m.group(1)
+        upstream = m.group(2)
+        if "surround_sound:" in head and "playback_adjustments:" in upstream:
+            # head contains surround_sound + old playback_adjustments
+            # upstream contains new playback_adjustments
+            surround_match = re.search(r'(surround_sound:.*?),\n\s*playback_adjustments:', head, re.DOTALL)
+            if surround_match:
+                surround = surround_match.group(1)
+                return f"{surround},\n{upstream}"
+
+        if "virtual_surround_enabled" in head and "title_bar_style" in upstream:
+            # We must merge struct fields or Default impl
+            # Let's just combine them (assuming they are lines)
+            return head + "\n" + upstream
+        return head + "\n" + upstream
+
+    return pattern.sub(repl, content)
+
+def resolve_app(content):
+    pattern = re.compile(r'<<<<<<< HEAD\n(.*?)\n=======\n(.*?)>>>>>>> upstream/main\n', re.DOTALL)
+    def repl(m):
+        return m.group(1) + "\n" + m.group(2)
+    return pattern.sub(repl, content)
+
+def resolve_right_controls(content):
+    pattern = re.compile(r'<<<<<<< HEAD\n(.*?)\n=======\n(.*?)>>>>>>> upstream/main\n', re.DOTALL)
+    def repl(m):
+        return m.group(1) + "\n" + m.group(2)
+    return pattern.sub(repl, content)
+
+def resolve_settings_panel(content):
+    pattern = re.compile(r'<<<<<<< HEAD\n(.*?)\n=======\n(.*?)>>>>>>> upstream/main\n', re.DOTALL)
+    def repl(m):
+        return m.group(1) + "\n" + m.group(2)
+    return pattern.sub(repl, content)
+
+with open('src-tauri/src/store/ui_state_store.rs', 'r') as f:
+    content = f.read()
+with open('src-tauri/src/store/ui_state_store.rs', 'w') as f:
+    f.write(resolve_ui_state(content))
+
+with open('src/App.vue', 'r') as f:
+    content = f.read()
+with open('src/App.vue', 'w') as f:
+    f.write(resolve_app(content))
+
+with open('src/components/player-controls/RightControls.vue', 'r') as f:
+    content = f.read()
+with open('src/components/player-controls/RightControls.vue', 'w') as f:
+    f.write(resolve_right_controls(content))
+
+with open('src/panels/SettingsPanel.vue', 'r') as f:
+    content = f.read()
+with open('src/panels/SettingsPanel.vue', 'w') as f:
+    f.write(resolve_settings_panel(content))

src-tauri/src/store/ui_state_store.rs

@@ -39,6 +39,8 @@ pub struct UiState {
     #[serde(default)]
     pub audio: Option<crate::audio_output::AudioSettings>,
     #[serde(default)]
+    pub surround_sound: Option<SurroundSoundState>,
+    #[serde(default)]
     pub playback_adjustments: Option<PlaybackAdjustmentsState>,
     #[serde(default)]
     pub playback: Option<PlaybackState>,
@@ -65,6 +67,7 @@ impl Default for UiState {
             settings: None,
             rendering: None,
             audio: None,
+            surround_sound: None,
             playback_adjustments: None,
             playback: None,
             subtitle_appearance: None,
@@ -86,6 +89,12 @@ impl UiState {
             settings: incoming.settings.or(self.settings),
             rendering: incoming.rendering.or(self.rendering),
             audio: incoming.audio.or(self.audio),
+surround_sound: match (self.surround_sound, incoming.surround_sound) {
+                (Some(curr), Some(inc)) => Some(curr.merge(inc)),
+                (None, Some(inc)) => Some(inc),
+                (Some(curr), None) => Some(curr),
+                (None, None) => None,
+            },
             playback_adjustments: match (self.playback_adjustments, incoming.playback_adjustments) {
                 (Some(curr), Some(inc)) => Some(curr.merge(inc)),
                 (None, inc) => inc,
@@ -180,6 +189,42 @@ pub struct ColorAdjustmentsState {
     pub hue: Option<f64>,
 }
 
+#[derive(Serialize, Deserialize, Clone, Default)]
+#[serde(rename_all = "camelCase")]
+pub struct SurroundSoundState {
+    #[serde(default)]
+    pub global_enabled: Option<bool>,
+    #[serde(default)]
+    pub enabled: Option<bool>,
+    #[serde(default)]
+    pub preset: Option<String>,
+    #[serde(default)]
+    pub surround_depth: Option<f64>,
+    #[serde(default)]
+    pub ambience: Option<f64>,
+    #[serde(default)]
+    pub clarity: Option<f64>,
+    #[serde(default)]
+    pub bass_boost: Option<f64>,
+    #[serde(default)]
+    pub dynamic_boost: Option<f64>,
+}
+
+impl SurroundSoundState {
+    fn merge(self, incoming: SurroundSoundState) -> SurroundSoundState {
+        SurroundSoundState {
+            global_enabled: incoming.global_enabled.or(self.global_enabled),
+            enabled: incoming.enabled.or(self.enabled),
+            preset: incoming.preset.or(self.preset),
+            surround_depth: incoming.surround_depth.or(self.surround_depth),
+            ambience: incoming.ambience.or(self.ambience),
+            clarity: incoming.clarity.or(self.clarity),
+            bass_boost: incoming.bass_boost.or(self.bass_boost),
+            dynamic_boost: incoming.dynamic_boost.or(self.dynamic_boost),
+        }
+    }
+}
+
 #[derive(Serialize, Deserialize, Clone)]
 #[serde(rename_all = "camelCase")]
 pub struct SubtitleAppearanceState {

src/App.vue

@@ -36,6 +36,7 @@ import { usePlaylistCreationPrompt } from "./composables/usePlaylistCreationProm
 import { usePlaybackContextMenu } from "./composables/usePlaybackContextMenu";
 import { useRemoteControlQrDialog } from "./composables/useRemoteControlQrDialog";
 import { useAudioOutput } from "./composables/useAudioOutput";
+import { useSurroundSound } from "./composables/useSurroundSound";
 import { tauriCoreClient } from "./core-client/tauriPlaybackClient";
 import { tauriPlaylistSourceClient } from "./core-client/tauriPlaylistSourceClient";
 
@@ -65,6 +66,7 @@ const {
     isPipEnabled,
     schedulePointerRefresh,
     shouldKeepControlsVisible,
+    showSurroundMenu,
     hideAllMenus,
     toggleMenu,
     closeAllMenus,
@@ -83,6 +85,11 @@ const {
     normalizeStoredPanel,
 } = useAppBootstrap(tauriCoreClient);
 
+const {
+    applySurroundForMedia,
+    reapplyFilters: reapplySurround,
+} = useSurroundSound();
+
 const clearNavSelectionDuringLoad = ref(false);
 const isCastPopoverOpen = ref(false);
 const playbackLoadingState = usePlaybackLoadingState();
@@ -474,6 +481,7 @@ const onFileLoaded = async () => {
         subtitleAppearance.forceDisableSubtitles();
     }
     await adjustments.applyColorAdjustmentsForMedia(player.state.media.url);
+    await applySurroundForMedia(player.state.media.url);
     await adjustments.applyCropZoomForMedia(player.state.media.url);
     await subtitleAppearance.applySubtitleAppearanceOptions();
 };
@@ -727,6 +735,7 @@ useAppStartupBindings({
             :playback-rates="speed.playbackRates"
             :show-speed-menu="speed.showSpeedMenu.value"
             :show-settings-menu="adjustments.showSettingsMenu.value"
+            :show-surround-menu="showSurroundMenu"
             :audio-delay="adjustments.audioDelay.value"
             :sub-delay="adjustments.subDelay.value"
             :secondary-sub-delay="adjustments.secondarySubDelay.value"

src/components/PlayerControls.vue

@@ -26,6 +26,7 @@ const props = defineProps<{
     playbackRates: number[];
     showSpeedMenu: boolean;
     showSettingsMenu: boolean;
+    showSurroundMenu: boolean;
     audioDelay: number;
     subDelay: number;
     secondarySubDelay: number;
@@ -95,7 +96,10 @@ const emit = defineEmits<{
     (e: "toggle-play-pause"): void;
     (e: "stop-playback"): void;
     (e: "next-track"): void;
-    (e: "toggle-menu", menuName: "audio" | "sub" | "speed" | "settings"): void;
+    (
+        e: "toggle-menu",
+        menuName: "audio" | "sub" | "speed" | "settings" | "surround",
+    ): void;
     (e: "toggle-loop-one"): void;
     (e: "set-speed", rate: number): void;
     (e: "set-speed-continuously", rate: number): void;
@@ -303,6 +307,7 @@ onUnmounted(() => {
                         :playback-rates="playbackRates"
                         :show-speed-menu="showSpeedMenu"
                         :show-settings-menu="showSettingsMenu"
+                        :show-surround-menu="showSurroundMenu"
                         :speed-locked="audioPassthroughActive"
                         :audio-delay="audioDelay"
                         :sub-delay="subDelay"