Merge pull request #726 from MoYingJi/pr/s

feat(lyric): 丰富 AMLL 设置项，删除 QM 意外的逐字音译

Author: imsyy

src/components/Player/MainAMLyric.vue

@@ -76,7 +76,22 @@ const amLyricsData = computed(() => {
   // 简单检查歌词有效性
   if (!Array.isArray(lyrics) || lyrics.length === 0) return [];
 
-  return cloneDeep(lyrics) as LyricLine[];
+  const clonedLyrics = cloneDeep(lyrics) as LyricLine[];
+
+  // 检查是否要不显示某一部分并删去
+  const showTran = settingStore.showTran;
+  const showRoma = settingStore.showRoma;
+  const showWordsRoma = settingStore.showWordsRoma;
+
+  if (!showTran || !showRoma || !showWordsRoma) {
+    clonedLyrics.forEach((line) => {
+      if (!showTran) line.translatedLyric = "";
+      if (!showRoma) line.romanLyric = "";
+      if (!showWordsRoma) line.words.forEach((word) => (word.romanWord = ""));
+    })
+  }
+
+  return clonedLyrics;
 });
 
 // 进度跳转

src/components/Player/PlayerBackground.vue

@@ -23,6 +23,7 @@
         :flowSpeed="flowSpeed"
         :hasLyric="musicStore.isHasLrc"
         :lowFreqVolume="lowFreqVolume"
+        :renderScale="settingStore.playerBackgroundRenderScale ?? 0.5"
       />
     </Transition>
   </div>
@@ -55,8 +56,6 @@ const { pause: pauseRaf, resume: resumeRaf } = useRafFn(
       statusStore.playStatus
     ) {
       lowFreqVolume.value = player.getLowFrequencyVolume();
-    } else {
-      lowFreqVolume.value = 1.0;
     }
   },
   { immediate: false },
