update dlna profiles

5 files changed, 18 insertions, 4 deletions

diff --git a/MediaBrowser.Controller/Collections/ICollectionManager.cs b/MediaBrowser.Controller/Collections/ICollectionManager.cs
index af65bbaca..b63c49f99 100644
--- a/MediaBrowser.Controller/Collections/ICollectionManager.cs
+++ b/MediaBrowser.Controller/Collections/ICollectionManager.cs
@@ -1,4 +1,5 @@
-using MediaBrowser.Controller.Entities.Movies;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities.Movies;
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
@@ -29,5 +30,13 @@ namespace MediaBrowser.Controller.Collections
         /// <param name="itemIds">The item ids.</param>
         /// <returns>Task.</returns>
         Task RemoveFromCollection(Guid collectionId, IEnumerable<Guid> itemIds);
+
+        /// <summary>
+        /// Collapses the items within box sets.
+        /// </summary>
+        /// <param name="items">The items.</param>
+        /// <param name="user">The user.</param>
+        /// <returns>IEnumerable{BaseItem}.</returns>
+        IEnumerable<BaseItem> CollapseItemsWithinBoxSets(IEnumerable<BaseItem> items, User user);
     }
 }
diff --git a/MediaBrowser.Controller/Entities/Audio/Audio.cs b/MediaBrowser.Controller/Entities/Audio/Audio.cs
index ef12d8816..40b52b886 100644
--- a/MediaBrowser.Controller/Entities/Audio/Audio.cs
+++ b/MediaBrowser.Controller/Entities/Audio/Audio.cs
@@ -15,6 +15,7 @@ namespace MediaBrowser.Controller.Entities.Audio
         public string FormatName { get; set; }
         public long? Size { get; set; }
         public string Container { get; set; }
+        public int? TotalBitrate { get; set; }
 
         public Audio()
         {
diff --git a/MediaBrowser.Controller/Entities/CollectionFolder.cs b/MediaBrowser.Controller/Entities/CollectionFolder.cs
index 0ce88bee7..d8cca579e 100644
--- a/MediaBrowser.Controller/Entities/CollectionFolder.cs
+++ b/MediaBrowser.Controller/Entities/CollectionFolder.cs
@@ -129,14 +129,13 @@ namespace MediaBrowser.Controller.Entities
             return NullTaskResult;
         }
 
-        private List<LinkedChild> _linkedChildren;
         /// <summary>
         /// Our children are actually just references to the ones in the physical root...
         /// </summary>
         /// <value>The linked children.</value>
         public override List<LinkedChild> LinkedChildren
         {
-            get { return _linkedChildren ?? (_linkedChildren = GetLinkedChildrenInternal()); }
+            get { return GetLinkedChildrenInternal(); }
             set
             {
                 base.LinkedChildren = value;
@@ -175,7 +174,6 @@ namespace MediaBrowser.Controller.Entities
         public void ResetDynamicChildren()
         {
             _actualChildren = null;
-            _linkedChildren = null;
         }
     }
 }
diff --git a/MediaBrowser.Controller/Entities/Video.cs b/MediaBrowser.Controller/Entities/Video.cs
index 3ec9e7650..2d926e236 100644
--- a/MediaBrowser.Controller/Entities/Video.cs
+++ b/MediaBrowser.Controller/Entities/Video.cs
@@ -29,6 +29,7 @@ namespace MediaBrowser.Controller.Entities
         public string FormatName { get; set; }
         public long? Size { get; set; }
         public string Container { get; set; }
+        public int? TotalBitrate { get; set; }
 
         public Video()
         {
diff --git a/MediaBrowser.Controller/MediaEncoding/MediaEncoderHelpers.cs b/MediaBrowser.Controller/MediaEncoding/MediaEncoderHelpers.cs
index fd1f65101..6ef22ef5b 100644
--- a/MediaBrowser.Controller/MediaEncoding/MediaEncoderHelpers.cs
+++ b/MediaBrowser.Controller/MediaEncoding/MediaEncoderHelpers.cs
@@ -134,6 +134,11 @@ namespace MediaBrowser.Controller.MediaEncoding
             if (data.format != null)
             {
                 info.Format = data.format.format_name;
+
+                if (!string.IsNullOrEmpty(data.format.bit_rate))
+                {
+                    info.TotalBitrate = int.Parse(data.format.bit_rate, UsCulture);
+                }
             }
 
             return info;