3.0.5231.40980

5 files changed, 26 insertions, 10 deletions

diff --git a/MediaBrowser.Model/Configuration/NotificationOptions.cs b/MediaBrowser.Model/Configuration/NotificationOptions.cs
index 84352e7fd..f1d9fad30 100644
--- a/MediaBrowser.Model/Configuration/NotificationOptions.cs
+++ b/MediaBrowser.Model/Configuration/NotificationOptions.cs
@@ -58,6 +58,12 @@ namespace MediaBrowser.Model.Configuration
                     Type = NotificationType.PluginInstalled.ToString(),
                     Enabled = true,
                     SendToUserMode = SendToUserType.Admins
+                },
+                new NotificationOption
+                {
+                    Type = NotificationType.PluginError.ToString(),
+                    Enabled = true,
+                    SendToUserMode = SendToUserType.Admins
                 }
             };
         }
@@ -166,6 +172,7 @@ namespace MediaBrowser.Model.Configuration
         AudioPlayback,
         GamePlayback,
         InstallationFailed,
+        PluginError,
         PluginInstalled,
         PluginUpdateInstalled,
         PluginUninstalled,
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index 03857d8b9..0d2c1066b 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -32,7 +32,7 @@ namespace MediaBrowser.Model.Configuration
         /// </summary>
         /// <value><c>true</c> if [enable u pn p]; otherwise, <c>false</c>.</value>
         public bool EnableUPnP { get; set; }
-        
+
         /// <summary>
         /// Gets or sets the HTTP server port number.
         /// </summary>
@@ -62,7 +62,7 @@ namespace MediaBrowser.Model.Configuration
         /// </summary>
         /// <value>The metadata path.</value>
         public string MetadataPath { get; set; }
-        
+
         /// <summary>
         /// Gets or sets the display name of the season zero.
         /// </summary>
@@ -220,13 +220,16 @@ namespace MediaBrowser.Model.Configuration
         public string WanDdns { get; set; }
 
         public string UICulture { get; set; }
-        
+
         public DlnaOptions DlnaOptions { get; set; }
 
         public double DownMixAudioBoost { get; set; }
 
         public NotificationOptions NotificationOptions { get; set; }
 
+        [Obsolete("Please use RequireManualLoginForMobileApps")]
+        public string[] ManualLoginClients { get; set; }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="ServerConfiguration" /> class.
         /// </summary>
@@ -292,6 +295,8 @@ namespace MediaBrowser.Model.Configuration
             UICulture = "en-us";
 
             NotificationOptions = new NotificationOptions();
+
+            ManualLoginClients = new string[] { };
         }
     }
 
diff --git a/MediaBrowser.Model/Configuration/UserConfiguration.cs b/MediaBrowser.Model/Configuration/UserConfiguration.cs
index 068a7ad5f..8bee53c44 100644
--- a/MediaBrowser.Model/Configuration/UserConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/UserConfiguration.cs
@@ -54,6 +54,8 @@ namespace MediaBrowser.Model.Configuration
         public bool EnableMediaPlayback { get; set; }
         public bool EnableContentDeletion { get; set; }
 
+        public bool GroupMoviesIntoBoxSets { get; set; }
+
         public string[] BlockedMediaFolders { get; set; }
 
         public UnratedItem[] BlockUnratedItems { get; set; }
@@ -69,6 +71,7 @@ namespace MediaBrowser.Model.Configuration
             EnableLiveTvManagement = true;
             EnableMediaPlayback = true;
             EnableLiveTvAccess = true;
+            GroupMoviesIntoBoxSets = true;
 
             BlockedMediaFolders = new string[] { };
             BlockUnratedItems = new UnratedItem[] { };
diff --git a/MediaBrowser.Model/Dlna/ConditionProcessor.cs b/MediaBrowser.Model/Dlna/ConditionProcessor.cs
index d5e1f6686..27c4850e8 100644
--- a/MediaBrowser.Model/Dlna/ConditionProcessor.cs
+++ b/MediaBrowser.Model/Dlna/ConditionProcessor.cs
@@ -1,7 +1,6 @@
-using System;
+using MediaBrowser.Model.MediaInfo;
+using System;
 using System.Globalization;
-using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.MediaInfo;
 
 namespace MediaBrowser.Model.Dlna
 {
@@ -83,13 +82,13 @@ namespace MediaBrowser.Model.Dlna
 
         public bool IsVideoAudioConditionSatisfied(ProfileCondition condition, 
             int? audioChannels, 
-            int? audioBitrate)
+            int? audioBitrate,
+            string audioProfile)
         {
             switch (condition.Property)
             {
                 case ProfileConditionValue.AudioProfile:
-                    // TODO: Implement
-                    return true;
+                    return IsConditionSatisfied(condition, audioProfile);
                 case ProfileConditionValue.AudioBitrate:
                     return IsConditionSatisfied(condition, audioBitrate);
                 case ProfileConditionValue.AudioChannels:
diff --git a/MediaBrowser.Model/Dlna/StreamBuilder.cs b/MediaBrowser.Model/Dlna/StreamBuilder.cs
index 40b1e140b..79aeda2e6 100644
--- a/MediaBrowser.Model/Dlna/StreamBuilder.cs
+++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs
@@ -285,6 +285,7 @@ namespace MediaBrowser.Model.Dlna
 
             var audioBitrate = audioStream == null ? null : audioStream.BitRate;
             var audioChannels = audioStream == null ? null : audioStream.Channels;
+            var audioProfile = audioStream == null ? null : audioStream.Profile;
 
             var timestamp = videoStream == null ? TransportStreamTimestamp.None : mediaSource.Timestamp;
             var packetLength = videoStream == null ? null : videoStream.PacketLength;
@@ -348,7 +349,8 @@ namespace MediaBrowser.Model.Dlna
 
                 if (!conditions.All(i => conditionProcessor.IsVideoAudioConditionSatisfied(i,
                   audioChannels,
-                  audioBitrate)))
+                  audioBitrate,
+                  audioProfile)))
                 {
                     return null;
                 }