senza-sdk 4.2.51-aaec443.0 → 4.2.51-c4000e6.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "senza-sdk",
-    "version": "4.2.51-aaec443.0",
+    "version": "4.2.51-c4000e6.0",
     "main": "./src/api.js",
     "description": "API for Senza application",
     "license": "MIT",

package/src/remotePlayer.js

@@ -1704,32 +1704,33 @@ class RemotePlayer extends EventTarget {
     async _atomicSetSubtitleLanguage() {
         sdkLogger.info("SetSubtitleLanguage: local video element set start while isPLaying=", this._isPlaying);
 
-        this._targetSeekPlayingState = this._isPlaying ? TargetPlayingState.PLAYING_UI : TargetPlayingState.PAUSED;
+        this._targetSetSubtitlePlayingState = this._isPlaying ? TargetPlayingState.PLAYING_UI : TargetPlayingState.PAUSED;
         this._abortSetSubtitleLanguage = false;
         this._isSetSubtitleByApplication = true;
 
         let state = SetSubtitleLanguageState.INIT;
 
         let previousPendingSubtitleLanguage = this._pendingSubtitleLanguage;
-        let initialSubtitleLanguage= this._pendingSubtitleLanguage;
+        let initialSubtitleLanguage = this._pendingSubtitleLanguage;
         let res;
 
         while (!this._abortSetSubtitleLanguage && state !== SetSubtitleLanguageState.DONE) {
             try {
-                // TODO - Implement the logic for setting audio language
                 switch(state) {
                 case SetSubtitleLanguageState.INIT:
                     state = this._isPlaying ? SetSubtitleLanguageState.STOPPED : SetSubtitleLanguageState.SET;
                     break;
                 case SetSubtitleLanguageState.STOPPED:
+                    //sdkLogger.error("BEFORE STOP BEFORE SET SUBTITLE");
                     await lifecycle.moveToForeground();
+                    //sdkLogger.error("AFTER STOP BEFORE SET SUBTITLE");
                     state = SetSubtitleLanguageState.SET;
                     break;
                 case SetSubtitleLanguageState.SET:
                     initialSubtitleLanguage = this._pendingSubtitleLanguage;
                     previousPendingSubtitleLanguage = this._selectedSubtitleTrack;
                     res = await this._selectTextTrackV3(initialSubtitleLanguage, previousPendingSubtitleLanguage);
-                    sdkLogger.error("BEFORE PLAY AFTER SET SUBTITLE 1");
+                    //sdkLogger.error("BEFORE PLAY AFTER SET SUBTITLE 1");
                     state = SetSubtitleLanguageState.DONE;
                     break;
                 }
@@ -1737,27 +1738,28 @@ class RemotePlayer extends EventTarget {
                 sdkLogger.error(`Error during set subtitle process: ${error.message}`);
                 state = SetSubtitleLanguageState.DONE;
                 res = Promise.reject(error);
-            } finally {
-                if (!this._abortSetSubtitleLanguage) {
-                    if (this._targetSeekPlayingState === TargetPlayingState.PLAYING_UI) {
-                        console.log("BEFORE PLAY AFTER SET SUBTITLE 2");
-                        await this._play();
-                    } else if (this._targetSeekPlayingState === TargetPlayingState.PLAYING_ABR) {
-                        console.log("BEFORE MOVE_TO_BACKGROUND AFTER SET SUBTITLE");
-                        await lifecycle._moveToBackground();
-                    }
-                }
-                this._isSetSubtitleByApplication = false;
-                sdkLogger.info("SetSubtitleLanguage: local video element set subtitle end");
             }
         }
+
+        if (!this._abortSetSubtitleLanguage) {
+            //sdkLogger.error("TARGET PLAYING STATE", this._targetSetSubtitlePlayingState);
+            if (this._targetSetSubtitlePlayingState === TargetPlayingState.PLAYING_UI) {
+                //sdkLogger.error("BEFORE PLAY AFTER SET SUBTITLE 2");
+                this._play();
+            } else if (this._targetSetSubtitlePlayingState === TargetPlayingState.PLAYING_ABR) {
+                //sdkLogger.error("BEFORE MOVE_TO_BACKGROUND AFTER SET SUBTITLE");
+                lifecycle._moveToBackground();
+            }
+        }
+        this._isSetSubtitleByApplication = false;
+        sdkLogger.info("SetSubtitleLanguage: local video element set subtitle end");
         return res
     }
 
     async _atomicSetAudioLanguage() {
         sdkLogger.info("SetAudioLanguage: local video element set start while isPLaying=", this._isPlaying);
 
-        this._targetSeekPlayingState = this._isPlaying ? TargetPlayingState.PLAYING_UI : TargetPlayingState.PAUSED;
+        this._targetSetAudioPlayingState = this._isPlaying ? TargetPlayingState.PLAYING_UI : TargetPlayingState.PAUSED;
         this._abortSetAudioLanguage = false;
         this._isSetAudioByApplication = true;
 
@@ -1782,7 +1784,7 @@ class RemotePlayer extends EventTarget {
                     initialAudioLanguage = this._pendingAudioLanguage;
                     previousPendingAudioLanguage = this._selectedAudioTrack;
                     res = await this._selectAudioTrackV3(initialAudioLanguage, previousPendingAudioLanguage);
-                    sdkLogger.error("BEFORE PLAY AFTER SET AUDIO 1");
+                    //sdkLogger.error("BEFORE PLAY AFTER SET AUDIO 1");
                     state = SetAudioLanguageState.DONE;
                     break;
                 }
@@ -1790,20 +1792,22 @@ class RemotePlayer extends EventTarget {
                 sdkLogger.error(`Error during set audio process: ${error.message}`);
                 state = SetAudioLanguageState.DONE;
                 res = Promise.reject(error);
-            } finally {
-                if (!this._abortSetAudioLanguage) {
-                    if (this._targetSeekPlayingState === TargetPlayingState.PLAYING_UI) {
-                        sdkLogger.error("BEFORE PLAY AFTER SET AUDIO 2");
-                        this._play();
-                    } else if (this._targetSeekPlayingState === TargetPlayingState.PLAYING_ABR) {
-                        sdkLogger.error("BEFORE MOVE_TO_BACKGROUND AFTER SET AUDIO");
-                        lifecycle._moveToBackground();
-                    }
-                }
-                this._isSetAudioByApplication = false;
-                sdkLogger.info("SetAudioLanguage: local video element set audio end");
             }
         }
+
+        if (!this._abortSetAudioLanguage) {
+            //sdkLogger.error("TARGET PLAYING STATE", this._targetSetAudioPlayingState);
+            if (this._targetSetAudioPlayingState === TargetPlayingState.PLAYING_UI) {
+                //sdkLogger.error("BEFORE PLAY AFTER SET AUDIO 2");
+                this._play();
+            } else if (this._targetSetAudioPlayingState === TargetPlayingState.PLAYING_ABR) {
+                //sdkLogger.error("BEFORE MOVE_TO_BACKGROUND AFTER SET AUDIO");
+                lifecycle._moveToBackground();
+            }
+        }
+
+        this._isSetAudioByApplication = false;
+        sdkLogger.info("SetAudioLanguage: local video element set audio end");
         return res
     }
 }