lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update dialogs

Browse Source
This commit is contained in:
Luke Pulverenti 2016-09-07 13:17:26 -04:00
parent 4e0adb17e7
commit d68a826833
5 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
MediaBrowser.Api/Playback/BaseStreamingService.cs
View File

@ -1176,17 +1176,21 @@ namespace MediaBrowser.Api.Playback
await Task.Delay(100, cancellationTokenSource.Token).ConfigureAwait(false); await Task.Delay(100, cancellationTokenSource.Token).ConfigureAwait(false);
} }
if (state.IsInputVideo && transcodingJob.Type == TranscodingJobType.Progressive) if (state.IsInputVideo && transcodingJob.Type == TranscodingJobType.Progressive && !transcodingJob.HasExited)
{ {
await Task.Delay(1000, cancellationTokenSource.Token).ConfigureAwait(false); await Task.Delay(1000, cancellationTokenSource.Token).ConfigureAwait(false);
if (state.ReadInputAtNativeFramerate) if (state.ReadInputAtNativeFramerate && !transcodingJob.HasExited)
{ {
await Task.Delay(1500, cancellationTokenSource.Token).ConfigureAwait(false); await Task.Delay(1500, cancellationTokenSource.Token).ConfigureAwait(false);
} }
} }
StartThrottler(state, transcodingJob); if (!transcodingJob.HasExited)
{
StartThrottler(state, transcodingJob);
}
ReportUsage(state); ReportUsage(state);
return transcodingJob; return transcodingJob;

12
MediaBrowser.Controller/Entities/Folder.cs
View File

@ -1057,10 +1057,20 @@ namespace MediaBrowser.Controller.Entities
/// <returns>IList{BaseItem}.</returns> /// <returns>IList{BaseItem}.</returns>
public IList<BaseItem> GetRecursiveChildren() public IList<BaseItem> GetRecursiveChildren()
{ {
return GetRecursiveChildren(i => true); return GetRecursiveChildren(true);
}
public IList<BaseItem> GetRecursiveChildren(bool includeLinkedChildren)
{
return GetRecursiveChildren(i => true, includeLinkedChildren);
} }
public IList<BaseItem> GetRecursiveChildren(Func<BaseItem, bool> filter) public IList<BaseItem> GetRecursiveChildren(Func<BaseItem, bool> filter)
{
return GetRecursiveChildren(filter, true);
}
public IList<BaseItem> GetRecursiveChildren(Func<BaseItem, bool> filter, bool includeLinkedChildren)
{ {
var result = new Dictionary<Guid, BaseItem>(); var result = new Dictionary<Guid, BaseItem>();

2
MediaBrowser.Dlna/PlayTo/Device.cs
View File

@ -483,7 +483,9 @@ namespace MediaBrowser.Dlna.PlayTo
{ {
if (OnDeviceUnavailable != null) if (OnDeviceUnavailable != null)
{ {
_logger.Debug("Disposing device due to loss of connection");
OnDeviceUnavailable(); OnDeviceUnavailable();
return;
} }
} }
if (_successiveStopCount >= maxSuccessiveStopReturns) if (_successiveStopCount >= maxSuccessiveStopReturns)

2
MediaBrowser.Server.Implementations/Library/LibraryManager.cs
View File

@ -401,7 +401,7 @@ namespace MediaBrowser.Server.Implementations.Library
var locationType = item.LocationType; var locationType = item.LocationType;
var children = item.IsFolder var children = item.IsFolder
? ((Folder)item).GetRecursiveChildren().ToList() ? ((Folder)item).GetRecursiveChildren(false).ToList()
: new List<BaseItem>(); : new List<BaseItem>();
foreach (var metadataPath in GetMetadataPaths(item, children)) foreach (var metadataPath in GetMetadataPaths(item, children))

8
MediaBrowser.Server.Startup.Common/ApplicationHost.cs
View File

@ -363,7 +363,10 @@ namespace MediaBrowser.Server.Startup.Common
private void PerformPreInitMigrations() private void PerformPreInitMigrations()
{ {
var migrations = new List<IVersionMigration>(); var migrations = new List<IVersionMigration>
{
new UpdateLevelMigration(ServerConfigurationManager, this, HttpClient, JsonSerializer, _releaseAssetFilename)
};
foreach (var task in migrations) foreach (var task in migrations)
{ {
@ -383,8 +386,7 @@ namespace MediaBrowser.Server.Startup.Common
var migrations = new List<IVersionMigration> var migrations = new List<IVersionMigration>
{ {
new MovieDbEpisodeProviderMigration(ServerConfigurationManager), new MovieDbEpisodeProviderMigration(ServerConfigurationManager),
new DbMigration(ServerConfigurationManager, TaskManager), new DbMigration(ServerConfigurationManager, TaskManager)
new UpdateLevelMigration(ServerConfigurationManager, this, HttpClient, JsonSerializer, _releaseAssetFilename)
}; };
foreach (var task in migrations) foreach (var task in migrations)