Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

3 files changed, 0 insertions, 86 deletions

diff --git a/MediaBrowser.Controller/Kernel.cs b/MediaBrowser.Controller/Kernel.cs
index a4af76805..521bf92c6 100644
--- a/MediaBrowser.Controller/Kernel.cs
+++ b/MediaBrowser.Controller/Kernel.cs
@@ -279,12 +279,6 @@ namespace MediaBrowser.Controller
         public IUserDataRepository UserDataRepository { get; private set; }
 
         /// <summary>
-        /// Limits simultaneous access to various resources
-        /// </summary>
-        /// <value>The resource pools.</value>
-        public ResourcePool ResourcePools { get; set; }
-
-        /// <summary>
         /// Gets the UDP server port number.
         /// </summary>
         /// <value>The UDP server port number.</value>
diff --git a/MediaBrowser.Controller/Library/ResourcePool.cs b/MediaBrowser.Controller/Library/ResourcePool.cs
deleted file mode 100644
index 3e4d53204..000000000
--- a/MediaBrowser.Controller/Library/ResourcePool.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-using System;
-using System.Threading;
-
-namespace MediaBrowser.Controller.Library
-{
-    /// <summary>
-    /// This is just a collection of semaphores to control the number of concurrent executions of various resources
-    /// </summary>
-    public class ResourcePool : IDisposable
-    {
-        /// <summary>
-        /// You tube
-        /// </summary>
-        public readonly SemaphoreSlim YouTube = new SemaphoreSlim(5, 5);
-
-        /// <summary>
-        /// The trakt
-        /// </summary>
-        public readonly SemaphoreSlim Trakt = new SemaphoreSlim(5, 5);
-
-        /// <summary>
-        /// The tv db
-        /// </summary>
-        public readonly SemaphoreSlim TvDb = new SemaphoreSlim(5, 5);
-
-        /// <summary>
-        /// The movie db
-        /// </summary>
-        public readonly SemaphoreSlim MovieDb = new SemaphoreSlim(5, 5);
-
-        /// <summary>
-        /// The fan art
-        /// </summary>
-        public readonly SemaphoreSlim FanArt = new SemaphoreSlim(5, 5);
-
-        /// <summary>
-        /// The mb
-        /// </summary>
-        public readonly SemaphoreSlim Mb = new SemaphoreSlim(5, 5);
-
-        /// <summary>
-        /// Apple doesn't seem to like too many simulataneous requests.
-        /// </summary>
-        public readonly SemaphoreSlim AppleTrailerVideos = new SemaphoreSlim(1, 1);
-
-        /// <summary>
-        /// The apple trailer images
-        /// </summary>
-        public readonly SemaphoreSlim AppleTrailerImages = new SemaphoreSlim(1, 1);
-        
-        /// <summary>
-        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
-        /// </summary>
-        public void Dispose()
-        {
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-
-        /// <summary>
-        /// Releases unmanaged and - optionally - managed resources.
-        /// </summary>
-        /// <param name="dispose"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
-        protected virtual void Dispose(bool dispose)
-        {
-            if (dispose)
-            {
-                YouTube.Dispose();
-                Trakt.Dispose();
-                TvDb.Dispose();
-                MovieDb.Dispose();
-                FanArt.Dispose();
-                Mb.Dispose();
-                AppleTrailerVideos.Dispose();
-                AppleTrailerImages.Dispose();
-            }
-        }
-    }
-}
diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
index ff2bcb213..6ab70f47c 100644
--- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj
+++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
@@ -177,7 +177,6 @@
     <Compile Include="Resolvers\TV\SeasonResolver.cs" />
     <Compile Include="Resolvers\TV\SeriesResolver.cs" />
     <Compile Include="Resolvers\TV\TVUtils.cs" />
-    <Compile Include="Library\ResourcePool.cs" />
     <Compile Include="ScheduledTasks\PeopleValidationTask.cs" />
     <Compile Include="ScheduledTasks\RefreshMediaLibraryTask.cs" />
     <Compile Include="Library\ItemResolveArgs.cs" />