Add back 'Turn on Subtitles by Default'

FreeTubeApp · Dec 13, 2023 · 6ee911c · 6ee911c
1 parent acf3db5
commit 6ee911c
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 11 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
     },
 
+    defaultSubtitles: function () {
+      return this.$store.getters.getDefaultSubtitles
+    },
+
     enableScreenshot: function () {
       return this.$store.getters.getEnableScreenshot
     },
@@ -1873,6 +1877,10 @@ export default defineComponent({
           type: caption.type
         }, true)
       }
+
+      if (this.defaultSubtitles) {
+        this.toggleCaptions()
+      }
     },
 
     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
+    defaultSubtitles: function () {
+      return this.$store.getters.getDefaultSubtitles
     },
 
     forceLocalBackendForLegacy: function () {
@@ -295,7 +295,7 @@ export default defineComponent({
       'updateAutoplayVideos',
       'updateAutoplayPlaylists',
       'updatePlayNextVideo',
-      'updateEnableSubtitles',
+      'updateDefaultSubtitles',
       '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="defaultSubtitles"
+          @change="updateDefaultSubtitles"
+        />
         <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
@@ -179,12 +179,12 @@ const state = {
   defaultProfile: MAIN_PROFILE_ID,
   defaultQuality: '720',
   defaultSkipInterval: 5,
+  defaultSubtitles: false,
   defaultTheatreMode: false,
   defaultVideoFormat: 'dash',
   disableSmoothScrolling: false,
   displayVideoPlayButton: true,
   enableSearchSuggestions: true,
-  enableSubtitles: true,
   enterFullscreenOnDisplayRotate: false,
   externalLinkHandling: '',
   externalPlayer: '',