@desynova-digital/player 3.13.1 → 3.13.2

package/actions/player.js

@@ -3,13 +3,12 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.ZOOM_CHANGE = exports.USER_ACTIVATE = exports.SD_BORDER_SWITCH = exports.REWIND_VIDEO = exports.PREVIEW_VIDEO = exports.PLAYER_TYPE = exports.PLAYER_ACTIVATE = exports.OPERATE = exports.MARKER_UPDATE = exports.MARKER_POINT_CHANGE = exports.MARKER_CREATE = exports.FULLSCREEN_CHANGE = exports.CONTROL_TYPE = exports.AUDIO_TRACKS_AND_ACTIVE_AUDIO_TRACK = exports.AUDIO_TRACKS = exports.ACTIVE_AUDIO_TRACK = void 0;
+exports.ZOOM_CHANGE = exports.USER_ACTIVATE = exports.SD_BORDER_SWITCH = exports.REWIND_VIDEO = exports.PREVIEW_VIDEO = exports.PLAYER_TYPE = exports.PLAYER_ACTIVATE = exports.OPERATE = exports.MARKER_UPDATE = exports.MARKER_POINT_CHANGE = exports.MARKER_CREATE = exports.FULLSCREEN_CHANGE = exports.CONTROL_TYPE = exports.AUDIO_TRACKS = exports.ACTIVE_AUDIO_TRACK = void 0;
 exports.activate = activate;
 exports.changeRate = changeRate;
 exports.changeVolume = changeVolume;
 exports.forward = forward;
 exports.handleAudioTrackChange = handleAudioTrackChange;
-exports.handleAudioTrackChangeAndUpdateTrackSelection = handleAudioTrackChangeAndUpdateTrackSelection;
 exports.handleAudioTracks = handleAudioTracks;
 exports.handleControlType = handleControlType;
 exports.handleFullscreenChange = handleFullscreenChange;
@@ -60,8 +59,6 @@ var AUDIO_TRACKS = 'video-react/AUDIO_TRACKS';
 exports.AUDIO_TRACKS = AUDIO_TRACKS;
 var ACTIVE_AUDIO_TRACK = 'video-react/ACTIVE_AUDIO_TRACK';
 exports.ACTIVE_AUDIO_TRACK = ACTIVE_AUDIO_TRACK;
