aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller
diff options
context:
space:
mode:
authorLuke <luke.pulverenti@gmail.com>2016-08-04 00:42:17 -0400
committerGitHub <noreply@github.com>2016-08-04 00:42:17 -0400
commit8e3178ec0fe5a2a144399692d5acb507a9ca287f (patch)
treeedbe6f86b2f61007c84b48f9fabbea09e77f1bca /MediaBrowser.Controller
parenta5e0185da28bad907cb543dc3116fa73a40dee63 (diff)
parent39245133f805e75164556fad9135e4f56925c33f (diff)
Merge pull request #2017 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Controller')
-rw-r--r--MediaBrowser.Controller/Dto/IDtoService.cs12
-rw-r--r--MediaBrowser.Controller/Entities/InternalPeopleQuery.cs2
-rw-r--r--MediaBrowser.Controller/Library/ILibraryManager.cs6
3 files changed, 3 insertions, 17 deletions
diff --git a/MediaBrowser.Controller/Dto/IDtoService.cs b/MediaBrowser.Controller/Dto/IDtoService.cs
index a8e93fb2b..a6f807ce9 100644
--- a/MediaBrowser.Controller/Dto/IDtoService.cs
+++ b/MediaBrowser.Controller/Dto/IDtoService.cs
@@ -1,11 +1,9 @@
-using System;
-using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities;
using MediaBrowser.Model.Dto;
using MediaBrowser.Model.Querying;
using System.Collections.Generic;
using System.Threading.Tasks;
using MediaBrowser.Controller.Sync;
-using MediaBrowser.Model.Sync;
namespace MediaBrowser.Controller.Dto
{
@@ -46,14 +44,6 @@ namespace MediaBrowser.Controller.Dto
BaseItemDto GetBaseItemDto(BaseItem item, List<ItemFields> fields, User user = null, BaseItem owner = null);
/// <summary>
- /// Fills the synchronize information.
- /// </summary>
- /// <param name="tuples">The tuples.</param>
- /// <param name="options">The options.</param>
- /// <param name="user">The user.</param>
- void FillSyncInfo(IEnumerable<Tuple<BaseItem, BaseItemDto>> tuples, DtoOptions options, User user);
-
- /// <summary>
/// Gets the base item dto.
/// </summary>
/// <param name="item">The item.</param>
diff --git a/MediaBrowser.Controller/Entities/InternalPeopleQuery.cs b/MediaBrowser.Controller/Entities/InternalPeopleQuery.cs
index 05d23d986..2ba6842ca 100644
--- a/MediaBrowser.Controller/Entities/InternalPeopleQuery.cs
+++ b/MediaBrowser.Controller/Entities/InternalPeopleQuery.cs
@@ -11,11 +11,13 @@ namespace MediaBrowser.Controller.Entities
public int? MaxListOrder { get; set; }
public Guid AppearsInItemId { get; set; }
public string NameContains { get; set; }
+ public SourceType[] SourceTypes { get; set; }
public InternalPeopleQuery()
{
PersonTypes = new List<string>();
ExcludePersonTypes = new List<string>();
+ SourceTypes = new SourceType[] { };
}
}
}
diff --git a/MediaBrowser.Controller/Library/ILibraryManager.cs b/MediaBrowser.Controller/Library/ILibraryManager.cs
index ad38b9ea5..70bd3f081 100644
--- a/MediaBrowser.Controller/Library/ILibraryManager.cs
+++ b/MediaBrowser.Controller/Library/ILibraryManager.cs
@@ -475,12 +475,6 @@ namespace MediaBrowser.Controller.Library
List<Person> GetPeopleItems(InternalPeopleQuery query);
/// <summary>
- /// Gets all people names.
- /// </summary>
- /// <returns>List&lt;System.String&gt;.</returns>
- List<PersonInfo> GetAllPeople();
-
- /// <summary>
/// Updates the people.
/// </summary>
/// <param name="item">The item.</param>