Merge branch 'master' into mediaencoding

MediaBrowser.Api/Playback/BaseStreamingService.cs

@@ -33,12 +33,6 @@ namespace MediaBrowser.Api.Playback
     {
         protected virtual bool EnableOutputInSubFolder => false;
 
-        /// <summary>
-        /// Gets or sets the application paths.
-        /// </summary>
-        /// <value>The application paths.</value>
-        protected IServerConfigurationManager ServerConfigurationManager { get; private set; }
-
         /// <summary>
         /// Gets or sets the user manager.
         /// </summary>
@@ -87,7 +81,9 @@ namespace MediaBrowser.Api.Playback
         /// Initializes a new instance of the <see cref="BaseStreamingService" /> class.
         /// </summary>
         protected BaseStreamingService(
-            IServerConfigurationManager serverConfig,
+            ILogger logger,
+            IServerConfigurationManager serverConfigurationManager,
+            IHttpResultFactory httpResultFactory,
             IUserManager userManager,
             ILibraryManager libraryManager,
             IIsoManager isoManager,
@@ -99,8 +95,8 @@ namespace MediaBrowser.Api.Playback
             IJsonSerializer jsonSerializer,
             IAuthorizationContext authorizationContext,
             EncodingHelper encodingHelper)
+            : base(logger, serverConfigurationManager, httpResultFactory)
         {
-            ServerConfigurationManager = serverConfig;
             UserManager = userManager;
             LibraryManager = libraryManager;
             IsoManager = isoManager;
@@ -583,7 +579,7 @@ namespace MediaBrowser.Api.Playback
         }
 
         /// <summary>
-        /// Parses query parameters as StreamOptions
+        /// Parses query parameters as StreamOptions.
         /// </summary>
         /// <param name="request">The stream request.</param>
         private void ParseStreamOptions(StreamRequest request)