Merge pull request #256 from jellyfin/release-10.3.z

Backmerge release 10.3.0

src/components/chromecast/chromecasthelpers.js

@@ -187,8 +187,13 @@ define(['events'], function (events) {
         return apiClient.getEndpointInfo().then(function (endpoint) {
             if (endpoint.IsInNetwork) {
                 return apiClient.getPublicSystemInfo().then(function (info) {
-                    addToCache(serverAddress, info.LocalAddress);
-                    return info.LocalAddress;
+                    var localAddress = info.LocalAddress
+                    if (!localAddress) {
+                        console.log("No valid local address returned, defaulting to external one")
+                        localAddress = serverAddress;
+                    }
+                    addToCache(serverAddress, localAddress);
+                    return localAddress;
                 });
             } else {
                 addToCache(serverAddress, serverAddress);

src/components/chromecast/chromecastplayer.js

@@ -220,7 +220,9 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
             this.session = null;
             this.deviceState = DEVICE_STATE.IDLE;
             this.castPlayerState = PLAYER_STATE.IDLE;
-
+            document.removeEventListener("volumeupbutton", onVolumeUpKeyDown, false);
+            document.removeEventListener("volumedownbutton", onVolumeDownKeyDown, false);
+    
             //console.log('sessionUpdateListener: setting currentMediaSession to null');
             this.currentMediaSession = null;
 
@@ -258,6 +260,9 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
         this.session.addMediaListener(this.sessionMediaListener.bind(this));
         this.session.addUpdateListener(this.sessionUpdateListener.bind(this));
 
+        document.addEventListener("volumeupbutton", onVolumeUpKeyDown, false);
+        document.addEventListener("volumedownbutton", onVolumeDownKeyDown, false);
+
         events.trigger(this, 'connect');
 
         this.sendMessage({
@@ -266,6 +271,14 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
         });
     };
 
+    function onVolumeUpKeyDown() {
+        playbackManager.volumeUp();
+    }
+    
+    function onVolumeDownKeyDown() {
+        playbackManager.volumeDown();
+    }
+
     /**
      * session update listener
      */
@@ -305,6 +318,8 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
         //console.log(message);
         this.deviceState = DEVICE_STATE.IDLE;
         this.castPlayerState = PLAYER_STATE.IDLE;
+        document.removeEventListener("volumeupbutton", onVolumeUpKeyDown, false);
+        document.removeEventListener("volumedownbutton", onVolumeDownKeyDown, false);
 
         //console.log('onStopAppSuccess: setting currentMediaSession to null');
         this.currentMediaSession = null;
@@ -574,8 +589,15 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
 
             events.trigger(instance, "playbackstop", [state]);
 
+            var state = instance.lastPlayerData.PlayState || {};
+            var volume = state.VolumeLevel || 0.5;
+            var mute = state.IsMuted || false;
+
             // Reset this so the next query doesn't make it appear like content is playing.
             instance.lastPlayerData = {};
+            instance.lastPlayerData.PlayState = {};
+            instance.lastPlayerData.PlayState.VolumeLevel = volume;
+            instance.lastPlayerData.PlayState.IsMuted = mute;
         });
 
         events.on(instance._castPlayer, "playbackprogress", function (e, data) {
@@ -780,11 +802,16 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
     };
 
     ChromecastPlayer.prototype.volumeDown = function () {
+        var vol = this._castPlayer.session.receiver.volume.level;
+        if (vol == null)
+        {
+            vol = 0.5;
+        }
+        vol -= 0.05;
+        vol = Math.max(vol, 0);
+
+        this._castPlayer.session.setReceiverVolumeLevel(vol);
 
-        this._castPlayer.sendMessage({
-            options: {},
-            command: 'VolumeDown'
-        });
     };
 
     ChromecastPlayer.prototype.endSession = function () {
@@ -799,24 +826,24 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
     };
 
     ChromecastPlayer.prototype.volumeUp = function () {
+        var vol = this._castPlayer.session.receiver.volume.level;
+        if (vol == null)
+        {
+            vol = 0.5;
+        }
+        vol += 0.05;
+        vol = Math.min(vol, 1);
 
-        this._castPlayer.sendMessage({
-            options: {},
-            command: 'VolumeUp'
-        });
+        this._castPlayer.session.setReceiverVolumeLevel(vol);
     };
 
     ChromecastPlayer.prototype.setVolume = function (vol) {
 
         vol = Math.min(vol, 100);
         vol = Math.max(vol, 0);
-
-        this._castPlayer.sendMessage({
-            options: {
-                volume: vol
-            },
-            command: 'SetVolume'
-        });
+        vol = vol / 100;
+        
+        this._castPlayer.session.setReceiverVolumeLevel(vol);
     };
 
     ChromecastPlayer.prototype.unpause = function () {

src/components/playback/playbackmanager.js

@@ -1731,7 +1731,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
 
                 var maxBitrate = params.MaxStreamingBitrate || self.getMaxStreamingBitrate(player);
 
-                var currentPlayOptions = currentItem.playOptions || {};
+                var currentPlayOptions = currentItem.playOptions || getDefaultPlayOptions();
 
                 getPlaybackInfo(player, apiClient, currentItem, deviceProfile, maxBitrate, ticks, true, currentMediaSource.Id, audioStreamIndex, subtitleStreamIndex, liveStreamId, params.EnableDirectPlay, params.EnableDirectStream, params.AllowVideoStreamCopy, params.AllowAudioStreamCopy).then(function (result) {
 
@@ -2698,7 +2698,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
 
             if (newItem) {
 
-                var newItemPlayOptions = newItem.playOptions || {};
+                var newItemPlayOptions = newItem.playOptions || getDefaultPlayOptions();
 
                 playInternal(newItem, newItemPlayOptions, function () {
                     setPlaylistState(newItem.PlaylistItemId, newItemIndex);
@@ -2803,7 +2803,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
 
                 console.log('playing next track');
 
-                var newItemPlayOptions = newItemInfo.item.playOptions || {};
+                var newItemPlayOptions = newItemInfo.item.playOptions || getDefaultPlayOptions();
 
                 playInternal(newItemInfo.item, newItemPlayOptions, function () {
                     setPlaylistState(newItemInfo.item.PlaylistItemId, newItemInfo.index);
@@ -2826,7 +2826,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
 
                 if (newItem) {
 
-                    var newItemPlayOptions = newItem.playOptions || {};
+                    var newItemPlayOptions = newItem.playOptions || getDefaultPlayOptions();
                     newItemPlayOptions.startPositionTicks = 0;
 
                     playInternal(newItem, newItemPlayOptions, function () {
@@ -2997,7 +2997,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
             var player = this;
             setCurrentPlayerInternal(player);
 
-            var playOptions = item.playOptions || {};
+            var playOptions = item.playOptions || getDefaultPlayOptions();
             var isFirstItem = playOptions.isFirstItem;
             var fullscreen = playOptions.fullscreen;