lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes #101 - Subtitles for TV

Browse Source
This commit is contained in:
Luke Pulverenti 2013-04-05 11:57:51 -04:00
parent dbcb62e462
commit 6cefbdcdbf
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
MediaBrowser.Controller/Providers/MediaInfo/FFProbeVideoInfoProvider.cs
View File

@ -21,7 +21,7 @@ namespace MediaBrowser.Controller.Providers.MediaInfo
/// </summary> /// </summary>
public class FFProbeVideoInfoProvider : BaseFFProbeProvider<Video> public class FFProbeVideoInfoProvider : BaseFFProbeProvider<Video>
{ {
public FFProbeVideoInfoProvider(IIsoManager isoManager, IBlurayExaminer blurayExaminer, IProtobufSerializer protobufSerializer, ILogManager logManager, IServerConfigurationManager configurationManager) public FFProbeVideoInfoProvider(IIsoManager isoManager, IBlurayExaminer blurayExaminer, IProtobufSerializer protobufSerializer, ILogManager logManager, IServerConfigurationManager configurationManager)
: base(logManager, configurationManager) : base(logManager, configurationManager)
{ {
if (isoManager == null) if (isoManager == null)
@ -253,16 +253,23 @@ namespace MediaBrowser.Controller.Providers.MediaInfo
if (string.Equals(extension, ".srt", StringComparison.OrdinalIgnoreCase)) if (string.Equals(extension, ".srt", StringComparison.OrdinalIgnoreCase))
{ {
if (video.VideoType == VideoType.VideoFile)
{
// For video files the subtitle filename must match video filename
if (!string.Equals(Path.GetFileNameWithoutExtension(video.Path), Path.GetFileNameWithoutExtension(file.Path)))
{
continue;
}
}
streams.Add(new MediaStream streams.Add(new MediaStream
{ {
Index = startIndex, Index = startIndex++,
Type = MediaStreamType.Subtitle, Type = MediaStreamType.Subtitle,
IsExternal = true, IsExternal = true,
Path = file.Path, Path = file.Path,
Codec = "srt" Codec = "srt"
}); });
startIndex++;
} }
} }