aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Server.Implementations
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2015-08-02 15:08:55 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2015-08-02 15:08:55 -0400
commit47b1a4cafd0cc1882503e46fb8a5082a3b061078 (patch)
treec3bc12ad2abcec38aa254ae5c1354b762ad4e38a /MediaBrowser.Server.Implementations
parent6d13cec38ed243a8bc133c52a167e23eac01aae6 (diff)
update image processing
Diffstat (limited to 'MediaBrowser.Server.Implementations')
-rw-r--r--MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs2
-rw-r--r--MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs4
-rw-r--r--MediaBrowser.Server.Implementations/LiveTv/LiveTvMediaSourceProvider.cs8
3 files changed, 9 insertions, 5 deletions
diff --git a/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs b/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs
index 2263b3e1f..c5ff100f9 100644
--- a/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs
@@ -449,7 +449,7 @@ namespace MediaBrowser.Server.Implementations.Library
LiveStreamInfo current;
if (_openStreams.TryGetValue(id, out current))
{
- if (current.MediaSource.RequiresClosing ?? false)
+ if (current.MediaSource.RequiresClosing)
{
var tuple = GetProvider(id);
diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
index f73e648fa..b4669f53e 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
@@ -368,7 +368,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
info = await service.GetChannelStream(channel.ExternalId, mediaSourceId, cancellationToken).ConfigureAwait(false);
info.RequiresClosing = true;
- if (info.RequiresClosing ?? false)
+ if (info.RequiresClosing)
{
var idPrefix = service.GetType().FullName.GetMD5().ToString("N") + "_";
@@ -385,7 +385,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
info = await service.GetRecordingStream(recording.ExternalId, null, cancellationToken).ConfigureAwait(false);
info.RequiresClosing = true;
- if (info.RequiresClosing ?? false)
+ if (info.RequiresClosing)
{
var idPrefix = service.GetType().FullName.GetMD5().ToString("N") + "_";
diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvMediaSourceProvider.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvMediaSourceProvider.cs
index cf34b6b99..66a21830e 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvMediaSourceProvider.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvMediaSourceProvider.cs
@@ -59,6 +59,8 @@ namespace MediaBrowser.Server.Implementations.LiveTv
{
IEnumerable<MediaSourceInfo> sources;
+ var forceRequireOpening = false;
+
try
{
if (item is ILiveTvRecording)
@@ -78,6 +80,8 @@ namespace MediaBrowser.Server.Implementations.LiveTv
sources = _mediaSourceManager.GetStaticMediaSources(hasMediaSources, false)
.ToList();
+
+ forceRequireOpening = true;
}
var list = sources.ToList();
@@ -87,12 +91,12 @@ namespace MediaBrowser.Server.Implementations.LiveTv
{
source.Type = MediaSourceType.Default;
- if (!source.RequiresOpening.HasValue)
+ if (source.RequiresOpening || forceRequireOpening)
{
source.RequiresOpening = true;
}
- if (source.RequiresOpening.HasValue && source.RequiresOpening.Value)
+ if (source.RequiresOpening)
{
var openKeys = new List<string>();
openKeys.Add(item.GetType().Name);