Merge pull request #2739 from MediaBrowser/beta

Beta

1 files changed, 9 insertions, 4 deletions

diff --git a/MediaBrowser.Model/Dlna/ConditionProcessor.cs b/MediaBrowser.Model/Dlna/ConditionProcessor.cs
index a388bf98b..291096f75 100644
--- a/MediaBrowser.Model/Dlna/ConditionProcessor.cs
+++ b/MediaBrowser.Model/Dlna/ConditionProcessor.cs
@@ -12,7 +12,7 @@ namespace MediaBrowser.Model.Dlna
         public bool IsVideoConditionSatisfied(ProfileCondition condition,
             int? width,
             int? height,
-            int? bitDepth,
+            int? videoBitDepth,
             int? videoBitrate,
             string videoProfile,
             double? videoLevel,
@@ -46,7 +46,7 @@ namespace MediaBrowser.Model.Dlna
                 case ProfileConditionValue.PacketLength:
                     return IsConditionSatisfied(condition, packetLength);
                 case ProfileConditionValue.VideoBitDepth:
-                    return IsConditionSatisfied(condition, bitDepth);
+                    return IsConditionSatisfied(condition, videoBitDepth);
                 case ProfileConditionValue.VideoBitrate:
                     return IsConditionSatisfied(condition, videoBitrate);
                 case ProfileConditionValue.Height:
@@ -79,7 +79,7 @@ namespace MediaBrowser.Model.Dlna
             }
         }
 
-        public bool IsAudioConditionSatisfied(ProfileCondition condition, int? audioChannels, int? audioBitrate, int? audioSampleRate)
+        public bool IsAudioConditionSatisfied(ProfileCondition condition, int? audioChannels, int? audioBitrate, int? audioSampleRate, int? audioBitDepth)
         {
             switch (condition.Property)
             {
@@ -89,6 +89,8 @@ namespace MediaBrowser.Model.Dlna
                     return IsConditionSatisfied(condition, audioChannels);
                 case ProfileConditionValue.AudioSampleRate:
                     return IsConditionSatisfied(condition, audioSampleRate);
+                case ProfileConditionValue.AudioBitDepth:
+                    return IsConditionSatisfied(condition, audioBitDepth);
                 default:
                     throw new ArgumentException("Unexpected condition on audio file: " + condition.Property);
             }
@@ -97,7 +99,8 @@ namespace MediaBrowser.Model.Dlna
         public bool IsVideoAudioConditionSatisfied(ProfileCondition condition,
             int? audioChannels,
             int? audioBitrate,
-            int? audioSampleRate,
+            int? audioSampleRate, 
+            int? audioBitDepth,
             string audioProfile,
             bool? isSecondaryTrack)
         {
@@ -113,6 +116,8 @@ namespace MediaBrowser.Model.Dlna
                     return IsConditionSatisfied(condition, isSecondaryTrack);
                 case ProfileConditionValue.AudioSampleRate:
                     return IsConditionSatisfied(condition, audioSampleRate);
+                case ProfileConditionValue.AudioBitDepth:
+                    return IsConditionSatisfied(condition, audioBitDepth);
                 default:
                     throw new ArgumentException("Unexpected condition on audio file: " + condition.Property);
             }