aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller/Entities/Folder.cs
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2014-07-01 17:13:32 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2014-07-01 17:13:32 -0400
commit3bef6ead9cec4c33d43b6348ae4fc33c9b70316a (patch)
tree1c794728ddb74d046793dbde7fc590d6feee37f1 /MediaBrowser.Controller/Entities/Folder.cs
parent970504abdf237a2c404024c6978d5353ea915d03 (diff)
#514 - Support HLS seeking
Diffstat (limited to 'MediaBrowser.Controller/Entities/Folder.cs')
-rw-r--r--MediaBrowser.Controller/Entities/Folder.cs27
1 files changed, 2 insertions, 25 deletions
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index c712d50af..52c414ae8 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -857,19 +857,6 @@ namespace MediaBrowser.Controller.Entities
/// <exception cref="System.ArgumentNullException"></exception>
public IEnumerable<BaseItem> GetRecursiveChildren(User user, bool includeLinkedChildren = true)
{
- return GetRecursiveChildren(user, null, includeLinkedChildren);
- }
-
- /// <summary>
- /// Gets the recursive children.
- /// </summary>
- /// <param name="user">The user.</param>
- /// <param name="filter">The filter.</param>
- /// <param name="includeLinkedChildren">if set to <c>true</c> [include linked children].</param>
- /// <returns>IList{BaseItem}.</returns>
- /// <exception cref="System.ArgumentNullException"></exception>
- public IList<BaseItem> GetRecursiveChildren(User user, Func<BaseItem, bool> filter, bool includeLinkedChildren = true)
- {
if (user == null)
{
throw new ArgumentNullException("user");
@@ -877,7 +864,7 @@ namespace MediaBrowser.Controller.Entities
var list = new List<BaseItem>();
- var hasLinkedChildren = AddChildrenToList(user, includeLinkedChildren, list, true, filter);
+ var hasLinkedChildren = AddChildrenToList(user, includeLinkedChildren, list, true, null);
return hasLinkedChildren ? list.DistinctBy(i => i.Id).ToList() : list;
}
@@ -888,19 +875,9 @@ namespace MediaBrowser.Controller.Entities
/// <returns>IList{BaseItem}.</returns>
public IList<BaseItem> GetRecursiveChildren()
{
- return GetRecursiveChildren(i => true);
- }
-
- /// <summary>
- /// Gets the recursive children.
- /// </summary>
- /// <param name="filter">The filter.</param>
- /// <returns>IEnumerable{BaseItem}.</returns>
- public IList<BaseItem> GetRecursiveChildren(Func<BaseItem, bool> filter)
- {
var list = new List<BaseItem>();
- AddChildrenToList(list, true, filter);
+ AddChildrenToList(list, true, null);
return list;
}