Merge pull request #1 from MediaBrowser/master

update

4 files changed, 46 insertions, 5 deletions

diff --git a/MediaBrowser.Controller/Chapters/IChapterManager.cs b/MediaBrowser.Controller/Chapters/IChapterManager.cs
index b8f29d1ceb..676ef9c561 100644
--- a/MediaBrowser.Controller/Chapters/IChapterManager.cs
+++ b/MediaBrowser.Controller/Chapters/IChapterManager.cs
@@ -3,6 +3,7 @@ using MediaBrowser.Model.Chapters;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
+using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.Entities;
 
 namespace MediaBrowser.Controller.Chapters
@@ -70,5 +71,11 @@ namespace MediaBrowser.Controller.Chapters
         /// </summary>
         /// <returns>IEnumerable{ChapterProviderInfo}.</returns>
         IEnumerable<ChapterProviderInfo> GetProviders();
+
+        /// <summary>
+        /// Gets the configuration.
+        /// </summary>
+        /// <returns>ChapterOptions.</returns>
+        ChapterOptions GetConfiguration();
     }
 }
diff --git a/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs b/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs
index a4d9278e53..9ddd10f4aa 100644
--- a/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs
+++ b/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs
@@ -72,6 +72,23 @@ namespace MediaBrowser.Controller.Entities.Audio
         public List<string> Tags { get; set; }
 
         /// <summary>
+        /// Gets the tracks.
+        /// </summary>
+        /// <value>The tracks.</value>
+        public IEnumerable<Audio> Tracks
+        {
+            get
+            {
+                return RecursiveChildren.OfType<Audio>();
+            }
+        }
+
+        protected override IEnumerable<BaseItem> GetEligibleChildrenForRecursiveChildren(User user)
+        {
+            return Tracks;
+        }
+
+        /// <summary>
         /// Songs will group into us so don't also include us in the index
         /// </summary>
         /// <value><c>true</c> if [include in index]; otherwise, <c>false</c>.</value>
@@ -177,6 +194,7 @@ namespace MediaBrowser.Controller.Entities.Audio
         }
     }
 
+    [Obsolete]
     public class MusicAlbumDisc : Folder
     {
 
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index 87b1cc7a3d..f503a5ff44 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -445,11 +445,6 @@ namespace MediaBrowser.Controller.Entities
 
                 cancellationToken.ThrowIfCancellationRequested();
 
-                if (this is UserRootFolder)
-                {
-                    var b = true;
-                }
-
                 foreach (var child in nonCachedChildren)
                 {
                     BaseItem currentChild;
diff --git a/MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs b/MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs
index 9468fd9875..38c2c83c47 100644
--- a/MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs
+++ b/MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs
@@ -44,6 +44,27 @@ namespace MediaBrowser.Controller.MediaEncoding
         Task<Stream> ExtractVideoImage(string[] inputFiles, MediaProtocol protocol, Video3DFormat? threedFormat, TimeSpan? offset, CancellationToken cancellationToken);
 
         /// <summary>
+        /// Extracts the video images on interval.
+        /// </summary>
+        /// <param name="inputFiles">The input files.</param>
+        /// <param name="protocol">The protocol.</param>
+        /// <param name="threedFormat">The threed format.</param>
+        /// <param name="interval">The interval.</param>
+        /// <param name="targetDirectory">The target directory.</param>
+        /// <param name="filenamePrefix">The filename prefix.</param>
+        /// <param name="maxWidth">The maximum width.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>Task.</returns>
+        Task ExtractVideoImagesOnInterval(string[] inputFiles, 
+            MediaProtocol protocol, 
+            Video3DFormat? threedFormat, 
+            TimeSpan interval, 
+            string targetDirectory, 
+            string filenamePrefix, 
+            int? maxWidth,
+            CancellationToken cancellationToken);
+        
+        /// <summary>
         /// Gets the media info.
         /// </summary>
         /// <param name="inputFiles">The input files.</param>