Merge pull request #2591 from MediaBrowser/beta

Beta

6 files changed, 10 insertions, 29 deletions

diff --git a/MediaBrowser.Model/Dlna/MediaFormatProfileResolver.cs b/MediaBrowser.Model/Dlna/MediaFormatProfileResolver.cs
index ffff0f27d5..a464b045bf 100644
--- a/MediaBrowser.Model/Dlna/MediaFormatProfileResolver.cs
+++ b/MediaBrowser.Model/Dlna/MediaFormatProfileResolver.cs
@@ -349,7 +349,7 @@ namespace MediaBrowser.Model.Dlna
                 {
                     return MediaFormatProfile.LPCM16_48_MONO;
                 }
-                if (frequency.Value == 48000 && channels.Value == 1)
+                if (frequency.Value == 48000 && channels.Value == 2)
                 {
                     return MediaFormatProfile.LPCM16_48_STEREO;
                 }
diff --git a/MediaBrowser.Model/Dto/MediaSourceInfo.cs b/MediaBrowser.Model/Dto/MediaSourceInfo.cs
index d416cfd96c..1315830247 100644
--- a/MediaBrowser.Model/Dto/MediaSourceInfo.cs
+++ b/MediaBrowser.Model/Dto/MediaSourceInfo.cs
@@ -40,6 +40,8 @@ namespace MediaBrowser.Model.Dto
         public string LiveStreamId { get; set; }
         public int? BufferMs { get; set; }
 
+        public bool RequiresLooping { get; set; }
+
         public VideoType? VideoType { get; set; }
 
         public IsoType? IsoType { get; set; }
diff --git a/MediaBrowser.Model/Entities/MediaStream.cs b/MediaBrowser.Model/Entities/MediaStream.cs
index 133b9e5663..3cd3e7dde9 100644
--- a/MediaBrowser.Model/Entities/MediaStream.cs
+++ b/MediaBrowser.Model/Entities/MediaStream.cs
@@ -13,11 +13,6 @@ namespace MediaBrowser.Model.Entities
     [DebuggerDisplay("StreamType = {Type}")]
     public class MediaStream
     {
-        public MediaStream()
-        {
-            AllowStreamCopy = true;
-        }
-
         /// <summary>
         /// Gets or sets the codec.
         /// </summary>
@@ -158,8 +153,6 @@ namespace MediaBrowser.Model.Entities
 
         public bool? IsAVC { get; set; }
 
-        public bool AllowStreamCopy { get; set; }
-
         /// <summary>
         /// Gets or sets the channel layout.
         /// </summary>
diff --git a/MediaBrowser.Model/Session/PlaybackStartInfo.cs b/MediaBrowser.Model/Session/PlaybackStartInfo.cs
index d1ea2841e5..f6f496e4ea 100644
--- a/MediaBrowser.Model/Session/PlaybackStartInfo.cs
+++ b/MediaBrowser.Model/Session/PlaybackStartInfo.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-
+
 namespace MediaBrowser.Model.Session
 {
     /// <summary>
@@ -7,15 +6,5 @@ namespace MediaBrowser.Model.Session
     /// </summary>
     public class PlaybackStartInfo : PlaybackProgressInfo
     {
-        public PlaybackStartInfo()
-        {
-            QueueableMediaTypes = new List<string>();
-        }
-
-        /// <summary>
-        /// Gets or sets the queueable media types.
-        /// </summary>
-        /// <value>The queueable media types.</value>
-        public List<string> QueueableMediaTypes { get; set; }
     }
 }
diff --git a/MediaBrowser.Model/Session/SessionInfoDto.cs b/MediaBrowser.Model/Session/SessionInfoDto.cs
index 42263c6442..0909d255ae 100644
--- a/MediaBrowser.Model/Session/SessionInfoDto.cs
+++ b/MediaBrowser.Model/Session/SessionInfoDto.cs
@@ -15,12 +15,6 @@ namespace MediaBrowser.Model.Session
         public List<string> SupportedCommands { get; set; }
 
         /// <summary>
-        /// Gets or sets the queueable media types.
-        /// </summary>
-        /// <value>The queueable media types.</value>
-        public List<string> QueueableMediaTypes { get; set; }
-
-        /// <summary>
         /// Gets or sets the playable media types.
         /// </summary>
         /// <value>The playable media types.</value>
@@ -119,7 +113,6 @@ namespace MediaBrowser.Model.Session
             AdditionalUsers = new List<SessionUserInfo>();
 
             PlayableMediaTypes = new List<string>();
-            QueueableMediaTypes = new List<string>();
             SupportedCommands = new List<string>();
         }
     }
diff --git a/MediaBrowser.Model/Text/ITextEncoding.cs b/MediaBrowser.Model/Text/ITextEncoding.cs
index 6901f1f944..7424f00f5c 100644
--- a/MediaBrowser.Model/Text/ITextEncoding.cs
+++ b/MediaBrowser.Model/Text/ITextEncoding.cs
@@ -1,10 +1,14 @@
-using System.Text;
+using System.IO;
+using System.Text;
 
 namespace MediaBrowser.Model.Text
 {
     public interface ITextEncoding
     {
         Encoding GetASCIIEncoding();
-        Encoding GetFileEncoding(string path);
+
+        string GetDetectedEncodingName(byte[] bytes, string language);
+        Encoding GetDetectedEncoding(byte[] bytes, string language);
+        Encoding GetEncodingFromCharset(string charset);
     }
 }