aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Dlna/ContentDirectory/ControlHandler.cs
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2016-10-09 03:18:43 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2016-10-09 03:18:43 -0400
commitdaaae69df575f1d7692ba29d6f5ddd4c59516f82 (patch)
tree24c818ece042d36808fd0a68834b2853bf4512e1 /MediaBrowser.Dlna/ContentDirectory/ControlHandler.cs
parentb3595eab6a94fda4f81f637007b2ac79e8a85065 (diff)
add playback of in-progress recordings
Diffstat (limited to 'MediaBrowser.Dlna/ContentDirectory/ControlHandler.cs')
-rw-r--r--MediaBrowser.Dlna/ContentDirectory/ControlHandler.cs61
1 files changed, 1 insertions, 60 deletions
diff --git a/MediaBrowser.Dlna/ContentDirectory/ControlHandler.cs b/MediaBrowser.Dlna/ContentDirectory/ControlHandler.cs
index 9b5030325a..3d1e073f8e 100644
--- a/MediaBrowser.Dlna/ContentDirectory/ControlHandler.cs
+++ b/MediaBrowser.Dlna/ContentDirectory/ControlHandler.cs
@@ -428,14 +428,6 @@ namespace MediaBrowser.Dlna.ContentDirectory
return ApplyPaging(result, startIndex, limit);
}
- if (stubType.Value == StubType.Folder)
- {
- var movie = item as Movie;
- if (movie != null)
- {
- return ApplyPaging(await GetMovieItems(movie).ConfigureAwait(false), startIndex, limit);
- }
- }
var person = item as Person;
if (person != null)
@@ -468,14 +460,11 @@ namespace MediaBrowser.Dlna.ContentDirectory
}).ConfigureAwait(false);
- var options = _config.GetDlnaConfiguration();
-
var serverItems = queryResult
.Items
.Select(i => new ServerItem
{
- Item = i,
- StubType = GetDisplayStubType(i, item, options)
+ Item = i
})
.ToArray();
@@ -519,29 +508,6 @@ namespace MediaBrowser.Dlna.ContentDirectory
return result;
}
- private StubType? GetDisplayStubType(BaseItem item, BaseItem context, DlnaOptions options)
- {
- if (context == null || context.IsFolder)
- {
- var movie = item as Movie;
- if (movie != null && options.EnableMovieFolders)
- {
- if (movie.GetTrailerIds().Count > 0 ||
- movie.SpecialFeatureIds.Count > 0)
- {
- return StubType.Folder;
- }
-
- if (EnablePeopleDisplay(item))
- {
- return StubType.Folder;
- }
- }
- }
-
- return null;
- }
-
private bool EnablePeopleDisplay(BaseItem item)
{
if (_libraryManager.GetPeopleNames(new InternalPeopleQuery
@@ -556,31 +522,6 @@ namespace MediaBrowser.Dlna.ContentDirectory
return false;
}
- private Task<QueryResult<ServerItem>> GetMovieItems(Movie item)
- {
- var list = new List<BaseItem>();
-
- list.Add(item);
-
- list.AddRange(item.GetTrailerIds().Select(i => _libraryManager.GetItemById(i)).Where(i => i != null));
- list.AddRange(item.SpecialFeatureIds.Select(i => _libraryManager.GetItemById(i)).Where(i => i != null));
-
- var serverItems = list.Select(i => new ServerItem { Item = i, StubType = null })
- .ToList();
-
- serverItems.Add(new ServerItem
- {
- Item = item,
- StubType = StubType.People
- });
-
- return Task.FromResult(new QueryResult<ServerItem>
- {
- Items = serverItems.ToArray(),
- TotalRecordCount = serverItems.Count
- });
- }
-
private ServerItem GetItemFromObjectId(string id, User user)
{
return DidlBuilder.IsIdRoot(id)