Merge pull request #325 from jellyfin/devv3.5.2-5

Master 3.5.2-5

7 files changed, 11 insertions, 25 deletions

diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index 58a839167..cc1275035 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -246,7 +246,7 @@ namespace MediaBrowser.Model.Configuration
             SortRemoveCharacters = new[] { ",", "&", "-", "{", "}", "'" };
             SortRemoveWords = new[] { "the", "a", "an" };
 
-            UICulture = "en-us";
+            UICulture = "en-US";
 
             MetadataOptions = new[]
             {
@@ -310,4 +310,4 @@ namespace MediaBrowser.Model.Configuration
         public string From { get; set; }
         public string To { get; set; }
     }
-}
\ No newline at end of file
+}
diff --git a/MediaBrowser.Model/Dlna/MediaFormatProfileResolver.cs b/MediaBrowser.Model/Dlna/MediaFormatProfileResolver.cs
index b6f329387..81d58336b 100644
--- a/MediaBrowser.Model/Dlna/MediaFormatProfileResolver.cs
+++ b/MediaBrowser.Model/Dlna/MediaFormatProfileResolver.cs
@@ -101,7 +101,7 @@ namespace MediaBrowser.Model.Dlna
                 {
                     list.Add(MediaFormatProfile.MPEG_TS_JP_T);
                 }
-                return list.ToArray(list.Count);
+                return list.ToArray();
             }
             if (StringHelper.EqualsIgnoreCase(videoCodec, "h264"))
             {
diff --git a/MediaBrowser.Model/Dlna/StreamInfo.cs b/MediaBrowser.Model/Dlna/StreamInfo.cs
index 46a1cd68b..c927cd31c 100644
--- a/MediaBrowser.Model/Dlna/StreamInfo.cs
+++ b/MediaBrowser.Model/Dlna/StreamInfo.cs
@@ -186,7 +186,7 @@ namespace MediaBrowser.Model.Dlna
                 list.Add(string.Format("{0}={1}", pair.Name, encodedValue));
             }
 
-            string queryString = string.Join("&", list.ToArray(list.Count));
+            string queryString = string.Join("&", list.ToArray());
 
             return GetUrl(baseUrl, queryString);
         }
diff --git a/MediaBrowser.Model/Entities/MediaStream.cs b/MediaBrowser.Model/Entities/MediaStream.cs
index fc208459d..35369fbbb 100644
--- a/MediaBrowser.Model/Entities/MediaStream.cs
+++ b/MediaBrowser.Model/Entities/MediaStream.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 using System.Collections.Generic;
 using MediaBrowser.Model.Dlna;
 using MediaBrowser.Model.Extensions;
@@ -104,7 +105,7 @@ namespace MediaBrowser.Model.Entities
                         attributes.Add("Default");
                     }
 
-                    return string.Join(" ", attributes.ToArray(attributes.Count));
+                    return string.Join(" ", attributes.ToArray());
                 }
 
                 if (Type == MediaStreamType.Video)
@@ -123,7 +124,7 @@ namespace MediaBrowser.Model.Entities
                         attributes.Add(Codec.ToUpper());
                     }
 
-                    return string.Join(" ", attributes.ToArray(attributes.Count));
+                    return string.Join(" ", attributes.ToArray());
                 }
 
                 if (Type == MediaStreamType.Subtitle)
@@ -154,7 +155,7 @@ namespace MediaBrowser.Model.Entities
                         attributes.Add("Forced");
                     }
 
-                    string name = string.Join(" ", attributes.ToArray(attributes.Count));
+                    string name = string.Join(" ", attributes.ToArray());
 
                     return name;
                 }
diff --git a/MediaBrowser.Model/Extensions/LinqExtensions.cs b/MediaBrowser.Model/Extensions/LinqExtensions.cs
index 09ace42e8..1223e689e 100644
--- a/MediaBrowser.Model/Extensions/LinqExtensions.cs
+++ b/MediaBrowser.Model/Extensions/LinqExtensions.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 
+// TODO: @bond Remove
 namespace MediaBrowser.Model.Extensions
 {
     // MoreLINQ - Extensions to LINQ to Objects
@@ -42,19 +43,6 @@ namespace MediaBrowser.Model.Extensions
             return source.DistinctBy(keySelector, null);
         }
 
-        public static TSource[] ToArray<TSource>(this IEnumerable<TSource> source, int count)
-        {
-            if (source == null) throw new ArgumentNullException("source");
-            if (count < 0) throw new ArgumentOutOfRangeException("count");
-            var array = new TSource[count];
-            int i = 0;
-            foreach (var item in source)
-            {
-                array[i++] = item;
-            }
-            return array;
-        }
-
         /// <summary>
         /// Returns all distinct elements of the given source, where "distinctness"
         /// is determined via a projection and the specified comparer for the projected type.
diff --git a/MediaBrowser.Model/Services/HttpUtility.cs b/MediaBrowser.Model/Services/HttpUtility.cs
index 5cc0cc37d..f8fd96801 100644
--- a/MediaBrowser.Model/Services/HttpUtility.cs
+++ b/MediaBrowser.Model/Services/HttpUtility.cs
@@ -2,8 +2,6 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Text;
-using MediaBrowser.Model.Services;
-using MediaBrowser.Model.Extensions;
 
 namespace MediaBrowser.Model.Services
 {
@@ -586,7 +584,7 @@ namespace MediaBrowser.Model.Services
                     WriteCharBytes(bytes, ch, e);
             }
 
-            byte[] buf = bytes.ToArray(bytes.Count);
+            byte[] buf = bytes.ToArray();
             bytes = null;
             return e.GetString(buf, 0, buf.Length);
 
diff --git a/MediaBrowser.Model/Services/QueryParamCollection.cs b/MediaBrowser.Model/Services/QueryParamCollection.cs
index 6f8a76598..4dd4303a8 100644
--- a/MediaBrowser.Model/Services/QueryParamCollection.cs
+++ b/MediaBrowser.Model/Services/QueryParamCollection.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using MediaBrowser.Model.Dto;
-using MediaBrowser.Model.Extensions;
 
 namespace MediaBrowser.Model.Services
 {
@@ -221,7 +220,7 @@ namespace MediaBrowser.Model.Services
 
         public override String ToString()
         {
-            var vals = this.Select(GetQueryStringValue).ToArray(this.Count);
+            var vals = this.Select(GetQueryStringValue).ToArray();
 
             return string.Join("&", vals);
         }