Setting to turn on subtitles by default (#4450)

* Add back 'Turn on Subtitles by Default' * Update variable name * Fix double-selection issue when auto-generated & native tracks exist, & fix similar pre-existing bug Also fixes pre-existing bug with pressing 'c' having the effect of multiple tracks (inaccurately) showing as selected.
FreeTubeApp · Jan 3, 2024 · bed4af1 · bed4af1
1 parent bffedf0
commit bed4af1
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 14 deletions.
diff --git a/src/renderer/components/ft-video-player/ft-video-player.js b/src/renderer/components/ft-video-player/ft-video-player.js
@@ -321,6 +321,10 @@ export default defineComponent({
       return playbackRates
     },
 
+    enableSubtitlesByDefault: function () {
+      return this.$store.getters.getEnableSubtitlesByDefault
+    },
+
     enableScreenshot: function () {
       return this.$store.getters.getEnableScreenshot
     },
@@ -1406,6 +1410,14 @@ export default defineComponent({
       const trackIndex = this.useDash ? 1 : 0
 
       const tracks = this.player.textTracks()
+
+      // visually and semantically disable any other enabled tracks
+      for (let i = 0; i < tracks.length; ++i) {
+        if (i !== trackIndex && tracks[i].mode === 'showing') {
+          tracks[i].mode = 'disabled'
+        }
+      }
+
       if (tracks.length > trackIndex) {
         if (tracks[trackIndex].mode === 'showing') {
           tracks[trackIndex].mode = 'disabled'
@@ -1864,15 +1876,16 @@ export default defineComponent({
         captionList = this.captionHybridList
       }
 
-      for (const caption of this.sortCaptions(captionList)) {
+      this.sortCaptions(captionList).forEach((caption, i) =>
         this.player.addRemoteTextTrack({
           kind: 'subtitles',
           src: caption.url,
           srclang: caption.language_code,
           label: caption.label,
-          type: caption.type
+          type: caption.type,
+          default: i === 0 && this.enableSubtitlesByDefault
         }, true)
-      }
+      )
     },
 
     toggleFullWindow: function () {

diff --git a/src/renderer/components/player-settings/player-settings.js b/src/renderer/components/player-settings/player-settings.js
@@ -80,8 +80,8 @@ export default defineComponent({
       return this.$store.getters.getPlayNextVideo
     },
 
-    enableSubtitles: function () {
-      return this.$store.getters.getEnableSubtitles
+    enableSubtitlesByDefault: function () {
+      return this.$store.getters.getEnableSubtitlesByDefault
     },
 
     forceLocalBackendForLegacy: function () {
@@ -295,7 +295,7 @@ export default defineComponent({
       'updateAutoplayVideos',
       'updateAutoplayPlaylists',
       'updatePlayNextVideo',
-      'updateEnableSubtitles',
+      'updateEnableSubtitlesByDefault',
       'updateForceLocalBackendForLegacy',
       'updateProxyVideos',
       'updateDefaultTheatreMode',

diff --git a/src/renderer/components/player-settings/player-settings.vue b/src/renderer/components/player-settings/player-settings.vue
@@ -4,13 +4,6 @@
   >
     <div class="switchColumnGrid">
       <div class="switchColumn">
-        <ft-toggle-switch
-          v-if="false"
-          label="Enable Subtitles by Default"
-          :compact="true"
-          :default-value="enableSubtitles"
-          @change="updateEnableSubtitles"
-        />
         <ft-toggle-switch
           :label="$t('Settings.Player Settings.Force Local Backend for Legacy Formats')"
           :compact="true"
@@ -26,6 +19,12 @@
           :tooltip="$t('Tooltips.Player Settings.Proxy Videos Through Invidious')"
           @change="updateProxyVideos"
         />
+        <ft-toggle-switch
+          :label="$t('Settings.Player Settings.Turn on Subtitles by Default')"
+          :compact="true"
+          :default-value="enableSubtitlesByDefault"
+          @change="updateEnableSubtitlesByDefault"
+        />
         <ft-toggle-switch
           :label="$t('Settings.Player Settings.Enable Theatre Mode by Default')"
           :compact="true"

diff --git a/src/renderer/store/modules/settings.js b/src/renderer/store/modules/settings.js
@@ -184,7 +184,7 @@ const state = {
   disableSmoothScrolling: false,
   displayVideoPlayButton: true,
   enableSearchSuggestions: true,
-  enableSubtitles: true,
+  enableSubtitlesByDefault: false,
   enterFullscreenOnDisplayRotate: false,
   externalLinkHandling: '',
   externalPlayer: '',