diff options
| author | Vasily <JustAMan@users.noreply.github.com> | 2019-03-17 09:36:35 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-17 09:36:35 +0300 |
| commit | e81a6adb9503161708af5b659f60c6b8df5032a0 (patch) | |
| tree | 118a9b3be9da0e3baac3e1ea0a239777638fc477 /MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs | |
| parent | 67fbbcfd124090ceac670091a0acbb7ebc4b7edd (diff) | |
| parent | 480a6607e2badad925216e715841cce6300ef98e (diff) | |
Merge pull request #1090 from redSpoutnik/subtitle-display-title
Set DisplayTitle for subtitles
Diffstat (limited to 'MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs')
| -rw-r--r-- | MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs index f454c2723..4867c0f85 100644 --- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs +++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs @@ -16,6 +16,7 @@ using MediaBrowser.Model.Configuration; using MediaBrowser.Model.Diagnostics; using MediaBrowser.Model.Dlna; using MediaBrowser.Model.Entities; +using MediaBrowser.Model.Globalization; using MediaBrowser.Model.IO; using MediaBrowser.Model.MediaInfo; using MediaBrowser.Model.Serialization; @@ -54,6 +55,7 @@ namespace MediaBrowser.MediaEncoding.Encoder private readonly SemaphoreSlim _thumbnailResourcePool = new SemaphoreSlim(1, 1); private readonly List<ProcessWrapper> _runningProcesses = new List<ProcessWrapper>(); + private readonly ILocalizationManager _localization; public MediaEncoder( ILoggerFactory loggerFactory, @@ -64,7 +66,8 @@ namespace MediaBrowser.MediaEncoding.Encoder Func<ISubtitleEncoder> subtitleEncoder, Func<IMediaSourceManager> mediaSourceManager, IProcessFactory processFactory, - int defaultImageExtractionTimeoutMs) + int defaultImageExtractionTimeoutMs, + ILocalizationManager localization) { _logger = loggerFactory.CreateLogger(nameof(MediaEncoder)); _jsonSerializer = jsonSerializer; @@ -74,6 +77,7 @@ namespace MediaBrowser.MediaEncoding.Encoder SubtitleEncoder = subtitleEncoder; _processFactory = processFactory; DefaultImageExtractionTimeoutMs = defaultImageExtractionTimeoutMs; + _localization = localization; } /// <summary> @@ -413,7 +417,7 @@ namespace MediaBrowser.MediaEncoding.Encoder } } - return new ProbeResultNormalizer(_logger, FileSystem).GetMediaInfo(result, videoType, isAudio, primaryPath, protocol); + return new ProbeResultNormalizer(_logger, FileSystem, _localization).GetMediaInfo(result, videoType, isAudio, primaryPath, protocol); } } |
