starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-22 08:45:23 +03:00
Code Issues Packages Projects Releases Wiki Activity

Review logging and minor changes in SyncPlay

Browse Source
This commit is contained in:
Ionut Andrei Oanca
2020-11-16 17:40:19 +01:00
parent c7e53bce2f
commit a3ca36cb54
9 changed files with 201 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
MediaBrowser.Controller/SyncPlay/Queue/PlayQueueManager.cs
View File

@@ -20,7 +20,7 @@ namespace MediaBrowser.Controller.SyncPlay.Queue
/// Random number generator used to shuffle lists.
/// </summary>
/// <value>The random number generator.</value>
private readonly Random randomNumberGenerator = new Random();
private readonly Random _randomNumberGenerator = new Random();
/// <summary>
/// Initializes a new instance of the <see cref="PlayQueueManager" /> class.
@@ -102,7 +102,7 @@ namespace MediaBrowser.Controller.SyncPlay.Queue
SortedPlaylist = CreateQueueItemsFromArray(items);
if (ShuffleMode.Equals(GroupShuffleMode.Shuffle))
{
ShuffledPlaylist = SortedPlaylist.ToList();
ShuffledPlaylist = new List<QueueItem>(SortedPlaylist);
Shuffle(ShuffledPlaylist);
}
@@ -134,17 +134,17 @@ namespace MediaBrowser.Controller.SyncPlay.Queue
{
if (PlayingItemIndex == NoPlayingItemIndex)
{
ShuffledPlaylist = SortedPlaylist.ToList();
ShuffledPlaylist = new List<QueueItem>(SortedPlaylist);
Shuffle(ShuffledPlaylist);
}
else if (ShuffleMode.Equals(GroupShuffleMode.Sorted))
{
// First time shuffle.
var playingItem = SortedPlaylist[PlayingItemIndex];
ShuffledPlaylist = SortedPlaylist.ToList();
ShuffledPlaylist = new List<QueueItem>(SortedPlaylist);
ShuffledPlaylist.RemoveAt(PlayingItemIndex);
Shuffle(ShuffledPlaylist);
ShuffledPlaylist = ShuffledPlaylist.Prepend(playingItem).ToList();
ShuffledPlaylist.Insert(0, playingItem);
PlayingItemIndex = 0;
}
else
@@ -153,7 +153,7 @@ namespace MediaBrowser.Controller.SyncPlay.Queue
var playingItem = ShuffledPlaylist[PlayingItemIndex];
ShuffledPlaylist.RemoveAt(PlayingItemIndex);
Shuffle(ShuffledPlaylist);
ShuffledPlaylist = ShuffledPlaylist.Prepend(playingItem).ToList();
ShuffledPlaylist.Insert(0, playingItem);
PlayingItemIndex = 0;
}
@@ -236,14 +236,7 @@ namespace MediaBrowser.Controller.SyncPlay.Queue
public string GetPlayingItemPlaylistId()
{
var playingItem = GetPlayingItem();
if (playingItem != null)
{
return playingItem.PlaylistItemId;
}
else
{
return null;
}
return playingItem?.PlaylistItemId;
}
/// <summary>
@@ -253,14 +246,7 @@ namespace MediaBrowser.Controller.SyncPlay.Queue
public Guid GetPlayingItemId()
{
var playingItem = GetPlayingItem();
if (playingItem != null)
{
return playingItem.ItemId;
}
else
{
return Guid.Empty;
}
return playingItem?.ItemId ?? Guid.Empty;
}
/// <summary>
@@ -536,7 +522,7 @@ namespace MediaBrowser.Controller.SyncPlay.Queue
while (n > 1)
{
n--;
int k = randomNumberGenerator.Next(n + 1);
int k = _randomNumberGenerator.Next(n + 1);
T value = list[k];
list[k] = list[n];
list[n] = value;