alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-05-31 21:08:27 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

update playback progress reporting

Browse Source
This commit is contained in:
Luke Pulverenti
2017-04-17 16:33:07 -04:00
parent 561028c907
commit eb9b63c7a7
7 changed files with 21 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Emby.Server.Implementations/Session/SessionManager.cs
View File

@@ -612,8 +612,7 @@ namespace Emby.Server.Implementations.Session
ClearTranscodingInfo(session.DeviceId);
}
session.StopAutomaticProgress();
session.QueueableMediaTypes = info.QueueableMediaTypes;
session.StartAutomaticProgress(_timerFactory, info);
var users = GetUsers(session);
@@ -720,7 +719,11 @@ namespace Emby.Server.Implementations.Session
}, _logger);
session.StartAutomaticProgress(_timerFactory, info);
if (!isAutomated)
{
session.StartAutomaticProgress(_timerFactory, info);
}
StartIdleCheckTimer();
}
@@ -1005,19 +1008,9 @@ namespace Emby.Server.Implementations.Session
}
}
if (command.PlayCommand != PlayCommand.PlayNow)
if (items.Any(i => !session.PlayableMediaTypes.Contains(i.MediaType, StringComparer.OrdinalIgnoreCase)))
{
if (items.Any(i => !session.QueueableMediaTypes.Contains(i.MediaType, StringComparer.OrdinalIgnoreCase)))
{
throw new ArgumentException(string.Format("{0} is unable to queue the requested media type.", session.DeviceName ?? session.Id));
}
}
else
{
if (items.Any(i => !session.PlayableMediaTypes.Contains(i.MediaType, StringComparer.OrdinalIgnoreCase)))
{
throw new ArgumentException(string.Format("{0} is unable to play the requested media type.", session.DeviceName ?? session.Id));
}
throw new ArgumentException(string.Format("{0} is unable to play the requested media type.", session.DeviceName ?? session.Id));
}
if (user != null && command.ItemIds.Length == 1 && user.Configuration.EnableNextEpisodeAutoPlay)
@@ -1597,7 +1590,6 @@ namespace Emby.Server.Implementations.Session
LastActivityDate = session.LastActivityDate,
NowViewingItem = session.NowViewingItem,
ApplicationVersion = session.ApplicationVersion,
QueueableMediaTypes = session.QueueableMediaTypes,
PlayableMediaTypes = session.PlayableMediaTypes,
AdditionalUsers = session.AdditionalUsers,
SupportedCommands = session.SupportedCommands,

6
Emby.Server.Implementations/Session/SessionWebSocketListener.cs
View File

@@ -289,7 +289,6 @@ namespace Emby.Server.Implementations.Session
var itemId = vals[0];
var queueableMediaTypes = string.Empty;
var canSeek = true;
if (vals.Length > 1)
@@ -298,15 +297,14 @@ namespace Emby.Server.Implementations.Session
}
if (vals.Length > 2)
{
queueableMediaTypes = vals[2];
// vals[2] used to be QueueableMediaTypes
}
var info = new PlaybackStartInfo
{
CanSeek = canSeek,
ItemId = itemId,
SessionId = session.Id,
QueueableMediaTypes = queueableMediaTypes.Split(',').ToList()
SessionId = session.Id
};
if (vals.Length > 3)