Merge pull request #515 from Stremio/surround_sound_enabled

Surround sound setting
Stremio · Dec 8, 2023 · 438f054 · 438f054
2 parents 4c95cf5 + 9e14c1b
commit 438f054
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 18 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -39,7 +39,7 @@
         "react-i18next": "^12.1.1",
         "react-is": "18.2.0",
         "spatial-navigation-polyfill": "git+ssh://[email protected]/Stremio/spatial-navigation.git#64871b1422466f5f45d24ebc8bbd315b2ebab6a6",
-        "stremio-translations": "git+ssh://[email protected]/Stremio/stremio-translations.git#9c91862cdf8f1f0fb54df870807cd6af18679a89",
+        "stremio-translations": "git+ssh://[email protected]/Stremio/stremio-translations.git#8e30d9961402a7389f1a6209d9dab5592f32c9d7",
         "url": "0.11.0",
         "use-long-press": "^3.1.5"
     },

diff --git a/src/routes/Player/Player.js b/src/routes/Player/Player.js
@@ -27,11 +27,8 @@ const styles = require('./styles');
 const Player = ({ urlParams, queryParams }) => {
     const { t } = useTranslation();
     const { chromecast, shell, core } = useServices();
-    const [forceTranscoding, maxAudioChannels] = React.useMemo(() => {
-        return [
-            queryParams.has('forceTranscoding'),
-            queryParams.has('maxAudioChannels') ? parseInt(queryParams.get('maxAudioChannels'), 10) : null
-        ];
+    const forceTranscoding = React.useMemo(() => {
+        return queryParams.has('forceTranscoding');
     }, [queryParams]);
     const [player, videoParamsChanged, timeChanged, pausedChanged, ended, nextVideo] = usePlayer(urlParams);
     const [settings, updateSettings] = useSettings();
@@ -288,10 +285,7 @@ const Player = ({ urlParams, queryParams }) => {
                         :
                         0,
                     forceTranscoding: forceTranscoding || casting,
-                    maxAudioChannels: typeof maxAudioChannels === 'number' ?
-                        maxAudioChannels
-                        :
-                        null,
+                    maxAudioChannels: settings.surroundSound ? 32 : 2,
                     streamingServerURL: streamingServer.baseUrl.type === 'Ready' ?
                         casting ?
                             streamingServer.baseUrl.content
@@ -306,7 +300,7 @@ const Player = ({ urlParams, queryParams }) => {
                 shellTransport: shell.active ? shell.transport : null,
             });
         }
-    }, [streamingServer.baseUrl, player.selected, player.metaItem, forceTranscoding, maxAudioChannels, casting]);
+    }, [streamingServer.baseUrl, player.selected, player.metaItem, forceTranscoding, casting]);
     React.useEffect(() => {
         if (videoState.stream !== null) {
             dispatch({

diff --git a/src/routes/Settings/Settings.js b/src/routes/Settings/Settings.js
@@ -34,6 +34,7 @@ const Settings = () => {
         subtitlesBackgroundColorInput,
         subtitlesOutlineColorInput,
         audioLanguageSelect,
+        surroundSoundCheckbox,
         seekTimeDurationSelect,
         seekShortTimeDurationSelect,
         escExitFullscreenCheckbox,
@@ -405,6 +406,16 @@ const Settings = () => {
                                 {...audioLanguageSelect}
                             />
                         </div>
+                        <div className={styles['option-container']}>
+                            <div className={styles['option-name-container']}>
+                                <div className={styles['label']}>{ t('SETTINGS_SURROUND_SOUND') }</div>
+                            </div>
+                            <Checkbox
+                                className={classnames(styles['option-input-container'], styles['checkbox-container'])}
+                                tabIndex={-1}
+                                {...surroundSoundCheckbox}
+                            />
+                        </div>
                     </div>
                     <div className={styles['section-container']}>
                         <div className={styles['section-category-container']}>

diff --git a/src/routes/Settings/useProfileSettingsInputs.js b/src/routes/Settings/useProfileSettingsInputs.js
@@ -135,6 +135,21 @@ const useProfileSettingsInputs = (profile) => {
             });
         }
     }), [profile.settings]);
+    const surroundSoundCheckbox = React.useMemo(() => ({
+        checked: profile.settings.surroundSound,
+        onClick: () => {
+            core.transport.dispatch({
+                action: 'Ctx',
+                args: {
+                    action: 'UpdateSettings',
+                    args: {
+                        ...profile.settings,
+                        surroundSound: !profile.settings.surroundSound
+                    }
+                }
+            });
+        }
+    }), [profile.settings]);
     const escExitFullscreenCheckbox = React.useMemo(() => ({
         checked: profile.settings.escExitFullscreen,
         onClick: () => {
@@ -307,6 +322,7 @@ const useProfileSettingsInputs = (profile) => {
         subtitlesBackgroundColorInput,
         subtitlesOutlineColorInput,
         audioLanguageSelect,
+        surroundSoundCheckbox,
         escExitFullscreenCheckbox,
         seekTimeDurationSelect,
         seekShortTimeDurationSelect,

diff --git a/src/types/models/Ctx.d.ts b/src/types/models/Ctx.d.ts
@@ -37,6 +37,7 @@ type Settings = {
     subtitlesOutlineColor: string,
     subtitlesSize: number,
     subtitlesTextColor: string,
+    surroundSound: boolean,
 };
 
 type Profile = {