From 7bca933af0f1b85e289306ae482db8846f94026c Mon Sep 17 00:00:00 2001
From: LukePulverenti <luke.pulverenti@gmail.com>
Date: Fri, 1 Mar 2013 21:44:46 -0500
Subject: added the beginning of a service stack abstraction

---
 MediaBrowser.Controller/Kernel.cs                   |  8 --------
 MediaBrowser.Controller/Library/IIntroProvider.cs   | 19 +++++++++++++++++++
 MediaBrowser.Controller/Library/ILibraryManager.cs  | 21 +++++++++++++++------
 .../MediaBrowser.Controller.csproj                  |  2 +-
 MediaBrowser.Controller/Playback/IIntroProvider.cs  | 19 -------------------
 5 files changed, 35 insertions(+), 34 deletions(-)
 create mode 100644 MediaBrowser.Controller/Library/IIntroProvider.cs
 delete mode 100644 MediaBrowser.Controller/Playback/IIntroProvider.cs

(limited to 'MediaBrowser.Controller')

diff --git a/MediaBrowser.Controller/Kernel.cs b/MediaBrowser.Controller/Kernel.cs
index 275b7868b1..145171fd83 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;
@@ -86,12 +85,6 @@ namespace MediaBrowser.Controller
         /// <value>The configuration pages.</value>
         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>
@@ -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/Library/IIntroProvider.cs b/MediaBrowser.Controller/Library/IIntroProvider.cs
new file mode 100644
index 0000000000..f54c3a3299
--- /dev/null
+++ b/MediaBrowser.Controller/Library/IIntroProvider.cs
@@ -0,0 +1,19 @@
+using MediaBrowser.Controller.Entities;
+using System.Collections.Generic;
+
+namespace MediaBrowser.Controller.Library
+{
+    /// <summary>
+    /// Class BaseIntroProvider
+    /// </summary>
+    public interface IIntroProvider
+    {
+        /// <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);
+    }
+}
diff --git a/MediaBrowser.Controller/Library/ILibraryManager.cs b/MediaBrowser.Controller/Library/ILibraryManager.cs
index 721b5c216e..64070cb834 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
 {
@@ -143,13 +143,22 @@ namespace MediaBrowser.Controller.Library
         /// <returns>BaseItem.</returns>
         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 3806defe79..1e55ae78eb 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" />
diff --git a/MediaBrowser.Controller/Playback/IIntroProvider.cs b/MediaBrowser.Controller/Playback/IIntroProvider.cs
deleted file mode 100644
index 1f7d12fee9..0000000000
--- a/MediaBrowser.Controller/Playback/IIntroProvider.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using MediaBrowser.Controller.Entities;
-using System.Collections.Generic;
-
-namespace MediaBrowser.Controller.Playback
-{
-    /// <summary>
-    /// Class BaseIntroProvider
-    /// </summary>
-    public interface IIntroProvider
-    {
-        /// <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);
-    }
-}
-- 
cgit v1.2.3