added the beginning of a service stack abstraction

4 files changed, 17 insertions, 16 deletions

diff --git a/MediaBrowser.Controller/Kernel.cs b/MediaBrowser.Controller/Kernel.cs
index 275b7868b..145171fd8 100644
--- a/MediaBrowser.Controller/Kernel.cs
+++ b/MediaBrowser.Controller/Kernel.cs
@@ -7,7 +7,6 @@ using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Localization;
 using MediaBrowser.Controller.MediaInfo;
 using MediaBrowser.Controller.Persistence;
-using MediaBrowser.Controller.Playback;
 using MediaBrowser.Controller.Plugins;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Controller.Updates;
@@ -87,12 +86,6 @@ namespace MediaBrowser.Controller
         public IEnumerable<IPluginConfigurationPage> PluginConfigurationPages { get; private set; }
 
         /// <summary>
-        /// Gets the intro providers.
-        /// </summary>
-        /// <value>The intro providers.</value>
-        public IEnumerable<IIntroProvider> IntroProviders { get; private set; }
-
-        /// <summary>
         /// Gets the list of currently registered weather prvoiders
         /// </summary>
         /// <value>The weather providers.</value>
@@ -210,7 +203,6 @@ namespace MediaBrowser.Controller
             DisplayPreferencesRepositories = ApplicationHost.GetExports<IDisplayPreferencesRepository>();
             ItemRepositories = ApplicationHost.GetExports<IItemRepository>();
             WeatherProviders = ApplicationHost.GetExports<IWeatherProvider>();
-            IntroProviders = ApplicationHost.GetExports<IIntroProvider>();
             PluginConfigurationPages = ApplicationHost.GetExports<IPluginConfigurationPage>();
             ImageEnhancers = ApplicationHost.GetExports<IImageEnhancer>().OrderBy(e => e.Priority).ToArray();
             StringFiles = ApplicationHost.GetExports<LocalizedStringData>();
diff --git a/MediaBrowser.Controller/Playback/IIntroProvider.cs b/MediaBrowser.Controller/Library/IIntroProvider.cs
index 1f7d12fee..f54c3a329 100644
--- a/MediaBrowser.Controller/Playback/IIntroProvider.cs
+++ b/MediaBrowser.Controller/Library/IIntroProvider.cs
@@ -1,7 +1,7 @@
 using MediaBrowser.Controller.Entities;
 using System.Collections.Generic;
 
-namespace MediaBrowser.Controller.Playback
+namespace MediaBrowser.Controller.Library
 {
     /// <summary>
     /// Class BaseIntroProvider
diff --git a/MediaBrowser.Controller/Library/ILibraryManager.cs b/MediaBrowser.Controller/Library/ILibraryManager.cs
index 721b5c216..64070cb83 100644
--- a/MediaBrowser.Controller/Library/ILibraryManager.cs
+++ b/MediaBrowser.Controller/Library/ILibraryManager.cs
@@ -1,11 +1,11 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.IO;
 using MediaBrowser.Controller.Resolvers;
 using MediaBrowser.Model.Entities;
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
 
 namespace MediaBrowser.Controller.Library
 {
@@ -144,12 +144,21 @@ namespace MediaBrowser.Controller.Library
         BaseItem GetItemById(Guid id, Guid userId);
 
         /// <summary>
+        /// Gets the intros.
+        /// </summary>
+        /// <param name="item">The item.</param>
+        /// <param name="user">The user.</param>
+        /// <returns>IEnumerable{System.String}.</returns>
+        IEnumerable<string> GetIntros(BaseItem item, User user);
+
+        /// <summary>
         /// Adds the parts.
         /// </summary>
         /// <param name="rules">The rules.</param>
         /// <param name="pluginFolders">The plugin folders.</param>
         /// <param name="resolvers">The resolvers.</param>
+        /// <param name="introProviders">The intro providers.</param>
         void AddParts(IEnumerable<IResolutionIgnoreRule> rules, IEnumerable<IVirtualFolderCreator> pluginFolders,
-                      IEnumerable<IBaseItemResolver> resolvers);
+                      IEnumerable<IBaseItemResolver> resolvers, IEnumerable<IIntroProvider> introProviders);
     }
 }
\ No newline at end of file
diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
index 3806defe7..1e55ae78e 100644
--- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj
+++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
@@ -132,7 +132,7 @@
     <Compile Include="Persistence\IRepository.cs" />
     <Compile Include="Persistence\IUserDataRepository.cs" />
     <Compile Include="Persistence\IUserRepository.cs" />
-    <Compile Include="Playback\IIntroProvider.cs" />
+    <Compile Include="Library\IIntroProvider.cs" />
     <Compile Include="Plugins\IPluginConfigurationPage.cs" />
     <Compile Include="Plugins\PluginSecurityManager.cs" />
     <Compile Include="Providers\FanartBaseProvider.cs" />