From 677c3f16e40b415f310e1f4ee9ba2b2435194d51 Mon Sep 17 00:00:00 2001
From: lyswhut <lyswhut@qq.com>
Date: Wed, 31 May 2023 20:26:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=92=AD=E6=94=BE=E9=80=9F=E7=8E=87=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E9=9D=A2=E6=9D=BF=E6=96=B0=E5=A2=9E=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E9=9F=B3=E8=B0=83=E8=A1=A5=E5=81=BF=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 publish/changeLog.md                          |  1 +
 src/common/defaultSetting.ts                  |  1 +
 src/common/types/app_setting.d.ts             |  5 ++++
 src/lang/en-us.json                           |  1 +
 src/lang/zh-cn.json                           |  1 +
 src/lang/zh-tw.json                           |  1 +
 .../components/common/PlaybackRateBtn.vue     | 23 +++++++++++++++++--
 .../core/useApp/usePlayer/usePlaybackRate.ts  |  8 ++++++-
 src/renderer/plugins/player.ts                |  5 ++++
 9 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/publish/changeLog.md b/publish/changeLog.md
index 677f3412..a891774f 100644
--- a/publish/changeLog.md
+++ b/publish/changeLog.md
@@ -1,6 +1,7 @@
 ### 新增
 
 - 新增音效设置（实验性功能），支持10段均衡器设置、内置的一些环境混响音效、3D立体环绕音效
+- 播放速率设置面板新增是否音调补偿设置，在调整播放速率后，可以选择是否启用音调补偿，默认启用
 
 ### 修复
 
