Clean up ConvertSubtitles

1 files changed, 8 insertions, 24 deletions

diff --git a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
index 2dc71d08c4..0192aa57f2 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
@@ -79,34 +79,18 @@ namespace MediaBrowser.MediaEncoding.Subtitles
             string outputFormat,
             long startTimeTicks,
             long endTimeTicks,
-            bool preserveOriginalTimestamps,
-            CancellationToken cancellationToken)
+            bool preserveOriginalTimestamps)
         {
-            var ms = new MemoryStream();
-
-            try
-            {
-                var subtitle = Subtitle.Parse(stream, Path.GetExtension(inputInfo.Path));
-
-                FilterEvents(subtitle, startTimeTicks, endTimeTicks, preserveOriginalTimestamps);
+            var subtitle = Subtitle.Parse(stream, Path.GetExtension(inputInfo.Path));
 
-                var formatter = GetWriter(outputFormat);
+            FilterEvents(subtitle, startTimeTicks, endTimeTicks, preserveOriginalTimestamps);
 
-                var text = formatter.ToText(subtitle, "untitled");
-                using (var writer = new StreamWriter(stream, Encoding.UTF8, 1024, true))
-                {
-                    writer.Write(text);
-                }
+            var formatter = GetWriter(outputFormat);
 
-                ms.Position = 0;
-            }
-            catch
-            {
-                ms.Dispose();
-                throw;
-            }
+            var text = formatter.ToText(subtitle, "untitled");
+            var bytes = Encoding.UTF8.GetBytes(text);
 
-            return ms;
+            return new MemoryStream(bytes, 0, bytes.Length, false, true);
         }
 
         internal void FilterEvents(Subtitle track, long startPositionTicks, long endTimeTicks, bool preserveTimestamps)
@@ -163,7 +147,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
 
             using (stream)
             {
-                return ConvertSubtitles(stream, info, outputFormat, startTimeTicks, endTimeTicks, preserveOriginalTimestamps, cancellationToken);
+                return ConvertSubtitles(stream, info, outputFormat, startTimeTicks, endTimeTicks, preserveOriginalTimestamps);
             }
         }