aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Api/Playback/Progressive/VideoService.cs
diff options
context:
space:
mode:
authorBond-009 <bond.009@outlook.com>2019-02-17 10:38:44 +0100
committerBond-009 <bond.009@outlook.com>2019-02-17 10:38:44 +0100
commita35ea49c996d42c2fa26f0536b1beaab15bd3b08 (patch)
tree872afa2535e8318c0af9d4eca7e457d7d5b0e078 /MediaBrowser.Api/Playback/Progressive/VideoService.cs
parent25c2267a89af5c2e82774c638cdad0defcc894b5 (diff)
parent4b4399fba6df3368ab04e78acd2dd08873e4f07b (diff)
Merge remote-tracking branch 'upstream/release-10.2.z' into newmaser
Diffstat (limited to 'MediaBrowser.Api/Playback/Progressive/VideoService.cs')
-rw-r--r--MediaBrowser.Api/Playback/Progressive/VideoService.cs5
1 files changed, 4 insertions, 1 deletions
diff --git a/MediaBrowser.Api/Playback/Progressive/VideoService.cs b/MediaBrowser.Api/Playback/Progressive/VideoService.cs
index a0ea5c62d..7aeb0e9e8 100644
--- a/MediaBrowser.Api/Playback/Progressive/VideoService.cs
+++ b/MediaBrowser.Api/Playback/Progressive/VideoService.cs
@@ -1,4 +1,5 @@
using System.Threading.Tasks;
+using MediaBrowser.Common.Net;
using MediaBrowser.Controller.Configuration;
using MediaBrowser.Controller.Devices;
using MediaBrowser.Controller.Dlna;
@@ -69,6 +70,7 @@ namespace MediaBrowser.Api.Playback.Progressive
public class VideoService : BaseProgressiveStreamingService
{
public VideoService(
+ IHttpClient httpClient,
IServerConfigurationManager serverConfig,
IUserManager userManager,
ILibraryManager libraryManager,
@@ -82,7 +84,8 @@ namespace MediaBrowser.Api.Playback.Progressive
IJsonSerializer jsonSerializer,
IAuthorizationContext authorizationContext,
IEnvironmentInfo environmentInfo)
- : base(serverConfig,
+ : base(httpClient,
+ serverConfig,
userManager,
libraryManager,
isoManager,