diff --git a/src/common/defaultSetting.ts b/src/common/defaultSetting.ts
index f1e03c51..eda2ab10 100644
--- a/src/common/defaultSetting.ts
+++ b/src/common/defaultSetting.ts
@@ -29,6 +29,7 @@ const defaultSetting: LX.AppSetting = {
   'player.volume': 1,
   'player.isMute': false,
   'player.playbackRate': 1,
+  'player.preservesPitch': true,
   'player.mediaDeviceId': 'default',
   'player.isMediaDeviceRemovedStopPlay': false,
   'player.isShowLyricTranslation': false,
diff --git a/src/common/types/app_setting.d.ts b/src/common/types/app_setting.d.ts
index 415198c1..463c0766 100644
--- a/src/common/types/app_setting.d.ts
+++ b/src/common/types/app_setting.d.ts
@@ -113,6 +113,11 @@ declare global {
        */
       'player.playbackRate': number
 
+      /**
+       * 是否自动调整音频的音高以补偿对播放速率设置所做的更改
+       */
+      'player.preservesPitch': boolean
+
       /**
        * 音频输出设备id
        */
diff --git a/src/lang/en-us.json b/src/lang/en-us.json
index 8c44a185..7dcf9699 100644
--- a/src/lang/en-us.json
+++ b/src/lang/en-us.json
@@ -223,6 +223,7 @@
   "player__play_toggle_mode_off": "Disable",
   "player__play_toggle_mode_random": "List Random",
   "player__play_toggle_mode_single_loop": "Single Loop",
+  "player__playback_preserves_pitch": "Pitch compensation",
   "player__playback_rate": "Current playback rate:",
   "player__playback_rate_reset_btn": "Reset",
   "player__playing": "Now playing...",
diff --git a/src/lang/zh-cn.json b/src/lang/zh-cn.json
index 70f4ef85..deaaab7c 100644
--- a/src/lang/zh-cn.json
+++ b/src/lang/zh-cn.json
@@ -223,6 +223,7 @@
   "player__play_toggle_mode_off": "禁用",
   "player__play_toggle_mode_random": "列表随机",
   "player__play_toggle_mode_single_loop": "单曲循环",
+  "player__playback_preserves_pitch": "音调补偿",
   "player__playback_rate": "当前播放速率：",
   "player__playback_rate_reset_btn": "重置",
   "player__playing": "播放中...",
diff --git a/src/lang/zh-tw.json b/src/lang/zh-tw.json
index 17872b1f..e6deb1c4 100644
--- a/src/lang/zh-tw.json
+++ b/src/lang/zh-tw.json
@@ -223,6 +223,7 @@
   "player__play_toggle_mode_off": "禁用",
   "player__play_toggle_mode_random": "列表隨機",
   "player__play_toggle_mode_single_loop": "單曲循環",
+  "player__playback_preserves_pitch": "音調補償",
   "player__playback_rate": "當前播放速率：",
   "player__playback_rate_reset_btn": "重置",
   "player__playing": "播放中...",
diff --git a/src/renderer/components/common/PlaybackRateBtn.vue b/src/renderer/components/common/PlaybackRateBtn.vue
index d1ffdeff..9cda684e 100644
--- a/src/renderer/components/common/PlaybackRateBtn.vue
+++ b/src/renderer/components/common/PlaybackRateBtn.vue
@@ -9,9 +9,17 @@
       <div :class="$style.setting">
         <div :class="$style.info">
           <span>{{ playbackRate.toFixed(2) }}x</span>
-          <base-btn min @click="handleUpdatePlaybackRate(100)">{{ $t('player__playback_rate_reset_btn') }}</base-btn>
+          <div :class="$style.control">
+            <base-checkbox
+              id="player__playback_preserves_pitch"
+              :model-value="appSetting['player.preservesPitch']"
+              :label="$t('player__playback_preserves_pitch')"
+              @update:model-value="updatePreservesPitch"
+            />
+            <base-btn min @click="handleUpdatePlaybackRate(100)">{{ $t('player__playback_rate_reset_btn') }}</base-btn>
+          </div>
         </div>
-        <base-slider-bar :class="$style.slider" :value="playbackRate * 100" :min="60" :max="200" @change="handleUpdatePlaybackRate" />
+        <base-slider-bar :class="$style.slider" :value="playbackRate * 100" :min="50" :max="200" @change="handleUpdatePlaybackRate" />
       </div>
     </template>
   </material-popup-btn>
@@ -20,11 +28,17 @@
 <script setup>
 // import { computed } from '@common/utils/vueTools'
 import { playbackRate } from '@renderer/store/player/playbackRate'
+import { appSetting, updateSetting } from '@renderer/store/setting'
 
 const handleUpdatePlaybackRate = (val) => {
   window.app_event.setPlaybackRate(Math.round(val) / 100)
 }
 
+
+const updatePreservesPitch = (enabled) => {
+  updateSetting({ 'player.preservesPitch': enabled })
+}
+
 // const icon = computed(() => {
 //   return playbackRate.value == 0
 //     ? '#icon-volume-off-outline'
@@ -100,6 +114,11 @@ const handleUpdatePlaybackRate = (val) => {
     line-height: 1;
   }
 }
+.control {
+  align-items: center;
+  display: flex;
+  gap: 10px;
+}
 
 .slider {
   width: 100%;
diff --git a/src/renderer/core/useApp/usePlayer/usePlaybackRate.ts b/src/renderer/core/useApp/usePlayer/usePlaybackRate.ts
index e967c551..8f223663 100644
--- a/src/renderer/core/useApp/usePlayer/usePlaybackRate.ts
+++ b/src/renderer/core/useApp/usePlayer/usePlaybackRate.ts
@@ -1,5 +1,5 @@
 import { onBeforeUnmount, watch } from '@common/utils/vueTools'
-import { setPlaybackRate as setPlayerPlaybackRate } from '@renderer/plugins/player'
+import { setPlaybackRate as setPlayerPlaybackRate, setPreservesPitch } from '@renderer/plugins/player'
 
 import { debounce } from '@common/utils'
 // import { HOTKEY_PLAYER } from '@common/hotKey'
@@ -11,6 +11,7 @@ export default () => {
 
   setPlaybackRate(appSetting['player.playbackRate'])
   setPlayerPlaybackRate(appSetting['player.playbackRate'])
+  setPreservesPitch(appSetting['player.preservesPitch'])
 
 
   const handleSetPlaybackRate = (num: number) => {
@@ -41,6 +42,11 @@ export default () => {
   })
 
 
+  watch(() => appSetting['player.preservesPitch'], preservesPitch => {
+    setPreservesPitch(preservesPitch)
+  })
+
+
   // window.key_event.on(HOTKEY_PLAYER.volume_up.action, hotkeyVolumeUp)
   // window.key_event.on(HOTKEY_PLAYER.volume_down.action, hotkeyVolumeDown)
   window.app_event.on('setPlaybackRate', handleSetPlaybackRate)
diff --git a/src/renderer/plugins/player.ts b/src/renderer/plugins/player.ts
index 57456cdc..bb828161 100644
--- a/src/renderer/plugins/player.ts
+++ b/src/renderer/plugins/player.ts
@@ -254,6 +254,11 @@ export const setPlaybackRate = (rate: number) => {
   audio.playbackRate = rate
 }
 
+export const setPreservesPitch = (preservesPitch: boolean) => {
+  if (!audio) return
+  audio.preservesPitch = preservesPitch
+}
+
 export const getMute = (): boolean => {
   return audio?.muted ?? false
 }