deprecate LEVEL_SWITCH/AUDIO_TRACK_SWITCH

biggun1860 · Mar 13, 2018 · d74480f · d74480f
1 parent 2d258f6
commit d74480f
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 9 deletions.
diff --git a/src/controller/audio-track-controller.js b/src/controller/audio-track-controller.js
@@ -121,8 +121,6 @@ class AudioTrackController extends EventHandler {
         type = audioTrack.type,
         url = audioTrack.url,
         eventObj = { id: newId, type: type, url: url };
-      // keep AUDIO_TRACK_SWITCH for legacy reason
-      hls.trigger(Event.AUDIO_TRACK_SWITCH, eventObj);
       hls.trigger(Event.AUDIO_TRACK_SWITCHING, eventObj);
       // check if we need to load playlist for this audio Track
       let details = audioTrack.details;

diff --git a/src/controller/level-controller.js b/src/controller/level-controller.js
@@ -169,8 +169,6 @@ export default class LevelController extends EventHandler {
         this.currentLevelIndex = newLevel;
         let levelProperties = levels[newLevel];
         levelProperties.level = newLevel;
-        // LEVEL_SWITCH to be deprecated in next major release
-        hls.trigger(Event.LEVEL_SWITCH, levelProperties);
         hls.trigger(Event.LEVEL_SWITCHING, levelProperties);
       }
       let level = levels[newLevel], levelDetails = level.details;

diff --git a/src/events.js b/src/events.js
@@ -33,8 +33,6 @@ const HlsEvents = {
   MANIFEST_LOADED: 'hlsManifestLoaded',
   // fired after manifest has been parsed - data: { levels : [available quality levels], firstLevel : index of first quality level appearing in Manifest}
   MANIFEST_PARSED: 'hlsManifestParsed',
-  // fired when a level switch is requested - data: { level : id of new level } // deprecated in favor LEVEL_SWITCHING
-  LEVEL_SWITCH: 'hlsLevelSwitch',
   // fired when a level switch is requested - data: { level : id of new level }
   LEVEL_SWITCHING: 'hlsLevelSwitching',
   // fired when a level switch is effective - data: { level : id of new level }
@@ -49,8 +47,6 @@ const HlsEvents = {
   LEVEL_PTS_UPDATED: 'hlsLevelPtsUpdated',
   // fired to notify that audio track lists has been updated - data: { audioTracks : audioTracks }
   AUDIO_TRACKS_UPDATED: 'hlsAudioTracksUpdated',
-  // fired when an audio track switch occurs - data: { id : audio track id } // deprecated in favor AUDIO_TRACK_SWITCHING
-  AUDIO_TRACK_SWITCH: 'hlsAudioTrackSwitch',
   // fired when an audio track switching is requested - data: { id : audio track id }
   AUDIO_TRACK_SWITCHING: 'hlsAudioTrackSwitching',
   // fired when an audio track switch actually occurs - data: { id : audio track id }

diff --git a/tests/unit/controller/level-controller.js b/tests/unit/controller/level-controller.js
@@ -76,7 +76,7 @@ describe('LevelController', () => {
     levelController.onManifestLoaded(data);
     levelController.level = nextLevel;
 
-    assert.equal(levelController.hls.trigger.args[1][0], Event.LEVEL_SWITCH);
+    assert.equal(levelController.hls.trigger.args[1][0], Event.LEVEL_SWITCHING);
     assert.equal(levelController.hls.trigger.args[1][1].level, nextLevel);
   });
 });