From d95057f13bb6d8bfe04ce20138f8cd2fc66c3519 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Tue, 28 Jul 2015 15:42:24 -0400
Subject: rework settings page

---
 MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

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

diff --git a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
index 60b70ad08..fe616c63e 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
@@ -53,7 +53,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
             }
         }
 
-        public async Task<Stream> ConvertSubtitles(Stream stream,
+        private async Task<Stream> ConvertSubtitles(Stream stream,
             string inputFormat,
             string outputFormat,
             long startTimeTicks,
@@ -64,7 +64,9 @@ namespace MediaBrowser.MediaEncoding.Subtitles
 
             try
             {
-                var trackInfo = await GetTrackInfo(stream, inputFormat, cancellationToken).ConfigureAwait(false);
+                var reader = GetReader(inputFormat, true);
+
+                var trackInfo = reader.Parse(stream, cancellationToken);
 
                 FilterEvents(trackInfo, startTimeTicks, endTimeTicks, false);
 
@@ -190,7 +192,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
             {
                 throw new ArgumentNullException("charset");
             }
-
+            
             try
             {
                 return Encoding.GetEncoding(charset);
@@ -257,15 +259,6 @@ namespace MediaBrowser.MediaEncoding.Subtitles
             return new Tuple<string, MediaProtocol, string, bool>(subtitleStream.Path, protocol, currentFormat, true);
         }
 
-        private async Task<SubtitleTrackInfo> GetTrackInfo(Stream stream,
-            string inputFormat,
-            CancellationToken cancellationToken)
-        {
-            var reader = GetReader(inputFormat, true);
-
-            return reader.Parse(stream, cancellationToken);
-        }
-
         private ISubtitleParser GetReader(string format, bool throwIfMissing)
         {
             if (string.IsNullOrEmpty(format))
-- 
cgit v1.2.3


From a4e73120a7b896eb9f90985e0feb8bbaa7ae1d4c Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Tue, 1 Sep 2015 18:04:54 -0400
Subject: update channel streams

---
 MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs     | 2 +-
 MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

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

diff --git a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
index fe616c63e..9d43cafb8 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
@@ -586,7 +586,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
 
             process.StandardError.BaseStream.CopyToAsync(logFileStream);
 
-            var ranToCompletion = process.WaitForExit(60000);
+            var ranToCompletion = process.WaitForExit(120000);
 
             if (!ranToCompletion)
             {
diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
index 9305f7be7..d73b144b8 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
@@ -364,6 +364,11 @@ namespace MediaBrowser.Server.Implementations.LiveTv
         {
             await _liveStreamSemaphore.WaitAsync(cancellationToken).ConfigureAwait(false);
 
+            if (string.Equals(id, mediaSourceId, StringComparison.OrdinalIgnoreCase))
+            {
+                mediaSourceId = null;
+            }
+
             try
             {
                 MediaSourceInfo info;
-- 
cgit v1.2.3