@@ -70,8 +69,8 @@ watch(
     statusStore.playStatus,
   ],
   ([enabled, bgType, playing]) => {
-    if (enabled && bgType === "animation" && playing) {
-      resumeRaf();
+    if (enabled && bgType === "animation") {
+      playing ? resumeRaf() : pauseRaf();
     } else {
       pauseRaf();
       lowFreqVolume.value = 1.0;

src/components/Setting/LyricsSetting.vue

@@ -246,7 +246,6 @@
           v-model:value="settingStore.showTran"
           class="set"
           :round="false"
-          :disabled="settingStore.useAMLyrics"
         />
       </n-card>
       <n-card class="set-item">
@@ -257,7 +256,6 @@
           v-model:value="settingStore.showRoma"
           class="set"
           :round="false"
-          :disabled="settingStore.useAMLyrics"
         />
       </n-card>
       <n-card class="set-item">
@@ -419,6 +417,16 @@
             :round="false"
           />
         </n-card>
+        <n-card class="set-item">
+          <div class="label">
+            <n-text class="name">显示逐字音译</n-text>
+          </div>
+          <n-switch
+            v-model:value="settingStore.showWordsRoma"
+            class="set"
+            :round="false"
+          />
+        </n-card>
       </n-collapse-transition>
     </div>
     <div v-if="isElectron" ref="desktopLyricRef" class="set-list">

src/components/Setting/PlaySetting.vue

@@ -260,6 +260,23 @@
             placeholder="请输入背景动画流动速度"
           />
         </n-card>
+        <n-card class="set-item">
+          <div class="label">
+            <n-text class="name">背景渲染缩放比例</n-text>
+            <n-text class="tip" :depth="3">设置当前渲染缩放比例，默认 0.5</n-text>
+            <n-text class="tip" :depth="3">
+              适当提高此值（如 1.0 或 1.5）可以减少分界线锯齿，让效果更好，但也会增加显卡压力
+            </n-text>
+          </div>
+          <n-input-number
+            v-model:value="settingStore.playerBackgroundRenderScale"
+            :min="0.1"
+            :max="10"
+            :show-button="false"
+            class="set"
+            placeholder="请输入背景渲染缩放比例"
+          />
+        </n-card>
         <n-card class="set-item">
           <div class="label">
             <n-text class="name">背景动画暂停时暂停</n-text>

src/core/player/LyricManager.ts

@@ -7,7 +7,7 @@ import { type SongLyric } from "@/types/lyric";
 import { isElectron } from "@/utils/env";
 import { stripLyricMetadata } from "@/utils/lyricStripper";
 import { type LyricLine, parseLrc, parseTTML, parseYrc } from "@applemusic-like-lyrics/lyric";
-import { parseSmartLrc, isWordLevelFormat } from "@/utils/lyricParser";
+import { isWordLevelFormat, parseSmartLrc } from "@/utils/lyricParser";
 import { escapeRegExp, isEmpty } from "lodash-es";
 import { SongType } from "@/types/main";
 
@@ -323,29 +323,21 @@ class LyricManager {
     };
     // 解析主歌词
     const qrcLines = parseQRCContent(qrcContent);
-    // 解析罗马音（如果有）
-    const romaLines = roma ? parseQRCContent(roma) : [];
-    // 构建 LyricLine 数组，同时填充 romanWord
-    const lines: LyricLine[] = qrcLines.map((qrcLine, lineIndex) => {
-      // 找到对应的罗马音行
-      const romaLine = romaLines[lineIndex];
-      // 按索引填充 romanWord
-      const words = qrcLine.words.map((w, wordIndex) => ({
-        ...w,
-        romanWord: romaLine?.words[wordIndex]?.word || "",
-      }));
+    let result = qrcLines.map((qrcLine) => {
       return {
-        words,
+        words: qrcLine.words.map((word) => ({
+          ...word,
+          romanWord: "",
+        })),
         startTime: qrcLine.startTime,
         endTime: qrcLine.endTime,
         translatedLyric: "",
-        romanLyric: romaLine?.words.map((w) => w.word).join("") || "",
+        romanLyric: "",
         isBG: false,
         isDuet: false,
       };
     });
     // 处理翻译
-    let result = lines;
     if (trans) {
       let transLines = parseLrc(trans);
       if (transLines?.length) {
@@ -357,6 +349,31 @@ class LyricManager {
         result = this.alignLyrics(result, transLines, "translatedLyric");
       }
     }
+    // 处理音译
+    if (roma) {
+      const qrcRomaLines = parseQRCContent(roma);
+      if (qrcRomaLines?.length) {
+        const romaLines = qrcRomaLines.map((line) => {
+          return {
+            words: [
+              {
+                startTime: line.startTime,
+                endTime: line.endTime,
+                word: line.words.map((w) => w.word).join(""),
+                romanWord: "",
+              },
+            ],
+            startTime: line.startTime,
+            endTime: line.endTime,
+            translatedLyric: "",
+            romanLyric: "",
+            isBG: false,
+            isDuet: false,
+          };
+        });
+        result = this.alignLyrics(result, romaLines, "romanLyric");
+      }
+    }
     return result;
   }
 

src/stores/setting.ts

@@ -67,6 +67,8 @@ export interface SettingState {
   showTran: boolean;
   /** 显示歌词音译 */
   showRoma: boolean;
+  /** 显示逐字音译 */
+  showWordsRoma: boolean;
   /** 歌词位置 */
   lyricsPosition: "flex-start" | "center" | "flex-end";
   /** 歌词滚动位置 */
@@ -147,6 +149,8 @@ export interface SettingState {
   playerBackgroundPause: boolean;
   /** 背景动画是否响应低频音量 */
   playerBackgroundLowFreqVolume: boolean;
+  /** 背景动画渲染比例 */
+  playerBackgroundRenderScale: number;
   /** 播放器元素自动隐藏 */
   autoHidePlayerMeta: boolean;
   /** 记忆最后进度 */
@@ -357,6 +361,7 @@ export const useSettingStore = defineStore("setting", {
     playerBackgroundFlowSpeed: 4,
     playerBackgroundPause: false,
     playerBackgroundLowFreqVolume: false,
+    playerBackgroundRenderScale: 0.5,
     autoHidePlayerMeta: true,
     memoryLastSeek: true,
     progressTooltipShow: true,
@@ -385,6 +390,7 @@ export const useSettingStore = defineStore("setting", {
     showYrcAnimation: true,
     showTran: true,
     showRoma: true,
+    showWordsRoma: true,
     lyricsPosition: "flex-start",
     lyricsBlur: false,
     lyricsScrollPosition: "start",