aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2015-03-14 14:54:53 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2015-03-14 14:54:53 -0400
commit6acfee7df67b95b919c6d3aedf3fc16b25edf974 (patch)
treef586a1a8e7207938a4937cdca9585a0068517eb7
parentb7525a733c8f41c7e960db46c6e17b83cfb3a38e (diff)
update StreamBuilder
-rw-r--r--MediaBrowser.Model/Dlna/StreamBuilder.cs13
1 files changed, 11 insertions, 2 deletions
diff --git a/MediaBrowser.Model/Dlna/StreamBuilder.cs b/MediaBrowser.Model/Dlna/StreamBuilder.cs
index 07c7ecd8b..b798da748 100644
--- a/MediaBrowser.Model/Dlna/StreamBuilder.cs
+++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs
@@ -184,6 +184,12 @@ namespace MediaBrowser.Model.Dlna
{
playlistItem.PlayMethod = PlayMethod.DirectPlay;
}
+ else if (item.Protocol == MediaProtocol.Http &&
+ directPlayMethods.Contains(PlayMethod.DirectPlay) &&
+ _localPlayer.CanAccessUrl(item.Path, item.RequiredHttpHeaders.Count > 0))
+ {
+ playlistItem.PlayMethod = PlayMethod.DirectPlay;
+ }
else if (directPlayMethods.Contains(PlayMethod.DirectStream))
{
playlistItem.PlayMethod = PlayMethod.DirectStream;
@@ -578,9 +584,12 @@ namespace MediaBrowser.Model.Dlna
}
}
- else if (mediaSource.Protocol == MediaProtocol.File && _localPlayer.CanAccessFile(mediaSource.Path))
+ else if (mediaSource.Protocol == MediaProtocol.File)
{
- return PlayMethod.DirectPlay;
+ if (_localPlayer.CanAccessFile(mediaSource.Path))
+ {
+ return PlayMethod.DirectPlay;
+ }
}
return PlayMethod.DirectStream;