Merging in latest dev

1 files changed, 35 insertions, 1 deletions

diff --git a/MediaBrowser.Model/Entities/MediaStream.cs b/MediaBrowser.Model/Entities/MediaStream.cs
index 4af32bb50..0f3435174 100644
--- a/MediaBrowser.Model/Entities/MediaStream.cs
+++ b/MediaBrowser.Model/Entities/MediaStream.cs
@@ -1,4 +1,5 @@
-using MediaBrowser.Model.Extensions;
+using MediaBrowser.Model.Dlna;
+using MediaBrowser.Model.Extensions;
 using System.Diagnostics;
 
 namespace MediaBrowser.Model.Entities
@@ -130,17 +131,44 @@ namespace MediaBrowser.Model.Entities
         public int Index { get; set; }
 
         /// <summary>
+        /// Gets or sets the score.
+        /// </summary>
+        /// <value>The score.</value>
+        public int? Score { get; set; }
+
+        /// <summary>
         /// Gets or sets a value indicating whether this instance is external.
         /// </summary>
         /// <value><c>true</c> if this instance is external; otherwise, <c>false</c>.</value>
         public bool IsExternal { get; set; }
 
+        /// <summary>
+        /// Gets or sets the method.
+        /// </summary>
+        /// <value>The method.</value>
+        public SubtitleDeliveryMethod? DeliveryMethod { get; set; }
+        /// <summary>
+        /// Gets or sets the delivery URL.
+        /// </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
         {
             get
             {
                 if (Type != MediaStreamType.Subtitle) return false;
 
+                if (string.IsNullOrEmpty(Codec) && !IsExternal)
+                {
+                    return false;
+                }
+
                 return IsTextFormat(Codec);
             }
         }
@@ -169,6 +197,12 @@ namespace MediaBrowser.Model.Entities
         public string Path { get; set; }
 
         /// <summary>
+        /// Gets or sets the external identifier.
+        /// </summary>
+        /// <value>The external identifier.</value>
+        public string ExternalId { get; set; }
+
+        /// <summary>
         /// Gets or sets the pixel format.
         /// </summary>
         /// <value>The pixel format.</value>