aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Model/Dlna/StreamInfo.cs
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2015-03-26 12:58:02 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2015-03-26 12:58:02 -0400
commit348b8c44142ce14a8395552f8d429fb9d0b24a36 (patch)
treec853efe8395ded4ea0f5c08f521c2863028a46e3 /MediaBrowser.Model/Dlna/StreamInfo.cs
parent46c92107490263f8e6abefbd2259780013fa195d (diff)
use server to build initial stream url's
Diffstat (limited to 'MediaBrowser.Model/Dlna/StreamInfo.cs')
-rw-r--r--MediaBrowser.Model/Dlna/StreamInfo.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/MediaBrowser.Model/Dlna/StreamInfo.cs b/MediaBrowser.Model/Dlna/StreamInfo.cs
index 4eb1c0a8ef..63ddd07cd7 100644
--- a/MediaBrowser.Model/Dlna/StreamInfo.cs
+++ b/MediaBrowser.Model/Dlna/StreamInfo.cs
@@ -24,7 +24,7 @@ namespace MediaBrowser.Model.Dlna
public string Container { get; set; }
- public string Protocol { get; set; }
+ public string SubProtocol { get; set; }
public long StartPositionTicks { get; set; }
@@ -69,7 +69,7 @@ namespace MediaBrowser.Model.Dlna
public SubtitleDeliveryMethod SubtitleDeliveryMethod { get; set; }
public string SubtitleFormat { get; set; }
- public LiveMediaInfoResult PlaybackInfo { get; set; }
+ public PlaybackInfoResponse PlaybackInfo { get; set; }
public string MediaSourceId
{
@@ -115,7 +115,7 @@ namespace MediaBrowser.Model.Dlna
return string.Format("{0}/audio/{1}/stream{2}?{3}", baseUrl, ItemId, extension, dlnaCommand);
}
- if (StringHelper.EqualsIgnoreCase(Protocol, "hls"))
+ if (StringHelper.EqualsIgnoreCase(SubProtocol, "hls"))
{
return string.Format("{0}/videos/{1}/master.m3u8?{2}", baseUrl, ItemId, dlnaCommand);
}
@@ -207,7 +207,7 @@ namespace MediaBrowser.Model.Dlna
List<SubtitleStreamInfo> list = new List<SubtitleStreamInfo>();
// HLS will preserve timestamps so we can just grab the full subtitle stream
- long startPositionTicks = StringHelper.EqualsIgnoreCase(Protocol, "hls")
+ long startPositionTicks = StringHelper.EqualsIgnoreCase(SubProtocol, "hls")
? 0
: StartPositionTicks;