aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.ServerApplication/MainStartup.cs
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2017-08-09 15:56:38 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2017-08-09 15:56:38 -0400
commit40442f887ba717ae47620b152315f21b252fe049 (patch)
tree340be082fd2296f19aed17b24b22b5095e3815a7 /MediaBrowser.ServerApplication/MainStartup.cs
parent52aeb3c40b3e2f0fdc377ac7c793714add2be0ef (diff)
consolidate emby.server.core into emby.server.implementations
Diffstat (limited to 'MediaBrowser.ServerApplication/MainStartup.cs')
-rw-r--r--MediaBrowser.ServerApplication/MainStartup.cs7
1 files changed, 3 insertions, 4 deletions
diff --git a/MediaBrowser.ServerApplication/MainStartup.cs b/MediaBrowser.ServerApplication/MainStartup.cs
index bc38476ca4..e687b34cf5 100644
--- a/MediaBrowser.ServerApplication/MainStartup.cs
+++ b/MediaBrowser.ServerApplication/MainStartup.cs
@@ -24,14 +24,13 @@ using Emby.Common.Implementations.Networking;
using Emby.Server.Core.Cryptography;
using Emby.Drawing;
using Emby.Server.Core;
-using Emby.Server.Core.IO;
-using Emby.Server.Core.Logging;
using Emby.Server.Implementations;
using Emby.Server.Implementations.Browser;
using Emby.Server.Implementations.IO;
using Emby.Server.Implementations.Logging;
using MediaBrowser.Common.Net;
using MediaBrowser.Model.IO;
+using SystemEvents = Emby.Server.Implementations.SystemEvents;
namespace MediaBrowser.ServerApplication
{
@@ -320,8 +319,8 @@ namespace MediaBrowser.ServerApplication
"emby.windows.zip",
environmentInfo,
new NullImageEncoder(),
- new Server.Startup.Common.SystemEvents(logManager.GetLogger("SystemEvents")),
- new RecyclableMemoryStreamProvider(),
+ new SystemEvents(logManager.GetLogger("SystemEvents")),
+ new MemoryStreamProvider(),
new Networking.NetworkManager(logManager.GetLogger("NetworkManager")),
GenerateCertificate,
() => Environment.UserDomainName);