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

resolve live tv with ios

Browse Source
This commit is contained in:
Luke Pulverenti 2015-04-28 09:56:57 -04:00
parent d274d1d807
commit 52e3d875c2
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
MediaBrowser.Api/Playback/MediaInfoService.cs
View File

@ -325,10 +325,11 @@ namespace MediaBrowser.Api.Playback
private int? GetMaxBitrate(int? clientMaxBitrate) private int? GetMaxBitrate(int? clientMaxBitrate)
{ {
var maxBitrate = clientMaxBitrate; var maxBitrate = clientMaxBitrate;
var remoteClientMaxBitrate = _config.Configuration.RemoteClientBitrateLimit;
if (_config.Configuration.RemoteClientBitrateLimit > 0 && !_networkManager.IsInLocalNetwork(Request.RemoteIp)) if (remoteClientMaxBitrate > 0 && !_networkManager.IsInLocalNetwork(Request.RemoteIp))
{ {
maxBitrate = Math.Min(maxBitrate ?? _config.Configuration.RemoteClientBitrateLimit, _config.Configuration.RemoteClientBitrateLimit); maxBitrate = Math.Min(maxBitrate ?? remoteClientMaxBitrate, remoteClientMaxBitrate);
} }
return maxBitrate; return maxBitrate;

8
MediaBrowser.Api/Sync/SyncService.cs
View File

@ -1,4 +1,5 @@
using MediaBrowser.Controller.Dto; using MediaBrowser.Common.Extensions;
using MediaBrowser.Controller.Dto;
using MediaBrowser.Controller.Library; using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Net; using MediaBrowser.Controller.Net;
using MediaBrowser.Controller.Sync; using MediaBrowser.Controller.Sync;
@ -230,6 +231,11 @@ namespace MediaBrowser.Api.Sync
{ {
var jobItem = _syncManager.GetJobItem(request.Id); var jobItem = _syncManager.GetJobItem(request.Id);
if (jobItem == null)
{
throw new ResourceNotFoundException();
}
if (jobItem.Status < SyncJobItemStatus.ReadyToTransfer) if (jobItem.Status < SyncJobItemStatus.ReadyToTransfer)
{ {
throw new ArgumentException("The job item is not yet ready for transfer."); throw new ArgumentException("The job item is not yet ready for transfer.");