Merge branch 'master' into nullable2

3 files changed, 62 insertions, 9 deletions

diff --git a/MediaBrowser.Model/Entities/MediaAttachment.cs b/MediaBrowser.Model/Entities/MediaAttachment.cs
new file mode 100644
index 0000000000..8f8c3efd20
--- /dev/null
+++ b/MediaBrowser.Model/Entities/MediaAttachment.cs
@@ -0,0 +1,50 @@
+namespace MediaBrowser.Model.Entities
+{
+    /// <summary>
+    /// Class MediaAttachment
+    /// </summary>
+    public class MediaAttachment
+    {
+        /// <summary>
+        /// Gets or sets the codec.
+        /// </summary>
+        /// <value>The codec.</value>
+        public string Codec { get; set; }
+
+        /// <summary>
+        /// Gets or sets the codec tag.
+        /// </summary>
+        /// <value>The codec tag.</value>
+        public string CodecTag { get; set; }
+
+        /// <summary>
+        /// Gets or sets the comment.
+        /// </summary>
+        /// <value>The comment.</value>
+        public string Comment { get; set; }
+
+        /// <summary>
+        /// Gets or sets the index.
+        /// </summary>
+        /// <value>The index.</value>
+        public int Index { get; set; }
+
+        /// <summary>
+        /// Gets or sets the filename.
+        /// </summary>
+        /// <value>The filename.</value>
+        public string FileName { get; set; }
+
+        /// <summary>
+        /// Gets or sets the MIME type.
+        /// </summary>
+        /// <value>The MIME type.</value>
+        public string MimeType { get; set; }
+
+        /// <summary>
+        /// Gets or sets the delivery URL.
+        /// </summary>
+        /// <value>The delivery URL.</value>
+        public string DeliveryUrl { get; set; }
+    }
+}
diff --git a/MediaBrowser.Model/Entities/MediaStream.cs b/MediaBrowser.Model/Entities/MediaStream.cs
index 5652962daf..5122f42b8a 100644
--- a/MediaBrowser.Model/Entities/MediaStream.cs
+++ b/MediaBrowser.Model/Entities/MediaStream.cs
@@ -88,11 +88,11 @@ namespace MediaBrowser.Model.Entities
                     {
                         attributes.Add(StringHelper.FirstToUpper(Language));
                     }
-                    if (!string.IsNullOrEmpty(Codec) && !StringHelper.EqualsIgnoreCase(Codec, "dca"))
+                    if (!string.IsNullOrEmpty(Codec) && !string.Equals(Codec, "dca", StringComparison.OrdinalIgnoreCase))
                     {
                         attributes.Add(AudioCodec.GetFriendlyName(Codec));
                     }
-                    else if (!string.IsNullOrEmpty(Profile) && !StringHelper.EqualsIgnoreCase(Profile, "lc"))
+                    else if (!string.IsNullOrEmpty(Profile) && !string.Equals(Profile, "lc", StringComparison.OrdinalIgnoreCase))
                     {
                         attributes.Add(Profile);
                     }
@@ -394,8 +394,8 @@ namespace MediaBrowser.Model.Entities
             return codec.IndexOf("pgs", StringComparison.OrdinalIgnoreCase) == -1 &&
                    codec.IndexOf("dvd", StringComparison.OrdinalIgnoreCase) == -1 &&
                    codec.IndexOf("dvbsub", StringComparison.OrdinalIgnoreCase) == -1 &&
-                   !StringHelper.EqualsIgnoreCase(codec, "sub") &&
-                   !StringHelper.EqualsIgnoreCase(codec, "dvb_subtitle");
+                   !string.Equals(codec, "sub", StringComparison.OrdinalIgnoreCase) &&
+                   !string.Equals(codec, "dvb_subtitle", StringComparison.OrdinalIgnoreCase);
         }
 
         public bool SupportsSubtitleConversionTo(string toCodec)
@@ -408,21 +408,21 @@ namespace MediaBrowser.Model.Entities
             var fromCodec = Codec;
 
             // Can't convert from this
-            if (StringHelper.EqualsIgnoreCase(fromCodec, "ass"))
+            if (string.Equals(fromCodec, "ass", StringComparison.OrdinalIgnoreCase))
             {
                 return false;
             }
-            if (StringHelper.EqualsIgnoreCase(fromCodec, "ssa"))
+            if (string.Equals(fromCodec, "ssa", StringComparison.OrdinalIgnoreCase))
             {
                 return false;
             }
 
             // Can't convert to this
-            if (StringHelper.EqualsIgnoreCase(toCodec, "ass"))
+            if (string.Equals(toCodec, "ass", StringComparison.OrdinalIgnoreCase))
             {
                 return false;
             }
-            if (StringHelper.EqualsIgnoreCase(toCodec, "ssa"))
+            if (string.Equals(toCodec, "ssa", StringComparison.OrdinalIgnoreCase))
             {
                 return false;
             }
diff --git a/MediaBrowser.Model/Entities/MediaType.cs b/MediaBrowser.Model/Entities/MediaType.cs
index c56c8f8f22..d8b02c9eae 100644
--- a/MediaBrowser.Model/Entities/MediaType.cs
+++ b/MediaBrowser.Model/Entities/MediaType.cs
@@ -3,20 +3,23 @@ namespace MediaBrowser.Model.Entities
     /// <summary>
     /// Class MediaType
     /// </summary>
-    public class MediaType
+    public static class MediaType
     {
         /// <summary>
         /// The video
         /// </summary>
         public const string Video = "Video";
+
         /// <summary>
         /// The audio
         /// </summary>
         public const string Audio = "Audio";
+
         /// <summary>
         /// The photo
         /// </summary>
         public const string Photo = "Photo";
+
         /// <summary>
         /// The book
         /// </summary>