ovenplayer 0.10.46 → 0.10.48

package/src/js/api/caption/Loader.js

@@ -1,67 +1,67 @@
-/**
- * Created by hoho on 2018. 7. 4..
- */
-import SrtParser from "api/caption/parser/SrtParser";
-import WebVTT from 'api/caption/parser/VttParser'
-import VTTCue from 'utils/captions/vttCue'
-import SmiParser from 'api/caption/parser/SmiParser'
-
-const Loader = function () {
-    const that = {};
-
-    const convertToVTTCues = function (cues) {
-        return cues.map(cue => new VTTCue(cue.start, cue.end, cue.text));
-    };
-
-    that.load = (track, language, successCallback, errorCallback) => {
-
-        fetch(track.file).then(function (response) {
-            if (response.ok) {
-
-                response.text().then(function (body) {
-                    let cues = [];
-                    let vttCues = [];
-
-                    if (body.indexOf('WEBVTT') >= 0) {
-                        OvenPlayerConsole.log("WEBVTT LOADED");
-                        let parser = new WebVTT.Parser(window, WebVTT.StringDecoder());
-                        vttCues = [];
-                        parser.oncue = function (cue) {
-                            vttCues.push(cue);
-                        };
-                        parser.onflush = function () {
-                            //delete track.xhr;
-                            successCallback(vttCues);
-                        };
-                        // Parse calls onflush internally
-                        parser.parse(body);
-                        parser.flush();
-                    } else if (body.indexOf('SAMI') >= 0) {
-                        OvenPlayerConsole.log("SAMI LOADED");
-                        let parsedData = SmiParser(body, {fixedLang: language});
-                        vttCues = convertToVTTCues(parsedData.result);
-                        successCallback(vttCues);
-
-                    } else {
-                        OvenPlayerConsole.log("SRT LOADED");
-                        cues = SrtParser(body);
-                        vttCues = convertToVTTCues(cues);
-                        successCallback(vttCues);
-                    }
-                }).catch(function (e) {
-                    errorCallback(e);
-                });
-
-            } else {
-                errorCallback(response.status);
-            }
-        }).catch(function (e) {
-            errorCallback(e);
-        });
-
-    };
-
-    return that;
-};
-
-export default Loader;
+/**
+ * Created by hoho on 2018. 7. 4..
+ */
+import SrtParser from "api/caption/parser/SrtParser";
+import WebVTT from 'api/caption/parser/VttParser'
+import VTTCue from 'utils/captions/vttCue'
+import SmiParser from 'api/caption/parser/SmiParser'
+
+const Loader = function () {
+    const that = {};
+
+    const convertToVTTCues = function (cues) {
+        return cues.map(cue => new VTTCue(cue.start, cue.end, cue.text));
+    };
+
+    that.load = (track, language, successCallback, errorCallback) => {
+
+        fetch(track.file).then(function (response) {
+            if (response.ok) {
+
+                response.text().then(function (body) {
+                    let cues = [];
+                    let vttCues = [];
+
+                    if (body.indexOf('WEBVTT') >= 0) {
+                        OvenPlayerConsole.log("WEBVTT LOADED");
+                        let parser = new WebVTT.Parser(window, WebVTT.StringDecoder());
+                        vttCues = [];
+                        parser.oncue = function (cue) {
+                            vttCues.push(cue);
+                        };
+                        parser.onflush = function () {
+                            //delete track.xhr;
+                            successCallback(vttCues);
+                        };
+                        // Parse calls onflush internally
+                        parser.parse(body);
+                        parser.flush();
+                    } else if (body.indexOf('SAMI') >= 0) {
+                        OvenPlayerConsole.log("SAMI LOADED");
+                        let parsedData = SmiParser(body, {fixedLang: language});
+                        vttCues = convertToVTTCues(parsedData.result);
+                        successCallback(vttCues);
+
+                    } else {
+                        OvenPlayerConsole.log("SRT LOADED");
+                        cues = SrtParser(body);
+                        vttCues = convertToVTTCues(cues);
+                        successCallback(vttCues);
+                    }
+                }).catch(function (e) {
+                    errorCallback(e);
+                });
+
+            } else {
+                errorCallback(response.status);
+            }
+        }).catch(function (e) {
+            errorCallback(e);
+        });
+
+    };
+
+    return that;
+};
+
+export default Loader;

package/src/js/api/caption/Manager.js

