Merge pull request #1061 from MediaBrowser/master

resolve reverse proxy issue
This commit is contained in:
Luke
2015-04-01 22:53:01 -04:00
5 changed files with 18 additions and 21 deletions

View File

@@ -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;
}
}

View File

@@ -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; }
}
}

View File

@@ -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
{