starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-17 06:23:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	MediaBrowser.Common.Implementations/BaseApplicationHost.cs
	MediaBrowser.ServerApplication/ApplicationHost.cs
This commit is contained in:
LukePulverenti
2013-02-27 11:57:14 -05:00
parent ca7ee68473 1d51ede060
commit 6d5d291762
10 changed files with 266 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
MediaBrowser.ServerApplication/ApplicationHost.cs
View File

@@ -7,13 +7,15 @@ using MediaBrowser.Common.Implementations.Logging;
using MediaBrowser.Common.Implementations.NetworkManagement;
using MediaBrowser.Common.Implementations.ScheduledTasks;
using MediaBrowser.Common.Implementations.Serialization;
using MediaBrowser.Common.IO;
using MediaBrowser.Common.Implementations.ServerManager;
using MediaBrowser.Common.Implementations.Udp;
using MediaBrowser.Common.Implementations.Updates;
using MediaBrowser.Common.Implementations.WebSocket;
using MediaBrowser.Common.IO;
using MediaBrowser.Common.Kernel;
using MediaBrowser.Common.Net;
using MediaBrowser.Common.ScheduledTasks;
using MediaBrowser.Common.Updates;
using MediaBrowser.Controller;
using MediaBrowser.IsoMounter;
using MediaBrowser.Model.IO;
@@ -86,7 +88,13 @@ namespace MediaBrowser.ServerApplication
RegisterResources(taskManager, networkManager, serverManager);
<<<<<<< HEAD
FindParts();
=======
RegisterResources(taskManager, httpServer, networkManager, serverManager, PackageManager);
FindParts(taskManager, httpServer);
>>>>>>> c9f48fe0d0d5cf4aec62df1d1e97f629967aff6f
}
/// <summary>
@@ -110,7 +118,11 @@ 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);
@@ -126,7 +138,27 @@ namespace MediaBrowser.ServerApplication
RegisterSingleInstance<IZipClient>(new DotNetZipClient());
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);
RegisterSingleInstance(networkManager);
RegisterSingleInstance(serverManager);
RegisterSingleInstance(packageManager);
}
/// <summary>
/// Finds the parts.
/// </summary>
private void FindParts(ITaskManager taskManager, IHttpServer httpServer)
{
taskManager.AddTasks(GetExports<IScheduledTask>(false));
httpServer.Init(GetExports<IRestfulService>(false));
>>>>>>> c9f48fe0d0d5cf4aec62df1d1e97f629967aff6f
}
/// <summary>