aboutsummaryrefslogtreecommitdiff
path: root/Emby.Server.Implementations/MediaEncoder/EncodingManager.cs
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2017-08-05 15:02:33 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2017-08-05 15:02:33 -0400
commitdb315c4e3279a0f7c5fd5507887b32c6436b90af (patch)
treeec0b852762595883dd34f18c8ae22d42133484b4 /Emby.Server.Implementations/MediaEncoder/EncodingManager.cs
parent3fe1c25c3ea8d6519aba3b5c3ef0d6a9154413b2 (diff)
update media source methods
Diffstat (limited to 'Emby.Server.Implementations/MediaEncoder/EncodingManager.cs')
-rw-r--r--Emby.Server.Implementations/MediaEncoder/EncodingManager.cs22
1 files changed, 13 insertions, 9 deletions
diff --git a/Emby.Server.Implementations/MediaEncoder/EncodingManager.cs b/Emby.Server.Implementations/MediaEncoder/EncodingManager.cs
index e4eb41e3a..181a49034 100644
--- a/Emby.Server.Implementations/MediaEncoder/EncodingManager.cs
+++ b/Emby.Server.Implementations/MediaEncoder/EncodingManager.cs
@@ -29,9 +29,9 @@ namespace Emby.Server.Implementations.MediaEncoder
private readonly IChapterManager _chapterManager;
private readonly ILibraryManager _libraryManager;
- public EncodingManager(IFileSystem fileSystem,
- ILogger logger,
- IMediaEncoder encoder,
+ public EncodingManager(IFileSystem fileSystem,
+ ILogger logger,
+ IMediaEncoder encoder,
IChapterManager chapterManager, ILibraryManager libraryManager)
{
_fileSystem = fileSystem;
@@ -121,12 +121,16 @@ namespace Emby.Server.Implementations.MediaEncoder
{
continue;
}
+
+ List<string> playableStreamFileNames = null;
if (video.VideoType == VideoType.BluRay || video.VideoType == VideoType.Dvd)
{
- if (video.PlayableStreamFileNames.Count != 1)
- {
- continue;
- }
+ continue;
+ }
+
+ if (playableStreamFileNames == null)
+ {
+ playableStreamFileNames = new List<string>();
}
try
@@ -136,7 +140,7 @@ namespace Emby.Server.Implementations.MediaEncoder
var protocol = MediaProtocol.File;
- var inputPath = MediaEncoderHelpers.GetInputArgument(_fileSystem, video.Path, protocol, null, video.PlayableStreamFileNames);
+ var inputPath = MediaEncoderHelpers.GetInputArgument(_fileSystem, video.Path, protocol, null, playableStreamFileNames);
_fileSystem.CreateDirectory(_fileSystem.GetDirectoryName(path));
@@ -151,7 +155,7 @@ namespace Emby.Server.Implementations.MediaEncoder
}
catch
{
-
+
}
chapter.ImagePath = path;