1 files changed, 41 insertions, 54 deletions

diff --git a/MediaBrowser.Providers/MediaInfo/FFProbeProvider.cs b/MediaBrowser.Providers/MediaInfo/FFProbeProvider.cs
index 6982568eb..c61187fdf 100644
--- a/MediaBrowser.Providers/MediaInfo/FFProbeProvider.cs
+++ b/MediaBrowser.Providers/MediaInfo/FFProbeProvider.cs
@@ -1,10 +1,10 @@
+#pragma warning disable CS1591
+
 using System;
 using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using MediaBrowser.Common.Configuration;
-using MediaBrowser.Controller.Channels;
 using MediaBrowser.Controller.Chapters;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities;
@@ -18,9 +18,7 @@ using MediaBrowser.Controller.Providers;
 using MediaBrowser.Controller.Subtitles;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Globalization;
-using MediaBrowser.Model.IO;
 using MediaBrowser.Model.MediaInfo;
-using MediaBrowser.Model.Serialization;
 using Microsoft.Extensions.Logging;
 
 namespace MediaBrowser.Providers.MediaInfo
@@ -37,24 +35,54 @@ namespace MediaBrowser.Providers.MediaInfo
         IPreRefreshProvider,
         IHasItemChangeMonitor
     {
-        private readonly ILogger _logger;
-        private readonly IIsoManager _isoManager;
+        private readonly ILogger<FFProbeProvider> _logger;
         private readonly IMediaEncoder _mediaEncoder;
         private readonly IItemRepository _itemRepo;
         private readonly IBlurayExaminer _blurayExaminer;
         private readonly ILocalizationManager _localization;
-        private readonly IApplicationPaths _appPaths;
-        private readonly IJsonSerializer _json;
         private readonly IEncodingManager _encodingManager;
         private readonly IServerConfigurationManager _config;
         private readonly ISubtitleManager _subtitleManager;
         private readonly IChapterManager _chapterManager;
         private readonly ILibraryManager _libraryManager;
-        private readonly IChannelManager _channelManager;
         private readonly IMediaSourceManager _mediaSourceManager;
+        private readonly SubtitleResolver _subtitleResolver;
+
+        private readonly Task<ItemUpdateType> _cachedTask = Task.FromResult(ItemUpdateType.None);
+
+        public FFProbeProvider(
+            ILogger<FFProbeProvider> logger,
+            IMediaSourceManager mediaSourceManager,
+            IMediaEncoder mediaEncoder,
+            IItemRepository itemRepo,
+            IBlurayExaminer blurayExaminer,
+            ILocalizationManager localization,
+            IEncodingManager encodingManager,
+            IServerConfigurationManager config,
+            ISubtitleManager subtitleManager,
+            IChapterManager chapterManager,
+            ILibraryManager libraryManager)
+        {
+            _logger = logger;
+            _mediaEncoder = mediaEncoder;
+            _itemRepo = itemRepo;
+            _blurayExaminer = blurayExaminer;
+            _localization = localization;
+            _encodingManager = encodingManager;
+            _config = config;
+            _subtitleManager = subtitleManager;
+            _chapterManager = chapterManager;
+            _libraryManager = libraryManager;
+            _mediaSourceManager = mediaSourceManager;
+
+            _subtitleResolver = new SubtitleResolver(BaseItem.LocalizationManager);
+        }
 
         public string Name => "ffprobe";
 
+        // Run last
+        public int Order => 100;
+
         public bool HasChanged(BaseItem item, IDirectoryService directoryService)
         {
             var video = item as Video;
@@ -119,45 +147,6 @@ namespace MediaBrowser.Providers.MediaInfo
             return FetchAudioInfo(item, options, cancellationToken);
         }
 
-        private SubtitleResolver _subtitleResolver;
-
-        public FFProbeProvider(
-            ILogger<FFProbeProvider> logger,
-            IMediaSourceManager mediaSourceManager,
-            IChannelManager channelManager,
-            IIsoManager isoManager,
-            IMediaEncoder mediaEncoder,
-            IItemRepository itemRepo,
-            IBlurayExaminer blurayExaminer,
-            ILocalizationManager localization,
-            IApplicationPaths appPaths,
-            IJsonSerializer json,
-            IEncodingManager encodingManager,
-            IServerConfigurationManager config,
-            ISubtitleManager subtitleManager,
-            IChapterManager chapterManager,
-            ILibraryManager libraryManager)
-        {
-            _logger = logger;
-            _isoManager = isoManager;
-            _mediaEncoder = mediaEncoder;
-            _itemRepo = itemRepo;
-            _blurayExaminer = blurayExaminer;
-            _localization = localization;
-            _appPaths = appPaths;
-            _json = json;
-            _encodingManager = encodingManager;
-            _config = config;
-            _subtitleManager = subtitleManager;
-            _chapterManager = chapterManager;
-            _libraryManager = libraryManager;
-            _channelManager = channelManager;
-            _mediaSourceManager = mediaSourceManager;
-
-            _subtitleResolver = new SubtitleResolver(BaseItem.LocalizationManager);
-        }
-
-        private readonly Task<ItemUpdateType> _cachedTask = Task.FromResult(ItemUpdateType.None);
         public Task<ItemUpdateType> FetchVideoInfo<T>(T item, MetadataRefreshOptions options, CancellationToken cancellationToken)
             where T : Video
         {
@@ -209,9 +198,9 @@ namespace MediaBrowser.Providers.MediaInfo
 
         private string NormalizeStrmLine(string line)
         {
-            return line.Replace("\t", string.Empty)
-                .Replace("\r", string.Empty)
-                .Replace("\n", string.Empty)
+            return line.Replace("\t", string.Empty, StringComparison.Ordinal)
+                .Replace("\r", string.Empty, StringComparison.Ordinal)
+                .Replace("\n", string.Empty, StringComparison.Ordinal)
                 .Trim();
         }
 
@@ -240,11 +229,9 @@ namespace MediaBrowser.Providers.MediaInfo
                 FetchShortcutInfo(item);
             }
 
-            var prober = new FFProbeAudioInfo(_mediaSourceManager, _mediaEncoder, _itemRepo, _appPaths, _json, _libraryManager);
+            var prober = new FFProbeAudioInfo(_mediaSourceManager, _mediaEncoder, _itemRepo, _libraryManager);
 
             return prober.Probe(item, options, cancellationToken);
         }
-        // Run last
-        public int Order => 100;
     }
 }