diff options
Diffstat (limited to 'MediaBrowser.ServerApplication/ApplicationHost.cs')
| -rw-r--r-- | MediaBrowser.ServerApplication/ApplicationHost.cs | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/MediaBrowser.ServerApplication/ApplicationHost.cs b/MediaBrowser.ServerApplication/ApplicationHost.cs index 7da565d57..673639ff7 100644 --- a/MediaBrowser.ServerApplication/ApplicationHost.cs +++ b/MediaBrowser.ServerApplication/ApplicationHost.cs @@ -86,11 +86,15 @@ namespace MediaBrowser.ServerApplication Logger.Info("Version {0} initializing", ApplicationVersion); - var httpServer = ServerFactory.CreateServer(this, ProtobufSerializer, Logger, "Media Browser", "index.html"); + RegisterResources(taskManager, networkManager, serverManager); +<<<<<<< HEAD + FindParts(); +======= RegisterResources(taskManager, httpServer, networkManager, serverManager, PackageManager); FindParts(taskManager, httpServer); +>>>>>>> c9f48fe0d0d5cf4aec62df1d1e97f629967aff6f } /// <summary> @@ -114,25 +118,29 @@ namespace MediaBrowser.ServerApplication /// <summary> /// Registers resources that classes will depend on /// </summary> +<<<<<<< HEAD + protected override void RegisterResources(ITaskManager taskManager, INetworkManager networkManager, IServerManager serverManager) +======= private void RegisterResources(ITaskManager taskManager, IHttpServer httpServer, INetworkManager networkManager, IServerManager serverManager, IPackageManager packageManager) +>>>>>>> c9f48fe0d0d5cf4aec62df1d1e97f629967aff6f { + base.RegisterResources(taskManager, networkManager, serverManager); + RegisterSingleInstance<IKernel>(Kernel); RegisterSingleInstance(Kernel); RegisterSingleInstance<IApplicationHost>(this); - RegisterSingleInstance(LogManager); - RegisterSingleInstance(Logger); - RegisterSingleInstance(ApplicationPaths); RegisterSingleInstance(ServerApplicationPaths); - RegisterSingleInstance(taskManager); RegisterSingleInstance<IIsoManager>(new PismoIsoManager(Logger)); RegisterSingleInstance<IBlurayExaminer>(new BdInfoExaminer()); RegisterSingleInstance<IHttpClient>(new HttpClientManager(ApplicationPaths, Logger)); RegisterSingleInstance<IZipClient>(new DotNetZipClient()); - RegisterSingleInstance<IWebSocketServer>(() => new AlchemyServer(Logger)); RegisterSingleInstance(_jsonSerializer); RegisterSingleInstance(_xmlSerializer); +<<<<<<< HEAD + RegisterSingleInstance(ServerFactory.CreateServer(this, ProtobufSerializer, Logger, "Media Browser", "index.html"), false); +======= RegisterSingleInstance(ProtobufSerializer); RegisterSingleInstance<IUdpServer>(new UdpServer(Logger), false); RegisterSingleInstance(httpServer, false); @@ -150,6 +158,7 @@ namespace MediaBrowser.ServerApplication taskManager.AddTasks(GetExports<IScheduledTask>(false)); httpServer.Init(GetExports<IRestfulService>(false)); +>>>>>>> c9f48fe0d0d5cf4aec62df1d1e97f629967aff6f } /// <summary> |