Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Minor changes to play queue in Syncplay group

Browse Source
This commit is contained in:
Ionut Andrei Oanca 2020-10-22 16:32:15 +02:00
commit 019bc19aa4
2 changed files with 40 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Emby.Server.Implementations/SyncPlay/GroupController.cs
View File

@ -643,12 +643,33 @@ namespace Emby.Server.Implementations.SyncPlay
/// <inheritdoc /> /// <inheritdoc />
public void SetRepeatMode(string mode) { public void SetRepeatMode(string mode) {
PlayQueue.SetRepeatMode(mode); switch (mode)
{
case "RepeatOne":
PlayQueue.SetRepeatMode(GroupRepeatMode.RepeatOne);
break;
case "RepeatAll":
PlayQueue.SetRepeatMode(GroupRepeatMode.RepeatAll);
break;
default:
// On unknown values, default to repeat none.
PlayQueue.SetRepeatMode(GroupRepeatMode.RepeatNone);
break;
}
} }
/// <inheritdoc /> /// <inheritdoc />
public void SetShuffleMode(string mode) { public void SetShuffleMode(string mode) {
PlayQueue.SetShuffleMode(mode); switch (mode)
{
case "Shuffle":
PlayQueue.SetShuffleMode(GroupShuffleMode.Shuffle);
break;
default:
// On unknown values, default to sorted playlist.
PlayQueue.SetShuffleMode(GroupShuffleMode.Sorted);
break;
}
} }
/// <inheritdoc /> /// <inheritdoc />

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

@ -461,21 +461,9 @@ namespace MediaBrowser.Controller.SyncPlay
/// Sets the repeat mode. /// Sets the repeat mode.
/// </summary> /// </summary>
/// <param name="mode">The new mode.</param> /// <param name="mode">The new mode.</param>
public void SetRepeatMode(string mode) public void SetRepeatMode(GroupRepeatMode mode)
{ {
switch (mode) RepeatMode = mode;
{
case "RepeatOne":
RepeatMode = GroupRepeatMode.RepeatOne;
break;
case "RepeatAll":
RepeatMode = GroupRepeatMode.RepeatAll;
break;
default:
RepeatMode = GroupRepeatMode.RepeatNone;
break;
}
LastChange = DateTime.UtcNow; LastChange = DateTime.UtcNow;
} }
@ -483,16 +471,15 @@ namespace MediaBrowser.Controller.SyncPlay
/// Sets the shuffle mode. /// Sets the shuffle mode.
/// </summary> /// </summary>
/// <param name="mode">The new mode.</param> /// <param name="mode">The new mode.</param>
public void SetShuffleMode(string mode) public void SetShuffleMode(GroupShuffleMode mode)
{ {
switch (mode) if (mode.Equals(GroupShuffleMode.Shuffle))
{ {
case "Shuffle": ShufflePlaylist();
ShufflePlaylist(); }
break; else
default: {
RestoreSortedPlaylist(); RestoreSortedPlaylist();
break;
} }
} }
@ -501,7 +488,14 @@ namespace MediaBrowser.Controller.SyncPlay
/// </summary> /// </summary>
public void ToggleShuffleMode() public void ToggleShuffleMode()
{ {
SetShuffleMode(ShuffleMode.Equals(GroupShuffleMode.Shuffle) ? "Shuffle" : ""); if (ShuffleMode.Equals(GroupShuffleMode.Sorted))
{
ShufflePlaylist();
}
else
{
RestoreSortedPlaylist();
}
} }
/// <summary> /// <summary>