diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-10-25 11:52:10 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-10-25 11:52:10 -0400 |
| commit | 55b284cdffd0609a39af4499e582f24cb1cf7524 (patch) | |
| tree | 8198ccd10161e5a4f9ae186e325ac67cd3227b18 /MediaBrowser.Api/Playback/BaseStreamingService.cs | |
| parent | e8bb5c4b9a615c14d569c2fb925b008d1e3cd418 (diff) | |
add user profile settings about virtual episodes
Diffstat (limited to 'MediaBrowser.Api/Playback/BaseStreamingService.cs')
| -rw-r--r-- | MediaBrowser.Api/Playback/BaseStreamingService.cs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs index 067b47d82..646230160 100644 --- a/MediaBrowser.Api/Playback/BaseStreamingService.cs +++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs @@ -399,6 +399,12 @@ namespace MediaBrowser.Api.Playback /// <returns>System.String.</returns> private string GetConvertedAssPath(Video video, MediaStream subtitleStream, long? startTimeTicks, bool performConversion) { + // If it's already ass, no conversion neccessary + //if (string.Equals(Path.GetExtension(subtitleStream.Path), ".ass", StringComparison.OrdinalIgnoreCase)) + //{ + // return subtitleStream.Path; + //} + var offset = TimeSpan.FromTicks(startTimeTicks ?? 0); var path = Kernel.Instance.FFMpegManager.GetSubtitleCachePath(video, subtitleStream.Index, offset, ".ass"); |