@desynova-digital/player 4.1.11 → 4.1.13

package/components/Video.js

@@ -580,7 +580,6 @@ var Video = exports["default"] = /*#__PURE__*/function (_Component) {
         this.combineM3U8Manifests(originalSrc, effectiveDubbedTracks).then(function (_ref2) {
           var combinedManifest = _ref2.combinedManifest,
             dubbedTrackNames = _ref2.dubbedTrackNames;
-          // Store the list of dubbed track names
           self.dubbedTrackNames = dubbedTrackNames;
           var blob = new Blob([combinedManifest], {
             type: 'application/vnd.apple.mpegurl'
@@ -598,7 +597,6 @@ var Video = exports["default"] = /*#__PURE__*/function (_Component) {
         attachAndLoad(originalSrc);
       }
       this.hls.on(_hls["default"].Events.MANIFEST_PARSED, function (event, data) {
-        // Add isDubbedTrack flag to audio tracks
         var audioTracksWithFlag = (data.audioTracks || []).map(function (track) {
           if (self.dubbedTrackNames && self.dubbedTrackNames.includes(track.name)) {
             return _objectSpread(_objectSpread({}, track), {}, {
@@ -608,10 +606,36 @@ var Video = exports["default"] = /*#__PURE__*/function (_Component) {
           return track;
         });
         actions.handleAudioTracks(audioTracksWithFlag);
-      });
-      this.hls.once(_hls["default"].Events.AUDIO_TRACK_LOADED, function (event, data) {
-        var trackIndex = activeTrackIndex || 0;
-        actions.handleAudioTrackChange(self.props.player.audioTracksArr[trackIndex]);
+        var defaultIndex;
+        var firstDubbedIndex = audioTracksWithFlag.findIndex(function (t) {
+          return t.isDubbedTrack;
+        });
+        if (firstDubbedIndex !== -1) {
+          defaultIndex = firstDubbedIndex;
+        } else {
+          if (activeTrackIndex !== undefined && activeTrackIndex < audioTracksWithFlag.length) {
+            defaultIndex = activeTrackIndex;
+          } else {
+            var autoselectIndex = data.audioTracks.findIndex(function (t) {
+              return t.autoselect;
+            });
+            defaultIndex = autoselectIndex !== -1 ? autoselectIndex : 0;
+          }
+        }
+        self.hls.audioTrack = defaultIndex;
+        self.hls.once(_hls["default"].Events.AUDIO_TRACK_SWITCHED, function (event, switchData) {
+          var switchedTrack = audioTracksWithFlag.find(function (t) {
+            return t.id === switchData.id;
+          });
+          if (switchedTrack) {
+            actions.handleAudioTrackChange(switchedTrack);
+          } else {
+            var fallbackTrack = audioTracksWithFlag[defaultIndex];
+            if (fallbackTrack) {
+              actions.handleAudioTrackChange(fallbackTrack);
+            }
+          }
+        });
       });
       this.hls.on(_hls["default"].Events.ERROR, function (event, data) {
         console.log('HLS.Events.ERROR: ', event, data);

package/components/control-bar/AudioTracksMenuButton.js

@@ -75,7 +75,7 @@ var AudioTracksMenuButton = /*#__PURE__*/function (_Component) {
       });
     });
     _this.state = {
-      openAccordion: 'original'
+      openAccordion: 'dubbed'
     };
     return _this;
   }
@@ -104,18 +104,18 @@ var AudioTracksMenuButton = /*#__PURE__*/function (_Component) {
         player = _this$props.player,
         actions = _this$props.actions;
       var allTracks = player.audioTracksArr || [];
-      if (allTracks.length === 0) return;
-      var currentActive = player.activeAudio;
-      var isCurrentTrackValid = currentActive && allTracks.some(function (track) {
-        return track.id === currentActive.id;
+      var dubbedTracks = allTracks.filter(function (track) {
+        return track.isDubbedTrack === true;
       });
-      if (!isCurrentTrackValid) {
-        var firstOriginalTrack = allTracks.find(function (track) {
-          return track.autoselect;
+      if (allTracks.length === 0) return;
+      if (dubbedTracks.length) {
+        this.setState({
+          openAccordion: 'dubbed'
+        });
+      } else {
+        this.setState({
+          openAccordion: 'original'
         });
-        if (firstOriginalTrack) {
-          actions.handleAudioTrackChange(firstOriginalTrack);
-        }
       }
     }
   }, {

package/package.json

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