mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-06 05:47:14 -04:00
add httpClient to more constructors
This commit is contained in:
parent
d8cb34dbbc
commit
250f03d2d9
@ -4,6 +4,7 @@ using System.IO;
|
|||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
|
using MediaBrowser.Common.Net;
|
||||||
using MediaBrowser.Controller.Configuration;
|
using MediaBrowser.Controller.Configuration;
|
||||||
using MediaBrowser.Controller.Devices;
|
using MediaBrowser.Controller.Devices;
|
||||||
using MediaBrowser.Controller.Dlna;
|
using MediaBrowser.Controller.Dlna;
|
||||||
@ -314,6 +315,7 @@ namespace MediaBrowser.Api.Playback.Hls
|
|||||||
}
|
}
|
||||||
|
|
||||||
public BaseHlsService(
|
public BaseHlsService(
|
||||||
|
IHttpClient httpClient,
|
||||||
IServerConfigurationManager serverConfig,
|
IServerConfigurationManager serverConfig,
|
||||||
IUserManager userManager,
|
IUserManager userManager,
|
||||||
ILibraryManager libraryManager,
|
ILibraryManager libraryManager,
|
||||||
@ -326,7 +328,8 @@ namespace MediaBrowser.Api.Playback.Hls
|
|||||||
IMediaSourceManager mediaSourceManager,
|
IMediaSourceManager mediaSourceManager,
|
||||||
IJsonSerializer jsonSerializer,
|
IJsonSerializer jsonSerializer,
|
||||||
IAuthorizationContext authorizationContext)
|
IAuthorizationContext authorizationContext)
|
||||||
: base(serverConfig,
|
: base(httpClient,
|
||||||
|
serverConfig,
|
||||||
userManager,
|
userManager,
|
||||||
libraryManager,
|
libraryManager,
|
||||||
isoManager,
|
isoManager,
|
||||||
|
@ -96,6 +96,7 @@ namespace MediaBrowser.Api.Playback.Hls
|
|||||||
{
|
{
|
||||||
|
|
||||||
public DynamicHlsService(
|
public DynamicHlsService(
|
||||||
|
IHttpClient httpClient,
|
||||||
IServerConfigurationManager serverConfig,
|
IServerConfigurationManager serverConfig,
|
||||||
IUserManager userManager,
|
IUserManager userManager,
|
||||||
ILibraryManager libraryManager,
|
ILibraryManager libraryManager,
|
||||||
@ -109,7 +110,8 @@ namespace MediaBrowser.Api.Playback.Hls
|
|||||||
IJsonSerializer jsonSerializer,
|
IJsonSerializer jsonSerializer,
|
||||||
IAuthorizationContext authorizationContext,
|
IAuthorizationContext authorizationContext,
|
||||||
INetworkManager networkManager)
|
INetworkManager networkManager)
|
||||||
: base(serverConfig,
|
: base(httpClient,
|
||||||
|
serverConfig,
|
||||||
userManager,
|
userManager,
|
||||||
libraryManager,
|
libraryManager,
|
||||||
isoManager,
|
isoManager,
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
|
using MediaBrowser.Common.Net;
|
||||||
using MediaBrowser.Controller.Configuration;
|
using MediaBrowser.Controller.Configuration;
|
||||||
using MediaBrowser.Controller.Devices;
|
using MediaBrowser.Controller.Devices;
|
||||||
using MediaBrowser.Controller.Dlna;
|
using MediaBrowser.Controller.Dlna;
|
||||||
@ -132,6 +133,7 @@ namespace MediaBrowser.Api.Playback.Hls
|
|||||||
}
|
}
|
||||||
|
|
||||||
public VideoHlsService(
|
public VideoHlsService(
|
||||||
|
IHttpClient httpClient,
|
||||||
IServerConfigurationManager serverConfig,
|
IServerConfigurationManager serverConfig,
|
||||||
IUserManager userManager,
|
IUserManager userManager,
|
||||||
ILibraryManager libraryManager,
|
ILibraryManager libraryManager,
|
||||||
@ -144,7 +146,8 @@ namespace MediaBrowser.Api.Playback.Hls
|
|||||||
IMediaSourceManager mediaSourceManager,
|
IMediaSourceManager mediaSourceManager,
|
||||||
IJsonSerializer jsonSerializer,
|
IJsonSerializer jsonSerializer,
|
||||||
IAuthorizationContext authorizationContext)
|
IAuthorizationContext authorizationContext)
|
||||||
: base(serverConfig,
|
: base(httpClient,
|
||||||
|
serverConfig,
|
||||||
userManager,
|
userManager,
|
||||||
libraryManager,
|
libraryManager,
|
||||||
isoManager,
|
isoManager,
|
||||||
|
@ -280,7 +280,8 @@ namespace MediaBrowser.Api.Playback
|
|||||||
|
|
||||||
if (!isStatic && string.Equals(mediaSource.TranscodingSubProtocol, "hls", StringComparison.OrdinalIgnoreCase))
|
if (!isStatic && string.Equals(mediaSource.TranscodingSubProtocol, "hls", StringComparison.OrdinalIgnoreCase))
|
||||||
{
|
{
|
||||||
var service = new DynamicHlsService(ServerConfigurationManager,
|
var service = new DynamicHlsService(HttpClient,
|
||||||
|
ServerConfigurationManager,
|
||||||
UserManager,
|
UserManager,
|
||||||
LibraryManager,
|
LibraryManager,
|
||||||
IsoManager,
|
IsoManager,
|
||||||
|
Loading…
Reference in New Issue
Block a user