feat(dash adapter): hide text track api (#13)

kaltura · Jun 26, 2017 · 24e6e78 · 24e6e78
1 parent 252c026
commit 24e6e78
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 12 deletions.
diff --git a/dist/playkit-dash.js b/dist/playkit-dash.js
diff --git a/dist/playkit-dash.js.map b/dist/playkit-dash.js.map
diff --git a/dist/playkit-dash.min.js b/dist/playkit-dash.min.js
diff --git a/dist/playkit-dash.min.js.map b/dist/playkit-dash.min.js.map
diff --git a/src/dash-adapter.js b/src/dash-adapter.js
@@ -272,7 +272,7 @@ export default class DashAdapter extends BaseMediaSourceAdapter {
     if ((videoTrack instanceof VideoTrack) && videoTracks) {
       let selectedVideoTrack = videoTracks[videoTrack.index];
       if (selectedVideoTrack) {
-        this._shaka.configure({abr:{enabled: false}});
+        this._shaka.configure({abr: {enabled: false}});
         if (!selectedVideoTrack.active) {
           this._shaka.selectVariantTrack(videoTracks[videoTrack.index], true);
           this._onTrackChanged(videoTrack);
@@ -305,18 +305,29 @@ export default class DashAdapter extends BaseMediaSourceAdapter {
   selectTextTrack(textTrack: TextTrack): void {
     if ((textTrack instanceof TextTrack) && !textTrack.active && (textTrack.kind === 'subtitles' || textTrack.kind === 'captions')) {
       this._shaka.selectTextLanguage(textTrack.language);
+      this._shaka.setTextTrackVisibility(true);
       this._onTrackChanged(textTrack);
     }
   }
 
+  /**
+   * Hide the text track
+   * @function hideTextTrack
+   * @returns {void}
+   * @public
+   */
+  hideTextTrack(): void {
+    this._shaka.setTextTrackVisibility(false);
+  }
+
   /**
    * Enables adaptive bitrate switching
    * @function enableAdaptiveBitrate
    * @returns {void}
    * @public
    */
   enableAdaptiveBitrate(): void {
-    this._shaka.configure({abr:{enabled: true}});
+    this._shaka.configure({abr: {enabled: true}});
   }
 
   /**

diff --git a/test/src/dash-adapter.spec.js b/test/src/dash-adapter.spec.js
@@ -41,10 +41,11 @@ describe.skip('DashAdapter [debugging and testing manually]', () => {
     player = playkit({
       sources: [source]
     });
-    player.load().then(() => {
+    player.ready().then(() => {
       displayTracksOnScreen();
-      player.play();
     });
+    player.load();
+    window.player = player;
   });
 });
 
@@ -261,12 +262,15 @@ describe('DashAdapter: selectVideoTrack', () => {
   });
 
   it('should select a new video track', (done) => {
+    let inactiveTrack;
+    let onVideoTrackChanged = (event) => {
+      dashInstance.removeEventListener('videotrackchanged', onVideoTrackChanged);
+      event.payload.selectedVideoTrack.id.should.be.equal(inactiveTrack.id);
+      done();
+    };
     dashInstance.load().then(() => {
-      dashInstance.addEventListener('videotrackchanged', (event) => {
-        event.payload.selectedVideoTrack.id.should.be.equal(inactiveTrack.id);
-        done();
-      });
-      let inactiveTrack = dashInstance._getParsedVideoTracks().filter((track) => {
+      dashInstance.addEventListener('videotrackchanged', onVideoTrackChanged);
+      inactiveTrack = dashInstance._getParsedVideoTracks().filter((track) => {
         return !track.active;
       })[0];
       dashInstance.selectVideoTrack(inactiveTrack);