diff options
| author | Vasily <just.one.man@yandex.ru> | 2020-06-08 14:44:21 +0300 |
|---|---|---|
| committer | Vasily <just.one.man@yandex.ru> | 2020-06-08 14:44:21 +0300 |
| commit | 4999831604abc49964833a3ea837effde401273b (patch) | |
| tree | cfcfaf258689ce07416503a5bc033b2a578c1338 /Emby.Server.Implementations/Channels | |
| parent | 8be13b63d494e6541bed075538f84e77202f6c7b (diff) | |
| parent | 99c9d99db76f1f3ffa4c7c3353911bf9c51ec061 (diff) | |
Merge remote-tracking branch 'upstream/master' into hwaccel
Diffstat (limited to 'Emby.Server.Implementations/Channels')
| -rw-r--r-- | Emby.Server.Implementations/Channels/ChannelManager.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Emby.Server.Implementations/Channels/ChannelManager.cs b/Emby.Server.Implementations/Channels/ChannelManager.cs index 138832fb86..04fe0bacb4 100644 --- a/Emby.Server.Implementations/Channels/ChannelManager.cs +++ b/Emby.Server.Implementations/Channels/ChannelManager.cs @@ -46,14 +46,14 @@ namespace Emby.Server.Implementations.Channels new ConcurrentDictionary<string, Tuple<DateTime, List<MediaSourceInfo>>>(); private readonly SemaphoreSlim _resourcePool = new SemaphoreSlim(1, 1); - + /// <summary> /// Initializes a new instance of the <see cref="ChannelManager"/> class. /// </summary> /// <param name="userManager">The user manager.</param> /// <param name="dtoService">The dto service.</param> /// <param name="libraryManager">The library manager.</param> - /// <param name="loggerFactory">The logger factory.</param> + /// <param name="logger">The logger.</param> /// <param name="config">The server configuration manager.</param> /// <param name="fileSystem">The filesystem.</param> /// <param name="userDataManager">The user data manager.</param> |
