lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Register ILiveTvManager and IPlaylistManager correctly

Browse Source
This commit is contained in:
Mark Monteiro 2020-04-04 13:16:41 -04:00
parent 1456365411
commit 3d5b4f869c
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Emby.Server.Implementations/ApplicationHost.cs
View File

@ -797,10 +797,9 @@ namespace Emby.Server.Implementations
CollectionManager = new CollectionManager(LibraryManager, ApplicationPaths, LocalizationManager, FileSystemManager, LibraryMonitor, LoggerFactory, ProviderManager);
serviceCollection.AddSingleton(CollectionManager);
serviceCollection.AddSingleton(typeof(IPlaylistManager), typeof(PlaylistManager));
serviceCollection.AddSingleton<IPlaylistManager, PlaylistManager>();
LiveTvManager = new LiveTvManager(this, ServerConfigurationManager, LoggerFactory, ItemRepository, ImageProcessor, UserDataManager, DtoService, UserManager, LibraryManager, TaskManager, LocalizationManager, JsonSerializer, FileSystemManager, () => ChannelManager);
serviceCollection.AddSingleton(LiveTvManager);
serviceCollection.AddSingleton<ILiveTvManager, LiveTvManager>();
serviceCollection.AddSingleton<IUserViewManager, UserViewManager>();
@ -833,6 +832,7 @@ namespace Emby.Server.Implementations
/// </summary>
public void InitializeServices()
{
LiveTvManager = Resolve<ILiveTvManager>();
NotificationManager = Resolve<INotificationManager>();
HttpServer = Resolve<IHttpServer>();

6
Emby.Server.Implementations/LiveTv/LiveTvManager.cs
View File

@ -49,7 +49,7 @@ namespace Emby.Server.Implementations.LiveTv
private readonly ILibraryManager _libraryManager;
private readonly ITaskManager _taskManager;
private readonly IJsonSerializer _jsonSerializer;
private readonly Func<IChannelManager> _channelManager;
private readonly IChannelManager _channelManager;
private readonly IDtoService _dtoService;
private readonly ILocalizationManager _localization;
@ -76,7 +76,7 @@ namespace Emby.Server.Implementations.LiveTv
ILocalizationManager localization,
IJsonSerializer jsonSerializer,
IFileSystem fileSystem,
Func<IChannelManager> channelManager)
IChannelManager channelManager)
{
_config = config;
_logger = loggerFactory.CreateLogger(nameof(LiveTvManager));
@ -2482,7 +2482,7 @@ namespace Emby.Server.Implementations.LiveTv
.OrderBy(i => i.SortName)
.ToList();
folders.AddRange(_channelManager().GetChannelsInternal(new MediaBrowser.Model.Channels.ChannelQuery
folders.AddRange(_channelManager.GetChannelsInternal(new MediaBrowser.Model.Channels.ChannelQuery
{
UserId = user.Id,
IsRecordingsFolder = true,