-var AUDIO_TRACKS_AND_ACTIVE_AUDIO_TRACK = 'video-react/AUDIO_TRACKS_AND_ACTIVE_AUDIO_TRACK';
-exports.AUDIO_TRACKS_AND_ACTIVE_AUDIO_TRACK = AUDIO_TRACKS_AND_ACTIVE_AUDIO_TRACK;
 function handleFullscreenChange(isFullscreen) {
   return {
     type: FULLSCREEN_CHANGE,
@@ -344,10 +341,4 @@ function handleSDBorderChange(SDBorderActive) {
     SDBorderActive: SDBorderActive
   };
   return data;
-}
-function handleAudioTrackChangeAndUpdateTrackSelection(trackObj) {
-  return {
-    type: AUDIO_TRACKS_AND_ACTIVE_AUDIO_TRACK,
-    trackObj: trackObj
-  };
 }

package/components/Video.js

@@ -8,7 +8,7 @@ exports["default"] = void 0;
 var _propTypes = require("prop-types");
 var _react = _interopRequireWildcard(require("react"));
 var _styledComponents = _interopRequireDefault(require("styled-components"));
-var _hls = _interopRequireDefault(require("hls.js"));
+var _hls2 = _interopRequireDefault(require("hls.js"));
 var _Manager = _interopRequireDefault(require("../Manager"));
 var _utils = require("../utils");
 var _BigPlayButton = _interopRequireDefault(require("./BigPlayButton"));
@@ -172,10 +172,10 @@ var Video = /*#__PURE__*/function (_Component) {
       this.setState({
         isM3U8: isM3U8
       });
-      if (_hls["default"].isSupported() && isM3U8) {
+      if (_hls2["default"].isSupported() && isM3U8) {
         var _this$manager$getStat = this.manager.getState(),
           HLSConfig = _this$manager$getStat.player.HLSConfig;
-        this.hls = new _hls["default"](HLSConfig);
+        this.hls = new _hls2["default"](HLSConfig);
         this.setupHLS(src);
       } else {
         this.video.src = src;
@@ -192,7 +192,7 @@ var Video = /*#__PURE__*/function (_Component) {
       var _this$state = this.state,
         isM3U8 = _this$state.isM3U8,
         watermarkInterval = _this$state.watermarkInterval;
-      if (_hls["default"].isSupported() && isM3U8) {
+      if (_hls2["default"].isSupported() && isM3U8) {
         this.hls.detachMedia();
       } else {
         this.video.src = '';
@@ -248,30 +248,26 @@ var Video = /*#__PURE__*/function (_Component) {
       var self = this;
       // bind them together
       this.hls.attachMedia(this.video);
-      this.hls.on(_hls["default"].Events.MEDIA_ATTACHED, function () {
+      this.hls.on(_hls2["default"].Events.MEDIA_ATTACHED, function () {
         self.hls.loadSource(src);
       });
-      this.hls.on(_hls["default"].Events.MANIFEST_PARSED, function (event, data) {
+      this.hls.on(_hls2["default"].Events.MANIFEST_PARSED, function (event, data) {
+        actions.handleAudioTracks(data.audioTracks);
+      });
+      this.hls.on(_hls["default"].Events.AUDIO_TRACK_LOADED, function (event, data) {
         var trackIndex = activeTrackIndex || 0;
-        var dataObj = {
-          audioTracks: data.audioTracks,
-          audioTrack: data.audioTracks[trackIndex]
-        };
-        actions.handleAudioTrackChangeAndUpdateTrackSelection(dataObj);
-        // actions.handleAudioTracks(data.audioTracks);
-        // actions.handleAudioTrackChange(data.audioTracks[trackIndex]);
+        actions.handleAudioTrackChange(self.props.player.audioTracksArr[trackIndex]);
       });
-
-      this.hls.on(_hls["default"].Events.ERROR, function (event, data) {
+      this.hls.on(_hls2["default"].Events.ERROR, function (event, data) {
         // eslint-disable-next-line no-console
         console.log('HLS.Events.ERROR: ', event, data);
         if (data.fatal) {
           switch (data.type) {
-            case _hls["default"].ErrorTypes.NETWORK_ERROR:
+            case _hls2["default"].ErrorTypes.NETWORK_ERROR:
               // try to recover network error
               _this2.hls.startLoad();
               break;
-            case _hls["default"].ErrorTypes.MEDIA_ERROR:
+            case _hls2["default"].ErrorTypes.MEDIA_ERROR:
               _this2.hls.recoverMediaError();
               break;
             default:
@@ -446,7 +442,7 @@ var Video = /*#__PURE__*/function (_Component) {
         markers = _this$props4.markers;
       if (newProps.src !== src) {
         var isM3U8 = this.state.isM3U8;
-        if (_hls["default"].isSupported() && isM3U8) {
+        if (_hls2["default"].isSupported() && isM3U8) {
           this.hls.detachMedia();
         } else {
           this.video.src = '';
@@ -455,10 +451,10 @@ var Video = /*#__PURE__*/function (_Component) {
         this.setState({
           isM3U8: m3u8
         });
-        if (_hls["default"].isSupported() && m3u8) {
+        if (_hls2["default"].isSupported() && m3u8) {
           var _this$manager$getStat3 = this.manager.getState(),
             HLSConfig = _this$manager$getStat3.player.HLSConfig;
-          this.hls = new _hls["default"](HLSConfig);
+          this.hls = new _hls2["default"](HLSConfig);
           this.setupHLS(newProps.src);
         } else {
           this.video.src = newProps.src;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@desynova-digital/player",
-  "version": "3.13.1",
+  "version": "3.13.2",
   "description": "Video Player Package for Contido Application",
   "main": "index.js",
   "scripts": {

package/reducers/player.js

@@ -216,13 +216,6 @@ function player() {
         }
         return newState;
       }
-    case _player.AUDIO_TRACKS_AND_ACTIVE_AUDIO_TRACK:
-      {
-        return _objectSpread(_objectSpread({}, state), {}, {
-          audioTracksArr: action.trackObj.audioTracks,
-          activeAudio: action.trackObj.audioTrack || state.track || 0
-        });
-      }
     default:
       return state;
   }