alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-16 07:12:18 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

update GetItems method

Browse Source
This commit is contained in:
Luke Pulverenti
2017-05-26 02:48:54 -04:00
parent d21e8d3c33
commit 33014f77aa
237 changed files with 460 additions and 531 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.MediaEncoding/Configuration/EncodingConfigurationFactory.cs
View File

@@ -2,7 +2,7 @@
using MediaBrowser.Model.Configuration;
using System.Collections.Generic;
using System.IO;
using MediaBrowser.Common.IO;
using MediaBrowser.Controller.IO;
using MediaBrowser.Model.IO;

2
MediaBrowser.MediaEncoding/Encoder/FontConfigLoader.cs
View File

@@ -5,7 +5,7 @@ using System.Text;
using System.Threading.Tasks;
using MediaBrowser.Model.IO;
using MediaBrowser.Common.Configuration;
using MediaBrowser.Common.IO;
using MediaBrowser.Common.Net;
using MediaBrowser.Controller.IO;
using MediaBrowser.Model.IO;

6
MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
View File

@@ -252,7 +252,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
}
}
public async Task UpdateEncoderPath(string path, string pathType)
public void UpdateEncoderPath(string path, string pathType)
{
if (_hasExternalEncoder)
{
@@ -786,7 +786,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
timeoutMs = DefaultImageExtractionTimeoutMs;
}
ranToCompletion = process.WaitForExit(timeoutMs);
ranToCompletion = await process.WaitForExitAsync(timeoutMs).ConfigureAwait(false);
if (!ranToCompletion)
{
@@ -892,7 +892,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
while (isResponsive)
{
if (process.WaitForExit(30000))
if (await process.WaitForExitAsync(30000).ConfigureAwait(false))
{
ranToCompletion = true;
break;

2
MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
View File

@@ -9,7 +9,7 @@ using System.Linq;
using System.Text;
using System.Xml;
using MediaBrowser.Model.IO;
using MediaBrowser.Common.IO;
using MediaBrowser.Controller.IO;
using MediaBrowser.Controller.Library;
using MediaBrowser.Model.IO;

8
MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
View File

@@ -61,7 +61,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
}
}
private async Task<Stream> ConvertSubtitles(Stream stream,
private Stream ConvertSubtitles(Stream stream,
string inputFormat,
string outputFormat,
long startTimeTicks,
@@ -166,7 +166,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
using (var stream = subtitle.Item1)
{
return await ConvertSubtitles(stream, inputFormat, outputFormat, startTimeTicks, endTimeTicks, preserveOriginalTimestamps, cancellationToken).ConfigureAwait(false);
return ConvertSubtitles(stream, inputFormat, outputFormat, startTimeTicks, endTimeTicks, preserveOriginalTimestamps, cancellationToken);
}
}
@@ -445,7 +445,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
throw;
}
var ranToCompletion = process.WaitForExit(60000);
var ranToCompletion = await process.WaitForExitAsync(300000).ConfigureAwait(false);
if (!ranToCompletion)
{
@@ -575,7 +575,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
throw;
}
var ranToCompletion = process.WaitForExit(300000);
var ranToCompletion = await process.WaitForExitAsync(300000).ConfigureAwait(false);
if (!ranToCompletion)
{