aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2013-07-11 16:25:12 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2013-07-11 16:25:12 -0400
commit815445c61d5c34c44e5583036475933236f7f791 (patch)
treeab2e064478f41f6042b8e96a25223e0c41818eca
parent45b995def724828e4e48cffea482dd2aa9c89c26 (diff)
added remote control menu
-rw-r--r--MediaBrowser.Api/UserLibrary/MusicGenresService.cs2
-rw-r--r--MediaBrowser.Api/UserLibrary/PersonsService.cs2
-rw-r--r--MediaBrowser.Model/Querying/ThemeSongsResult.cs7
3 files changed, 9 insertions, 2 deletions
diff --git a/MediaBrowser.Api/UserLibrary/MusicGenresService.cs b/MediaBrowser.Api/UserLibrary/MusicGenresService.cs
index a4c60e2d98..b4d1b82dd9 100644
--- a/MediaBrowser.Api/UserLibrary/MusicGenresService.cs
+++ b/MediaBrowser.Api/UserLibrary/MusicGenresService.cs
@@ -124,7 +124,7 @@ namespace MediaBrowser.Api.UserLibrary
/// <returns>IEnumerable{Tuple{System.StringFunc{System.Int32}}}.</returns>
protected override IEnumerable<IbnStub<MusicGenre>> GetAllItems(GetItemsByName request, IEnumerable<BaseItem> items)
{
- var itemsList = items.Where(i => i.Genres != null).ToList();
+ var itemsList = items.ToList();
return itemsList
.SelectMany(i => i.Genres)
diff --git a/MediaBrowser.Api/UserLibrary/PersonsService.cs b/MediaBrowser.Api/UserLibrary/PersonsService.cs
index 2d555e0011..2a6edae2cd 100644
--- a/MediaBrowser.Api/UserLibrary/PersonsService.cs
+++ b/MediaBrowser.Api/UserLibrary/PersonsService.cs
@@ -185,7 +185,7 @@ namespace MediaBrowser.Api.UserLibrary
var inputPersonTypes = ((GetPersons)request).PersonTypes;
var personTypes = string.IsNullOrEmpty(inputPersonTypes) ? new string[] { } : inputPersonTypes.Split(',');
- var itemsList = items.Where(i => i.People != null).ToList();
+ var itemsList = items.ToList();
// Either get all people, or all people filtered by a specific person type
var allPeople = GetAllPeople(itemsList, personTypes);
diff --git a/MediaBrowser.Model/Querying/ThemeSongsResult.cs b/MediaBrowser.Model/Querying/ThemeSongsResult.cs
index f62219c69b..4c01e3b3d7 100644
--- a/MediaBrowser.Model/Querying/ThemeSongsResult.cs
+++ b/MediaBrowser.Model/Querying/ThemeSongsResult.cs
@@ -18,5 +18,12 @@ namespace MediaBrowser.Model.Querying
public ThemeMediaResult ThemeVideosResult { get; set; }
public ThemeMediaResult ThemeSongsResult { get; set; }
+
+ public AllThemeMediaResult()
+ {
+ ThemeVideosResult = new ThemeMediaResult();
+
+ ThemeSongsResult = new ThemeMediaResult();
+ }
}
}