优化字幕传参

docs/document/options.md

@@ -667,7 +667,7 @@ Custom subtitle
 | ----------- | --------- | ---------------------------------------- |
 | `url`       | `String`  | Subtitle url, support vtt and srt format |
 | `style`     | `Object`  | Subtitle style                           |
-| `encoding`  | `String`  | Subtitle encoding                        |
+| `encoding`  | `String`  | Subtitle encoding, default is `utf-8`    |
 | `bilingual` | `Boolean` | Whether bilingual subtitles              |
 
 [Run Code](/Configuration.subtitle)
@@ -678,6 +678,8 @@ var art = new Artplayer({
     url: '/assets/sample/video.mp4',
     subtitle: {
         url: '/assets/sample/subtitle.srt',
+        encoding: 'utf-8',
+        bilingual: true,
         style: {
             color: '#03A9F4',
             'font-size': '30px',

docs/document/properties.md

@@ -318,14 +318,21 @@ art.contextmenu.add({
 
 -   Type: `Object`
 
-| propertie  | type            | Description           |
-| ---------- | --------------- | --------------------- |
-| `init`     | `Function`      | Init subtitle         |
-| `show`     | `setter`        | Show or hide          |
-| `switch`   | `Function`      | Switch subtitle       |
-| `url`      | `getter`        | get subtitle url      |
-| `encoding` | `getter/setter` | Get and set encoding  |
-| `style`    | `Function`      | Modify subtitle style |
+| propertie | type       | Description           |
+| --------- | ---------- | --------------------- |
+| `init`    | `Function` | Init subtitle         |
+| `show`    | `setter`   | Show or hide          |
+| `switch`  | `Function` | Switch subtitle       |
+| `url`     | `getter`   | get subtitle url      |
+| `style`   | `Function` | Modify subtitle style |
+
+Both `init` and `switch` accept subtitle url as the first parameter, and the second parameter as optional:
+
+| propertie  | type     | Description       |
+| ---------- | -------- | ----------------- |
+| `name`     | `String` | Subtitle name     |
+| `ext`      | `String` | Subtitle format   |
+| `encoding` | `String` | Subtitle encoding |
 
 [Run Code](/Properties.subtitle)
 
@@ -344,7 +351,11 @@ var art = new Artplayer({
             html: 'subtitle 01',
             click: function () {
                 art.subtitle.style('color', 'green');
-                art.subtitle.switch('/assets/sample/subtitle.srt', 'srt subtitle name');
+                art.subtitle.switch('/assets/sample/subtitle.srt', {
+                    name: 'srt subtitle name',
+                    ext: 'srt',
+                    encoding: 'utf-8',
+                });
             },
         },
         {
@@ -353,7 +364,11 @@ var art = new Artplayer({
             html: 'subtitle 02',
             click: function () {
                 art.subtitle.style('color', 'red');
-                art.subtitle.switch('/assets/sample/subtitle.vtt', 'vtt subtitle name');
+                art.subtitle.switch('/assets/sample/subtitle.vtt', {
+                    name: 'vtt subtitle name',
+                    ext: 'vtt',
+                    encoding: 'utf-8',
+                });
             },
         },
     ],

docs/document/question.md

@@ -23,7 +23,9 @@ var art = new Artplayer({
                 },
             ],
             onSelect: function (item) {
-                art.subtitle.switch(item.url, item.name);
+                art.subtitle.switch(item.url, {
+                    name: item.name
+                });
             },
         },
     ],

docs/uncompiled/artplayer.js

@@ -3493,15 +3493,16 @@
       }
     }, {
       key: "switch",
-      value: function _switch(url, name, ext, encoding) {
+      value: function _switch(url) {
         var _this2 = this;
 
+        var opt = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
         var _this$art = this.art,
             i18n = _this$art.i18n,
             notice = _this$art.notice;
-        return this.init(url, ext, encoding).then(function (subUrl) {
-          if (name) {
-            notice.show = "".concat(i18n.get('Switch subtitle'), ": ").concat(name);
+        return this.init(url, opt).then(function (subUrl) {
+          if (opt.name) {
+            notice.show = "".concat(i18n.get('Switch subtitle'), ": ").concat(opt.name);
           }
 
           _this2.art.emit('subtitleSwitch', subUrl);
@@ -3511,9 +3512,10 @@
       }
     }, {
       key: "init",
-      value: function init(url, ext, encoding) {
+      value: function init(url) {
         var _this3 = this;
 
+        var opt = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
         var _this$art2 = this.art,
             notice = _this$art2.notice,
             proxy = _this$art2.events.proxy,
@@ -3536,12 +3538,12 @@
         return fetch(url).then(function (response) {
           return response.arrayBuffer();
         }).then(function (buffer) {
-          var decoder = new TextDecoder(encoding || subtitle.encoding);
+          var decoder = new TextDecoder(opt.encoding || subtitle.encoding);
           var text = decoder.decode(buffer);
 
           _this3.art.emit('subtitleLoad', url);
 
-          switch (ext || getExt(url)) {
+          switch (opt.ext || getExt(url)) {
             case 'srt':
               return vttToBlob(srtToVtt(text));
 
@@ -3580,14 +3582,6 @@
       get: function get() {
         return this.textTrack.activeCues[0];
       }
-    }, {
-      key: "encoding",
-      get: function get() {
-        return this.art.option.subtitle.encoding;
-      },
-      set: function set(value) {
-        this.art.option.subtitle.encoding = value;
-      }
     }]);
 
     return Subtitle;
@@ -4379,8 +4373,10 @@
         var type = getExt(file.name);
 
         if (['ass', 'vtt', 'srt'].includes(type)) {
-          var url = URL.createObjectURL(file);
-          subtitle.switch(url, file.name, type);
+          subtitle.switch(URL.createObjectURL(file), {
+            name: file.name,
+            ext: type
+          });
           art.emit('localSubtitle', file);
         } else {
           errorHandle(false, 'Only supports subtitle files in .ass, .vtt and .srt format');

docs/uncompiled/artplayer.js.map

@@ -1 +1 @@
-{"version":3,"file":"artplayer.js","sources":["../../node_modules/@babel/runtime/helpers/classCallCheck.js","../../node_modules/@babel/runtime/helpers/createClass.js","../../node_modules/@babel/runtime/helpers/typeof.js","../../node_modules/@babel/runtime/helpers/assertThisInitialized.js","../../node_modules/@babel/runtime/helpers/possibleConstructorReturn.js","../../node_modules/@babel/runtime/helpers/getPrototypeOf.js","../../node_modules/@babel/runtime/helpers/setPrototypeOf.js","../../node_modules/@babel/runtime/helpers/inherits.js","../../node_modules/style-inject/dist/style-inject.es.js","../../packages/artplayer/node_modules/option-validator/dist/option-validator.js","../../packages/artplayer/src/utils/emitter.js","../../packages/artplayer/src/utils/compatibility.js","../../packages/artplayer/src/utils/dom.js","../../node_modules/@babel/runtime/helpers/isNativeFunction.js","../../node_modules/@babel/runtime/helpers/construct.js","../../node_modules/@babel/runtime/helpers/wrapNativeSuper.js","../../packages/artplayer/src/utils/error.js","../../packages/artplayer/src/utils/subtitle.js","../../packages/artplayer/src/utils/file.js","../../node_modules/@babel/runtime/helpers/arrayWithoutHoles.js","../../node_modules/@babel/runtime/helpers/iterableToArray.js","../../node_modules/@babel/runtime/helpers/nonIterableSpread.js","../../node_modules/@babel/runtime/helpers/toConsumableArray.js","../../packages/artplayer/src/utils/property.js","../../packages/artplayer/src/utils/time.js","../../packages/artplayer/src/utils/format.js","../../node_modules/@babel/runtime/helpers/defineProperty.js","../../packages/artplayer/src/scheme/index.js","../../packages/artplayer/src/config/index.js","../../packages/artplayer/src/whitelist.js","../../packages/artplayer/src/template.js","../../packages/artplayer/src/i18n/index.js","../../packages/artplayer/src/player/urlMix.js","../../packages/artplayer/src/player/attrInit.js","../../packages/artplayer/src/player/eventInit.js","../../packages/artplayer/src/player/exclusiveInit.js","../../packages/artplayer/src/player/playMix.js","../../packages/artplayer/src/player/pauseMix.js","../../packages/artplayer/src/player/toggleMix.js","../../packages/artplayer/src/player/seekMix.js","../../packages/artplayer/src/player/volumeMix.js","../../packages/artplayer/src/player/currentTimeMix.js","../../packages/artplayer/src/player/durationMix.js","../../packages/artplayer/src/player/switchMix.js","../../packages/artplayer/src/player/playbackRateMix.js","../../packages/artplayer/src/player/aspectRatioMix.js","../../packages/artplayer/src/player/screenshotMix.js","../../packages/artplayer/node_modules/screenfull/dist/screenfull.js","../../packages/artplayer/src/player/fullscreenMix.js","../../packages/artplayer/src/player/fullscreenWebMix.js","../../packages/artplayer/src/player/fullscreenRotateMix.js","../../packages/artplayer/src/player/pipMix.js","../../packages/artplayer/src/player/loadedMix.js","../../packages/artplayer/src/player/playedMix.js","../../packages/artplayer/src/player/playingMix.js","../../packages/artplayer/src/player/autoSizeMix.js","../../packages/artplayer/src/player/rectMix.js","../../packages/artplayer/src/player/flipMix.js","../../packages/artplayer/src/player/lightMix.js","../../packages/artplayer/src/player/miniMix.js","../../packages/artplayer/src/player/loopMin.js","../../packages/artplayer/src/player/index.js","../../node_modules/@babel/runtime/helpers/superPropBase.js","../../node_modules/@babel/runtime/helpers/get.js","../../packages/artplayer/src/utils/component.js","../../packages/artplayer/src/control/fullscreen.js","../../packages/artplayer/src/control/fullscreenWeb.js","../../packages/artplayer/src/control/pip.js","../../packages/artplayer/src/control/playAndPause.js","../../packages/artplayer/src/control/progress.js","../../packages/artplayer/src/control/subtitle.js","../../packages/artplayer/src/control/time.js","../../packages/artplayer/src/control/volume.js","../../packages/artplayer/src/control/setting.js","../../packages/artplayer/src/control/thumbnails.js","../../packages/artplayer/src/control/screenshot.js","../../packages/artplayer/src/control/quality.js","../../packages/artplayer/src/control/loop.js","../../packages/artplayer/src/control/index.js","../../packages/artplayer/src/contextmenu/playbackRate.js","../../packages/artplayer/src/contextmenu/aspectRatio.js","../../packages/artplayer/src/contextmenu/info.js","../../packages/artplayer/src/contextmenu/version.js","../../packages/artplayer/src/contextmenu/light.js","../../packages/artplayer/src/contextmenu/close.js","../../packages/artplayer/src/contextmenu/index.js","../../packages/artplayer/src/info.js","../../packages/artplayer/src/subtitle.js","../../packages/artplayer/src/events/clickInit.js","../../packages/artplayer/src/events/hoverInit.js","../../packages/artplayer/src/events/mousemoveInit.js","../../packages/artplayer/src/events/resizeInit.js","../../packages/artplayer/src/events/gestureILine truncated
+{"version":3,"file":"artplayer.js","sources":["../../node_modules/@babel/runtime/helpers/classCallCheck.js","../../node_modules/@babel/runtime/helpers/createClass.js","../../node_modules/@babel/runtime/helpers/typeof.js","../../node_modules/@babel/runtime/helpers/assertThisInitialized.js","../../node_modules/@babel/runtime/helpers/possibleConstructorReturn.js","../../node_modules/@babel/runtime/helpers/getPrototypeOf.js","../../node_modules/@babel/runtime/helpers/setPrototypeOf.js","../../node_modules/@babel/runtime/helpers/inherits.js","../../node_modules/style-inject/dist/style-inject.es.js","../../packages/artplayer/node_modules/option-validator/dist/option-validator.js","../../packages/artplayer/src/utils/emitter.js","../../packages/artplayer/src/utils/compatibility.js","../../packages/artplayer/src/utils/dom.js","../../node_modules/@babel/runtime/helpers/isNativeFunction.js","../../node_modules/@babel/runtime/helpers/construct.js","../../node_modules/@babel/runtime/helpers/wrapNativeSuper.js","../../packages/artplayer/src/utils/error.js","../../packages/artplayer/src/utils/subtitle.js","../../packages/artplayer/src/utils/file.js","../../node_modules/@babel/runtime/helpers/arrayWithoutHoles.js","../../node_modules/@babel/runtime/helpers/iterableToArray.js","../../node_modules/@babel/runtime/helpers/nonIterableSpread.js","../../node_modules/@babel/runtime/helpers/toConsumableArray.js","../../packages/artplayer/src/utils/property.js","../../packages/artplayer/src/utils/time.js","../../packages/artplayer/src/utils/format.js","../../node_modules/@babel/runtime/helpers/defineProperty.js","../../packages/artplayer/src/scheme/index.js","../../packages/artplayer/src/config/index.js","../../packages/artplayer/src/whitelist.js","../../packages/artplayer/src/template.js","../../packages/artplayer/src/i18n/index.js","../../packages/artplayer/src/player/urlMix.js","../../packages/artplayer/src/player/attrInit.js","../../packages/artplayer/src/player/eventInit.js","../../packages/artplayer/src/player/exclusiveInit.js","../../packages/artplayer/src/player/playMix.js","../../packages/artplayer/src/player/pauseMix.js","../../packages/artplayer/src/player/toggleMix.js","../../packages/artplayer/src/player/seekMix.js","../../packages/artplayer/src/player/volumeMix.js","../../packages/artplayer/src/player/currentTimeMix.js","../../packages/artplayer/src/player/durationMix.js","../../packages/artplayer/src/player/switchMix.js","../../packages/artplayer/src/player/playbackRateMix.js","../../packages/artplayer/src/player/aspectRatioMix.js","../../packages/artplayer/src/player/screenshotMix.js","../../packages/artplayer/node_modules/screenfull/dist/screenfull.js","../../packages/artplayer/src/player/fullscreenMix.js","../../packages/artplayer/src/player/fullscreenWebMix.js","../../packages/artplayer/src/player/fullscreenRotateMix.js","../../packages/artplayer/src/player/pipMix.js","../../packages/artplayer/src/player/loadedMix.js","../../packages/artplayer/src/player/playedMix.js","../../packages/artplayer/src/player/playingMix.js","../../packages/artplayer/src/player/autoSizeMix.js","../../packages/artplayer/src/player/rectMix.js","../../packages/artplayer/src/player/flipMix.js","../../packages/artplayer/src/player/lightMix.js","../../packages/artplayer/src/player/miniMix.js","../../packages/artplayer/src/player/loopMin.js","../../packages/artplayer/src/player/index.js","../../node_modules/@babel/runtime/helpers/superPropBase.js","../../node_modules/@babel/runtime/helpers/get.js","../../packages/artplayer/src/utils/component.js","../../packages/artplayer/src/control/fullscreen.js","../../packages/artplayer/src/control/fullscreenWeb.js","../../packages/artplayer/src/control/pip.js","../../packages/artplayer/src/control/playAndPause.js","../../packages/artplayer/src/control/progress.js","../../packages/artplayer/src/control/subtitle.js","../../packages/artplayer/src/control/time.js","../../packages/artplayer/src/control/volume.js","../../packages/artplayer/src/control/setting.js","../../packages/artplayer/src/control/thumbnails.js","../../packages/artplayer/src/control/screenshot.js","../../packages/artplayer/src/control/quality.js","../../packages/artplayer/src/control/loop.js","../../packages/artplayer/src/control/index.js","../../packages/artplayer/src/contextmenu/playbackRate.js","../../packages/artplayer/src/contextmenu/aspectRatio.js","../../packages/artplayer/src/contextmenu/info.js","../../packages/artplayer/src/contextmenu/version.js","../../packages/artplayer/src/contextmenu/light.js","../../packages/artplayer/src/contextmenu/close.js","../../packages/artplayer/src/contextmenu/index.js","../../packages/artplayer/src/info.js","../../packages/artplayer/src/subtitle.js","../../packages/artplayer/src/events/clickInit.js","../../packages/artplayer/src/events/hoverInit.js","../../packages/artplayer/src/events/mousemoveInit.js","../../packages/artplayer/src/events/resizeInit.js","../../packages/artplayer/src/events/gestureILine truncated

packages/artplayer/src/plugins/localSubtitle.js

@@ -12,8 +12,10 @@ export default function localSubtitle(art) {
         if (file) {
             const type = getExt(file.name);
             if (['ass', 'vtt', 'srt'].includes(type)) {
-                const url = URL.createObjectURL(file);
-                subtitle.switch(url, file.name, type);
+                subtitle.switch(URL.createObjectURL(file), {
+                    name: file.name,
+                    ext: type,
+                });
                 art.emit('localSubtitle', file);
             } else {
                 errorHandle(false, 'Only supports subtitle files in .ass, .vtt and .srt format');

packages/artplayer/src/subtitle.js

@@ -35,14 +35,6 @@ export default class Subtitle extends Component {
         return this.textTrack.activeCues[0];
     }
 
-    get encoding() {
-        return this.art.option.subtitle.encoding;
-    }
-
-    set encoding(value) {
-        this.art.option.subtitle.encoding = value;
-    }
-
     style(key, value) {
         const { $subtitle } = this.art.template;
         if (typeof key === 'object') {
@@ -63,18 +55,18 @@ export default class Subtitle extends Component {
         }
     }
 
-    switch(url, name, ext, encoding) {
+    switch(url, opt = {}) {
         const { i18n, notice } = this.art;
-        return this.init(url, ext, encoding).then((subUrl) => {
-            if (name) {
-                notice.show = `${i18n.get('Switch subtitle')}: ${name}`;
+        return this.init(url, opt).then((subUrl) => {
+            if (opt.name) {
+                notice.show = `${i18n.get('Switch subtitle')}: ${opt.name}`;
             }
             this.art.emit('subtitleSwitch', subUrl);
             return subUrl;
         });
     }
 
-    init(url, ext, encoding) {
+    init(url, opt = {}) {
         const {
             notice,
             events: { proxy },
@@ -94,11 +86,11 @@ export default class Subtitle extends Component {
         return fetch(url)
             .then((response) => response.arrayBuffer())
             .then((buffer) => {
-                const decoder = new TextDecoder(encoding || subtitle.encoding);
+                const decoder = new TextDecoder(opt.encoding || subtitle.encoding);
                 const text = decoder.decode(buffer);
 
                 this.art.emit('subtitleLoad', url);
-                switch (ext || getExt(url)) {
+                switch (opt.ext || getExt(url)) {
                     case 'srt':
                         return vttToBlob(srtToVtt(text));
                     case 'ass':