feat: 优化字幕偏移逻辑，增加对模板的支持，修复字幕切换事件参数

zhw2590582 · Sep 14, 2024 · 9b87f96 · 9b87f96
1 parent 36b2c80
commit 9b87f96
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 28 deletions.
diff --git a/docs/uncompiled/artplayer/index.js b/docs/uncompiled/artplayer/index.js
diff --git a/docs/uncompiled/artplayer/index.js.map b/docs/uncompiled/artplayer/index.js.map
diff --git a/packages/artplayer/src/player/subtitleOffsetMix.js b/packages/artplayer/src/player/subtitleOffsetMix.js
@@ -1,29 +1,23 @@
-import { def } from '../utils';
+import { def, clamp } from '../utils';
 
 export default function subtitleOffsetMix(art) {
-    const { clamp } = art.constructor.utils;
-    const { notice, i18n } = art;
-
-    let subtitleOffset = 0;
-
-    art.on('subtitleTrackLoad', () => {
-        subtitleOffset = 0;
-        art.emit('subtitleOffset', 0);
-    });
+    const { notice, i18n, template } = art;
 
     def(art, 'subtitleOffset', {
         get() {
-            return subtitleOffset;
+            return template.$track?.offset || 0;
         },
         set(value) {
             const { cues } = art.subtitle;
-            subtitleOffset = clamp(value, -5, 5);
+            if (!template.$track || cues.length === 0) return;
+            const offset = clamp(value, -5, 5);
+            template.$track.offset = offset;
             for (let index = 0; index < cues.length; index++) {
                 const cue = cues[index];
                 cue.originalStartTime = cue.originalStartTime ?? cue.startTime;
                 cue.originalEndTime = cue.originalEndTime ?? cue.endTime;
-                cue.startTime = clamp(cue.originalStartTime + subtitleOffset, 0, art.duration);
-                cue.endTime = clamp(cue.originalEndTime + subtitleOffset, 0, art.duration);
+                cue.startTime = clamp(cue.originalStartTime + offset, 0, art.duration);
+                cue.endTime = clamp(cue.originalEndTime + offset, 0, art.duration);
             }
             art.subtitle.update();
             notice.show = `${i18n.get('Subtitle Offset')}: ${value}s`;

diff --git a/packages/artplayer/src/subtitle.js b/packages/artplayer/src/subtitle.js
@@ -153,7 +153,7 @@ export default class Subtitle extends Component {
                 if (this.url === subUrl) return subUrl;
                 URL.revokeObjectURL(this.url);
                 this.createTrack('metadata', subUrl);
-                this.art.emit('subtitleSwitch', subUrl);
+                this.art.emit('subtitleSwitch', subUrl, subtitleOption.url);
                 return subUrl;
             })
             .catch((err) => {