Move stop function to playbackManager

src/components/commandHandler.js

@@ -129,7 +129,7 @@ export class commandHandler {
     }
 
     StopHandler() {
-        stop();
+        this.playerManager.stop();
     }
 
     PlayPauseHandler() {

src/components/maincontroller.js

@@ -132,7 +132,7 @@ mgr.defaultOnPause = function (event) {
 mgr.addEventListener('PAUSE', mgr.defaultOnPause);
 
 mgr.defaultOnStop = function (event) {
-    stop();
+    playbackMgr.stop();
 };
 mgr.addEventListener('ABORT', mgr.defaultOnStop);
 
@@ -153,32 +153,6 @@ mgr.addEventListener('ENDED', function () {
     }
 });
 
-export function stop(nextMode) {
-
-    $scope.playNextItem = nextMode ? true : false;
-    jellyfinActions.stop($scope);
-
-    var reportingParams = getReportingParams($scope);
-
-    var promise;
-
-    jellyfinActions.stopPingInterval();
-
-    if (reportingParams.ItemId) {
-        promise = jellyfinActions.reportPlaybackStopped($scope, reportingParams);
-    }
-
-    window.mediaManager.stop();
-
-    window.playlist = [];
-    window.currentPlaylistIndex = -1;
-    jellyfinActions.displayUserInfo($scope, $scope.serverAddress, $scope.accessToken, $scope.userId);
-
-    promise = promise || Promise.resolve();
-
-    return promise;
-}
-
 window.castReceiverContext.addEventListener(cast.framework.system.EventType.SYSTEM_VOLUME_CHANGED, function (event) {
     console.log("### Cast Receiver Manager - System Volume Changed : " + JSON.stringify(event.data));
 

src/components/playbackManager.js

@@ -3,7 +3,8 @@ import {
     getIntros,
     setAppStatus,
     broadcastConnectionErrorMessage,
-    tagItems
+    tagItems,
+    getReportingParams
 } from "../helpers";
 
 import {
@@ -100,7 +101,7 @@ export class playbackManager {
 
         if (stopPlayer) {
 
-            stop("none").then(callback);
+            this.stop("none").then(callback);
         } else {
             callback();
         }
@@ -142,4 +143,30 @@ export class playbackManager {
             }, broadcastConnectionErrorMessage);
         });
     }
+
+    stop(nextMode) {
+
+        $scope.playNextItem = nextMode ? true : false;
+        jellyfinActions.stop($scope);
+
+        var reportingParams = getReportingParams($scope);
+
+        var promise;
+
+        jellyfinActions.stopPingInterval();
+
+        if (reportingParams.ItemId) {
+            promise = jellyfinActions.reportPlaybackStopped($scope, reportingParams);
+        }
+
+        this.playerManager.stop();
+
+        this.activePlaylist = [];
+        this.activePlaylistIndex = -1;
+        jellyfinActions.displayUserInfo($scope, $scope.serverAddress, $scope.accessToken, $scope.userId);
+
+        promise = promise || Promise.resolve();
+
+        return promise;
+    }
 }