Merge pull request #2800 from MediaBrowser/dev

Dev

1 files changed, 4 insertions, 11 deletions

diff --git a/MediaBrowser.Controller/Library/ILibraryManager.cs b/MediaBrowser.Controller/Library/ILibraryManager.cs
index b726c267c..025254d4b 100644
--- a/MediaBrowser.Controller/Library/ILibraryManager.cs
+++ b/MediaBrowser.Controller/Library/ILibraryManager.cs
@@ -185,13 +185,6 @@ namespace MediaBrowser.Controller.Library
                                    SortOrder sortOrder);
 
         /// <summary>
-        /// Ensure supplied item has only one instance throughout
-        /// </summary>
-        /// <param name="item">The item.</param>
-        /// <returns>The proper instance to the item</returns>
-        BaseItem GetOrAddByReferenceItem(BaseItem item);
-
-        /// <summary>
         /// Gets the user root folder.
         /// </summary>
         /// <returns>UserRootFolder.</returns>
@@ -520,21 +513,21 @@ namespace MediaBrowser.Controller.Library
         /// <param name="image">The image.</param>
         /// <param name="imageIndex">Index of the image.</param>
         /// <returns>Task.</returns>
-        Task<ItemImageInfo> ConvertImageToLocal(IHasImages item, ItemImageInfo image, int imageIndex);
+        Task<ItemImageInfo> ConvertImageToLocal(IHasMetadata item, ItemImageInfo image, int imageIndex);
 
         /// <summary>
         /// Gets the items.
         /// </summary>
         /// <param name="query">The query.</param>
         /// <returns>QueryResult&lt;BaseItem&gt;.</returns>
-        IEnumerable<BaseItem> GetItemList(InternalItemsQuery query);
+        List<BaseItem> GetItemList(InternalItemsQuery query);
 
-        IEnumerable<BaseItem> GetItemList(InternalItemsQuery query, bool allowExternalContent);
+        List<BaseItem> GetItemList(InternalItemsQuery query, bool allowExternalContent);
 
         /// <summary>
         /// Gets the items.
         /// </summary>
-        IEnumerable<BaseItem> GetItemList(InternalItemsQuery query, List<BaseItem> parents);
+        List<BaseItem> GetItemList(InternalItemsQuery query, List<BaseItem> parents);
 
         /// <summary>
         /// Gets the items result.