From 60d3f475033cef64a8f3153beb910e48529c8e16 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Tue, 4 Nov 2014 07:41:12 -0500
Subject: add server management to web client

---
 .../Subtitles/SubtitleEncoder.cs                   | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

(limited to 'MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs')

diff --git a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
index 3b8dafa8e..e3eb33ec5 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
@@ -58,23 +58,13 @@ namespace MediaBrowser.MediaEncoding.Subtitles
 
             try
             {
-                // Return the original without any conversions, if possible
-                if (startTimeTicks == 0 &&
-                    !endTimeTicks.HasValue &&
-                    string.Equals(inputFormat, outputFormat, StringComparison.OrdinalIgnoreCase))
-                {
-                    await stream.CopyToAsync(ms, 81920, cancellationToken).ConfigureAwait(false);
-                }
-                else
-                {
-                    var trackInfo = await GetTrackInfo(stream, inputFormat, cancellationToken).ConfigureAwait(false);
+                var trackInfo = await GetTrackInfo(stream, inputFormat, cancellationToken).ConfigureAwait(false);
 
-                    FilterEvents(trackInfo, startTimeTicks, endTimeTicks, false);
+                FilterEvents(trackInfo, startTimeTicks, endTimeTicks, false);
 
-                    var writer = GetWriter(outputFormat);
+                var writer = GetWriter(outputFormat);
 
-                    writer.Write(trackInfo, ms, cancellationToken);
-                }
+                writer.Write(trackInfo, ms, cancellationToken);
                 ms.Position = 0;
             }
             catch
@@ -239,10 +229,10 @@ namespace MediaBrowser.MediaEncoding.Subtitles
                 await ConvertTextSubtitleToSrt(subtitleStream.Path, outputPath, subtitleStream.Language, cancellationToken)
                         .ConfigureAwait(false);
 
-                return new Tuple<string, string, bool>(outputPath, "srt", false);
+                return new Tuple<string, string, bool>(outputPath, "srt", true);
             }
 
-            return new Tuple<string, string, bool>(subtitleStream.Path, currentFormat, false);
+            return new Tuple<string, string, bool>(subtitleStream.Path, currentFormat, true);
         }
 
         private async Task<SubtitleTrackInfo> GetTrackInfo(Stream stream,
-- 
cgit v1.2.3