alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-06-11 10:10:35 +01:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Merge branch 'master' into mediaencoding

Browse Source
This commit is contained in:
Bond_009
2019-12-10 23:00:59 +01:00
parent c6d48f51f6 67922dff50
commit 0bf8bfbb0c
258 changed files with 3301 additions and 1673 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
MediaBrowser.Api/Playback/Progressive/BaseProgressiveStreamingService.cs
View File

@@ -15,6 +15,7 @@ using MediaBrowser.Model.IO;
using MediaBrowser.Model.MediaInfo;
using MediaBrowser.Model.Serialization;
using MediaBrowser.Model.Services;
using Microsoft.Extensions.Logging;
using Microsoft.Net.Http.Headers;
namespace MediaBrowser.Api.Playback.Progressive
@@ -27,8 +28,10 @@ namespace MediaBrowser.Api.Playback.Progressive
protected IHttpClient HttpClient { get; private set; }
public BaseProgressiveStreamingService(
ILogger logger,
IServerConfigurationManager serverConfigurationManager,
IHttpResultFactory httpResultFactory,
IHttpClient httpClient,
IServerConfigurationManager serverConfig,
IUserManager userManager,
ILibraryManager libraryManager,
IIsoManager isoManager,
@@ -41,7 +44,9 @@ namespace MediaBrowser.Api.Playback.Progressive
IAuthorizationContext authorizationContext,
EncodingHelper encodingHelper)
: base(
serverConfig,
logger,
serverConfigurationManager,
httpResultFactory,
userManager,
libraryManager,
isoManager,