aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2013-06-05 10:58:22 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2013-06-05 10:58:22 -0400
commitadab6e21e577a5c8307f6599436e2996c3095399 (patch)
tree8b8851716e8de45ec7a5416ca77a05bc3e856fa9
parentad1a9a4932b1a073bafd930417901ce6a83f35a5 (diff)
update subtitle resolution
-rw-r--r--MediaBrowser.Controller/Providers/MediaInfo/FFProbeVideoInfoProvider.cs34
1 files changed, 14 insertions, 20 deletions
diff --git a/MediaBrowser.Controller/Providers/MediaInfo/FFProbeVideoInfoProvider.cs b/MediaBrowser.Controller/Providers/MediaInfo/FFProbeVideoInfoProvider.cs
index 7ea399fe6..c95f0771f 100644
--- a/MediaBrowser.Controller/Providers/MediaInfo/FFProbeVideoInfoProvider.cs
+++ b/MediaBrowser.Controller/Providers/MediaInfo/FFProbeVideoInfoProvider.cs
@@ -249,31 +249,25 @@ namespace MediaBrowser.Controller.Providers.MediaInfo
var startIndex = video.MediaStreams == null ? 0 : video.MediaStreams.Count;
var streams = new List<MediaStream>();
- foreach (var file in fileSystemChildren.Where(f => !f.Attributes.HasFlag(FileAttributes.Directory)))
+ foreach (var file in fileSystemChildren
+ .Where(f => !f.Attributes.HasFlag(FileAttributes.Directory) && string.Equals(Path.GetExtension(f.FullName), ".srt", StringComparison.OrdinalIgnoreCase)))
{
var fullName = file.FullName;
- var extension = Path.GetExtension(fullName);
- if (string.Equals(extension, ".srt", StringComparison.OrdinalIgnoreCase))
+ // The subtitle filename must match video filename
+ if (!string.Equals(Path.GetFileNameWithoutExtension(video.Path), Path.GetFileNameWithoutExtension(fullName)))
{
- if (video.VideoType == VideoType.VideoFile)
- {
- // For video files the subtitle filename must match video filename
- if (!string.Equals(Path.GetFileNameWithoutExtension(video.Path), Path.GetFileNameWithoutExtension(fullName)))
- {
- continue;
- }
- }
-
- streams.Add(new MediaStream
- {
- Index = startIndex++,
- Type = MediaStreamType.Subtitle,
- IsExternal = true,
- Path = fullName,
- Codec = "srt"
- });
+ continue;
}
+
+ streams.Add(new MediaStream
+ {
+ Index = startIndex++,
+ Type = MediaStreamType.Subtitle,
+ IsExternal = true,
+ Path = fullName,
+ Codec = "srt"
+ });
}
if (video.MediaStreams == null)