add resetInitialSettings function for Stream. It has to be called by …

…setup and reset functions
Dash-Industry-Forum · Jun 21, 2017 · f91b4db · f91b4db
1 parent 1e3208a
commit f91b4db
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/src/streaming/Stream.js b/src/streaming/Stream.js
@@ -79,12 +79,7 @@ function Stream(config) {
         trackChangedEvent;
 
     function setup() {
-        streamProcessors = [];
-        isStreamActivated = false;
-        isMediaInitialized = false;
-        streamInfo = null;
-        updateError = {};
-        isUpdating = false;
+        resetInitialSettings();
 
         liveEdgeFinder = LiveEdgeFinder(context).getInstance();
         fragmentController = FragmentController(context).create({
@@ -130,7 +125,7 @@ function Stream(config) {
      * @memberof Stream#
      */
     function deactivate() {
-        let ln = streamProcessors.length;
+        let ln = streamProcessors ? streamProcessors.length : 0;
         for (let i = 0; i < ln; i++) {
             streamProcessors[i].reset();
         }
@@ -141,6 +136,13 @@ function Stream(config) {
         eventBus.off(Events.CURRENT_TRACK_CHANGED, onCurrentTrackChanged, instance);
     }
 
+    function resetInitialSettings() {
+        deactivate();
+        streamInfo = null;
+        updateError = {};
+        isUpdating = false;
+    }
+
     function reset() {
 
         if (playbackController) {
@@ -153,7 +155,7 @@ function Stream(config) {
             fragmentController = null;
         }
 
-        deactivate();
+        resetInitialSettings();
         mediaController = null;
         abrController = null;
         manifestUpdater = null;
@@ -162,8 +164,6 @@ function Stream(config) {
         capabilities = null;
         log = null;
         errHandler = null;
-        isUpdating = false;
-        updateError = {};
 
         eventBus.off(Events.DATA_UPDATE_COMPLETED, onDataUpdateCompleted, instance);
         eventBus.off(Events.BUFFERING_COMPLETED, onBufferingCompleted, instance);