mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-07-22 13:40:37 +02:00
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
This commit is contained in:
commit
939a3aab45
|
@ -162,6 +162,9 @@
|
||||||
<Content Include="swagger-ui\swagger-ui.js" />
|
<Content Include="swagger-ui\swagger-ui.js" />
|
||||||
<Content Include="swagger-ui\swagger-ui.min.js" />
|
<Content Include="swagger-ui\swagger-ui.min.js" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<Folder Include="Updates\" />
|
||||||
|
</ItemGroup>
|
||||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||||
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
|
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
|
|
|
@ -455,5 +455,12 @@ namespace MediaBrowser.Common.Kernel
|
||||||
{
|
{
|
||||||
return GetXmlConfiguration(typeof(T), path) as T;
|
return GetXmlConfiguration(typeof(T), path) as T;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Limits simultaneous access to various resources
|
||||||
|
/// </summary>
|
||||||
|
/// <value>The resource pools.</value>
|
||||||
|
public ResourcePool ResourcePools { get; set; }
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -117,5 +117,11 @@ namespace MediaBrowser.Common.Kernel
|
||||||
/// <param name="path">The path.</param>
|
/// <param name="path">The path.</param>
|
||||||
/// <returns>System.Object.</returns>
|
/// <returns>System.Object.</returns>
|
||||||
object GetXmlConfiguration(Type type, string path);
|
object GetXmlConfiguration(Type type, string path);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Limits simultaneous access to various resources
|
||||||
|
/// </summary>
|
||||||
|
/// <value>The resource pools.</value>
|
||||||
|
ResourcePool ResourcePools { get; set; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
using System;
|
using System;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
|
|
||||||
namespace MediaBrowser.Controller.Library
|
namespace MediaBrowser.Common.Kernel
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// This is just a collection of semaphores to control the number of concurrent executions of various resources
|
/// This is just a collection of semaphores to control the number of concurrent executions of various resources
|
|
@ -95,6 +95,7 @@
|
||||||
<Compile Include="Kernel\IWebSocketListener.cs" />
|
<Compile Include="Kernel\IWebSocketListener.cs" />
|
||||||
<Compile Include="Kernel\IApplicationHost.cs" />
|
<Compile Include="Kernel\IApplicationHost.cs" />
|
||||||
<Compile Include="Kernel\IKernel.cs" />
|
<Compile Include="Kernel\IKernel.cs" />
|
||||||
|
<Compile Include="Kernel\ResourcePool.cs" />
|
||||||
<Compile Include="Net\Handlers\IHttpServerHandler.cs" />
|
<Compile Include="Net\Handlers\IHttpServerHandler.cs" />
|
||||||
<Compile Include="Net\Handlers\StaticFileHandler.cs" />
|
<Compile Include="Net\Handlers\StaticFileHandler.cs" />
|
||||||
<Compile Include="Net\IHttpClient.cs" />
|
<Compile Include="Net\IHttpClient.cs" />
|
||||||
|
|
|
@ -278,12 +278,6 @@ namespace MediaBrowser.Controller
|
||||||
/// <value>The user data repository.</value>
|
/// <value>The user data repository.</value>
|
||||||
public IUserDataRepository UserDataRepository { get; private set; }
|
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>
|
/// <summary>
|
||||||
/// Gets the UDP server port number.
|
/// Gets the UDP server port number.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
|
@ -177,7 +177,6 @@
|
||||||
<Compile Include="Resolvers\TV\SeasonResolver.cs" />
|
<Compile Include="Resolvers\TV\SeasonResolver.cs" />
|
||||||
<Compile Include="Resolvers\TV\SeriesResolver.cs" />
|
<Compile Include="Resolvers\TV\SeriesResolver.cs" />
|
||||||
<Compile Include="Resolvers\TV\TVUtils.cs" />
|
<Compile Include="Resolvers\TV\TVUtils.cs" />
|
||||||
<Compile Include="Library\ResourcePool.cs" />
|
|
||||||
<Compile Include="ScheduledTasks\PeopleValidationTask.cs" />
|
<Compile Include="ScheduledTasks\PeopleValidationTask.cs" />
|
||||||
<Compile Include="ScheduledTasks\RefreshMediaLibraryTask.cs" />
|
<Compile Include="ScheduledTasks\RefreshMediaLibraryTask.cs" />
|
||||||
<Compile Include="Library\ItemResolveArgs.cs" />
|
<Compile Include="Library\ItemResolveArgs.cs" />
|
||||||
|
|
Loading…
Reference in a new issue