@@ -1,141 +1,143 @@
-/**
- * Created by hoho on 2018. 5. 17..
- */
-import CaptionLoader from 'api/caption/Loader';
-import {READY, ERRORS, ERROR, PLAYER_CAPTION_ERROR, CONTENT_META, CONTENT_TIME, CONTENT_CAPTION_CUE_CHANGED, CONTENT_CAPTION_CHANGED} from "api/constants";
-import _ from "utils/underscore";
-
-const isSupport = function(kind){
-    return kind === 'subtitles' || kind === 'captions';
-};
-
-const Manager = function(api, playlistIndex){
-
-    const that = {};
-    let captionList = [];
-    let currentCaptionIndex = -1;
-
-    let captionLoader = CaptionLoader();
-    let isFisrtLoad = true;
-    let isShowing = false;
-
-    OvenPlayerConsole.log("Caption Manager >> ", playlistIndex);
-
-
-    let bindTrack = function(track, vttCues){
-        track.data = vttCues || [];
-        track.name = track.label || track.name || track.language;
-        track.id = (function(track, tracksCount) {
-            var trackId;
-            var prefix = track.kind || 'cc';
-            if (track.default || track.defaulttrack) {
-                trackId = 'default';
-
-            } else {
-                trackId = track.id || (prefix + tracksCount);
-            }
-            if(isFisrtLoad){
-                //This execute only on. and then use flushCaptionList(lastCaptionIndex);
-                changeCurrentCaption(captionList.length||0);
-                isFisrtLoad = false;
-
-            }
-            return trackId;
-        })(track, captionList.length);
-
-        captionList.push(track);
-        return track.id;
-    };
-    let changeCurrentCaption = function(index){
-        currentCaptionIndex = index;
-        api.trigger(CONTENT_CAPTION_CHANGED, currentCaptionIndex);
-    };
-    if(api.getConfig().playlist && api.getConfig().playlist.length > 0){
-        let playlist = api.getConfig().playlist[playlistIndex];
-
-        if(playlist && playlist.tracks && playlist.tracks.length > 0){
-            for(let i = 0; i < playlist.tracks.length; i ++){
-                const track = playlist.tracks[i];
-
-                if(isSupport(track.kind) && ! _.findWhere(track, {file : track.file})){
-                    //that.flushCaptionList(currentCaptionIndex);
-
-                    captionLoader.load(track, track.lang, function(vttCues){
-                        if(vttCues && vttCues.length > 0){
-                            let captionId = bindTrack(track, vttCues);
-                        }
-                    }, function(error){
-                        let tempError = ERRORS.codes[PLAYER_CAPTION_ERROR];
-                        tempError.error = error;
-                        api.trigger(ERROR, tempError);
-                    });
-                }
-            }
-
-        }
-    }
-
-    api.on(CONTENT_TIME, function(meta){
-        let position = meta.position;
-        if(currentCaptionIndex > -1 && captionList[currentCaptionIndex]){
-            let currentCues = _.filter(captionList[currentCaptionIndex].data, function (cue) {
-                return position >= (cue.startTime) && ( (!cue.endTime || position) <= cue.endTime);
-            });
-            if(currentCues && currentCues.length > 0){
-                api.trigger(CONTENT_CAPTION_CUE_CHANGED, currentCues[0]);
-            }
-        }
-
-    });
-    that.flushCaptionList = (lastCaptionIndex) =>{
-        captionList = [];
-        changeCurrentCaption(lastCaptionIndex);
-        //currentCaptionIndex = lastCaptionIndex;
-    };
-    that.getCaptionList = () =>{
-        return captionList||[];
-    };
-    that.getCurrentCaption = () =>{
-        return currentCaptionIndex;
-    };
-    that.setCurrentCaption = (_index) =>{
-        if(_index > -2 && _index < captionList.length){
-            changeCurrentCaption(_index);
-        }else{
-            return null;
-        }
-    };
-    that.addCaption = (track) =>{
-        if(isSupport(track.kind) && ! _.findWhere(captionLoader, {file : track.file})){
-            captionLoader.load(track, function(vttCues){
-                if(vttCues && vttCues.length > 0){
-                    bindTrack(track, vttCues);
-                }
-            }, function(error){
-                let tempError = errors[PLAYER_CAPTION_ERROR];
-                tempError.error = error;
-                api.trigger(ERROR, tempError);
-            });
-        }
-    };
-    that.removeCaption = (index) => {
-        if(index > -1 && index < captionList.length){
-            captionList.splice(index, 1);
-            return captionList;
-        }else{
-            return null;
-        }
-    };
-    that.destroy = () => {
-        captionList = [];
-        captionLoader = null;
-        api.off(CONTENT_TIME, null, that);
-    };
-
-    return that;
-};
-
-
-
-
-export default Manager;
+/**
+ * Created by hoho on 2018. 5. 17..
+ */
+import CaptionLoader from 'api/caption/Loader';
+import {READY, ERRORS, ERROR, PLAYER_CAPTION_ERROR, CONTENT_META, CONTENT_TIME, CONTENT_CAPTION_CUE_CHANGED, CONTENT_CAPTION_CHANGED} from "api/constants";
+import _ from "utils/underscore";
+
+const isSupport = function(kind){
+    return kind === 'subtitles' || kind === 'captions';
+};
+
+const Manager = function(api, playlistIndex){
+
+    const that = {};
+    let captionList = [];
+    let currentCaptionIndex = -1;
+
+    let captionLoader = CaptionLoader();
+    let isFisrtLoad = true;
+    let isShowing = false;
+
+    OvenPlayerConsole.log("Caption Manager >> ", playlistIndex);
+
+
+    let bindTrack = function(track, vttCues){
+        track.data = vttCues || [];
+        track.name = track.label || track.name || track.language;
+        track.id = (function(track, tracksCount) {
+            var trackId;
+            var prefix = track.kind || 'cc';
+            if (track.default || track.defaulttrack) {
+                trackId = 'default';
+
+            } else {
+                trackId = track.id || (prefix + tracksCount);
+            }
+            if(isFisrtLoad){
+                //This execute only on. and then use flushCaptionList(lastCaptionIndex);
+                changeCurrentCaption(captionList.length||0);
+                isFisrtLoad = false;
+
+            }
+            return trackId;
+        })(track, captionList.length);
+
+        captionList.push(track);
+        return track.id;
+    };
+    let changeCurrentCaption = function(index){
+        currentCaptionIndex = index;
+        api.trigger(CONTENT_CAPTION_CHANGED, currentCaptionIndex);
+    };
+    if(api.getConfig().playlist && api.getConfig().playlist.length > 0){
+        let playlist = api.getConfig().playlist[playlistIndex];
+
+        if(playlist && playlist.tracks && playlist.tracks.length > 0){
+            for(let i = 0; i < playlist.tracks.length; i ++){
+                const track = playlist.tracks[i];
+
+                if(isSupport(track.kind) && ! _.findWhere(track, {file : track.file})){
+                    //that.flushCaptionList(currentCaptionIndex);
+
+                    captionLoader.load(track, track.lang, function(vttCues){
+                        if (vttCues && vttCues.length > 0) {
+                            if (!captionList.find(c => c.file === track.file)) {
+                                let captionId = bindTrack(track, vttCues);
+                            }
+                        }
+                    }, function(error){
+                        let tempError = ERRORS.codes[PLAYER_CAPTION_ERROR];
+                        tempError.error = error;
+                        api.trigger(ERROR, tempError);
+                    });
+                }
+            }
+
+        }
+    }
+
+    api.on(CONTENT_TIME, function(meta){
+        let position = meta.position;
+        if(currentCaptionIndex > -1 && captionList[currentCaptionIndex]){
+            let currentCues = _.filter(captionList[currentCaptionIndex].data, function (cue) {
+                return position >= (cue.startTime) && ( (!cue.endTime || position) <= cue.endTime);
+            });
+            if(currentCues && currentCues.length > 0){
+                api.trigger(CONTENT_CAPTION_CUE_CHANGED, currentCues[0]);
+            }
+        }
+
+    });
+    that.flushCaptionList = (lastCaptionIndex) =>{
+        captionList = [];
+        changeCurrentCaption(lastCaptionIndex);
+        //currentCaptionIndex = lastCaptionIndex;
+    };
+    that.getCaptionList = () =>{
+        return captionList||[];
+    };
+    that.getCurrentCaption = () =>{
+        return currentCaptionIndex;
+    };
+    that.setCurrentCaption = (_index) =>{
+        if(_index > -2 && _index < captionList.length){
+            changeCurrentCaption(_index);
+        }else{
+            return null;
+        }
+    };
+    that.addCaption = (track) =>{
+        if(isSupport(track.kind) && ! _.findWhere(captionLoader, {file : track.file})){
+            captionLoader.load(track, function(vttCues){
+                if(vttCues && vttCues.length > 0){
+                    bindTrack(track, vttCues);
+                }
+            }, function(error){
+                let tempError = errors[PLAYER_CAPTION_ERROR];
+                tempError.error = error;
+                api.trigger(ERROR, tempError);
+            });
+        }
+    };
+    that.removeCaption = (index) => {
+        if(index > -1 && index < captionList.length){
+            captionList.splice(index, 1);
+            return captionList;
+        }else{
+            return null;
+        }
+    };
+    that.destroy = () => {
+        captionList = [];
+        captionLoader = null;
+        api.off(CONTENT_TIME, null, that);
+    };
+
+    return that;
+};
+
+
+
+
+export default Manager;