aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Model
diff options
context:
space:
mode:
authorLuke <luke.pulverenti@gmail.com>2015-04-01 22:53:01 -0400
committerLuke <luke.pulverenti@gmail.com>2015-04-01 22:53:01 -0400
commit2b40504d5beff30a2ebe359b4573b8ba40caa8c3 (patch)
treefaba80d0ff649d61afed990717c01a85a545fb70 /MediaBrowser.Model
parentf8667ab6c1d0340c47d7b8bd173472a1fde60c10 (diff)
parentf8927ceb067365d89406263ec1ca9084eb10b8e0 (diff)
Merge pull request #1061 from MediaBrowser/master
resolve reverse proxy issue
Diffstat (limited to 'MediaBrowser.Model')
-rw-r--r--MediaBrowser.Model/Dlna/StreamInfo.cs3
-rw-r--r--MediaBrowser.Model/Dlna/SubtitleStreamInfo.cs1
-rw-r--r--MediaBrowser.Model/Entities/MediaStream.cs7
3 files changed, 10 insertions, 1 deletions
diff --git a/MediaBrowser.Model/Dlna/StreamInfo.cs b/MediaBrowser.Model/Dlna/StreamInfo.cs
index a2f5fcb10..a57bc0c0e 100644
--- a/MediaBrowser.Model/Dlna/StreamInfo.cs
+++ b/MediaBrowser.Model/Dlna/StreamInfo.cs
@@ -321,10 +321,13 @@ namespace MediaBrowser.Model.Dlna
StringHelper.ToStringCultureInvariant(stream.Index),
StringHelper.ToStringCultureInvariant(startPositionTicks),
subtitleProfile.Format);
+
+ info.IsExternalUrl = false;
}
else
{
info.Url = stream.Path;
+ info.IsExternalUrl = true;
}
}
diff --git a/MediaBrowser.Model/Dlna/SubtitleStreamInfo.cs b/MediaBrowser.Model/Dlna/SubtitleStreamInfo.cs
index 602858ccc..61b2895fc 100644
--- a/MediaBrowser.Model/Dlna/SubtitleStreamInfo.cs
+++ b/MediaBrowser.Model/Dlna/SubtitleStreamInfo.cs
@@ -9,5 +9,6 @@ namespace MediaBrowser.Model.Dlna
public string Format { get; set; }
public int Index { get; set; }
public SubtitleDeliveryMethod DeliveryMethod { get; set; }
+ public bool IsExternalUrl { get; set; }
}
} \ No newline at end of file
diff --git a/MediaBrowser.Model/Entities/MediaStream.cs b/MediaBrowser.Model/Entities/MediaStream.cs
index dfeed7450..0f3435174 100644
--- a/MediaBrowser.Model/Entities/MediaStream.cs
+++ b/MediaBrowser.Model/Entities/MediaStream.cs
@@ -135,7 +135,7 @@ namespace MediaBrowser.Model.Entities
/// </summary>
/// <value>The score.</value>
public int? Score { get; set; }
-
+
/// <summary>
/// Gets or sets a value indicating whether this instance is external.
/// </summary>
@@ -152,6 +152,11 @@ namespace MediaBrowser.Model.Entities
/// </summary>
/// <value>The delivery URL.</value>
public string DeliveryUrl { get; set; }
+ /// <summary>
+ /// Gets or sets a value indicating whether this instance is external URL.
+ /// </summary>
+ /// <value><c>null</c> if [is external URL] contains no value, <c>true</c> if [is external URL]; otherwise, <c>false</c>.</value>
+ public bool? IsExternalUrl { get; set; }
public bool IsTextSubtitleStream
{