Merge pull request #2249 from MediaBrowser/dev

Dev

3 files changed, 6 insertions, 0 deletions

diff --git a/MediaBrowser.Model/Dto/MediaSourceInfo.cs b/MediaBrowser.Model/Dto/MediaSourceInfo.cs
index 8149e3ff5..0b047f9e8 100644
--- a/MediaBrowser.Model/Dto/MediaSourceInfo.cs
+++ b/MediaBrowser.Model/Dto/MediaSourceInfo.cs
@@ -31,6 +31,7 @@ namespace MediaBrowser.Model.Dto
         public bool RequiresOpening { get; set; }
         public string OpenToken { get; set; }
         public bool RequiresClosing { get; set; }
+        public bool SupportsProbing { get; set; }
         public string LiveStreamId { get; set; }
         public int? BufferMs { get; set; }
 
@@ -63,6 +64,7 @@ namespace MediaBrowser.Model.Dto
             SupportsTranscoding = true;
             SupportsDirectStream = true;
             SupportsDirectPlay = true;
+            SupportsProbing = true;
         }
 
         public int? DefaultAudioStreamIndex { get; set; }
diff --git a/MediaBrowser.Model/MediaInfo/LiveStreamRequest.cs b/MediaBrowser.Model/MediaInfo/LiveStreamRequest.cs
index 3affbbcc3..b6e2a96aa 100644
--- a/MediaBrowser.Model/MediaInfo/LiveStreamRequest.cs
+++ b/MediaBrowser.Model/MediaInfo/LiveStreamRequest.cs
@@ -11,6 +11,7 @@ namespace MediaBrowser.Model.MediaInfo
         public long? StartTimeTicks { get; set; }
         public int? AudioStreamIndex { get; set; }
         public int? SubtitleStreamIndex { get; set; }
+        public int? MaxAudioChannels { get; set; }
         public string ItemId { get; set; }
         public DeviceProfile DeviceProfile { get; set; }
 
@@ -24,6 +25,7 @@ namespace MediaBrowser.Model.MediaInfo
             MaxStreamingBitrate = options.MaxBitrate;
             ItemId = options.ItemId;
             DeviceProfile = options.Profile;
+            MaxAudioChannels = options.MaxAudioChannels;
 
             VideoOptions videoOptions = options as VideoOptions;
             if (videoOptions != null)
diff --git a/MediaBrowser.Model/MediaInfo/PlaybackInfoRequest.cs b/MediaBrowser.Model/MediaInfo/PlaybackInfoRequest.cs
index 124739073..a2b85d121 100644
--- a/MediaBrowser.Model/MediaInfo/PlaybackInfoRequest.cs
+++ b/MediaBrowser.Model/MediaInfo/PlaybackInfoRequest.cs
@@ -16,6 +16,8 @@ namespace MediaBrowser.Model.MediaInfo
 
         public int? SubtitleStreamIndex { get; set; }
 
+        public int? MaxAudioChannels { get; set; }
+
         public string MediaSourceId { get; set; }
 
         public string LiveStreamId { get; set; }