From bc657237aa4c541fe0079fcbb7616dbe87bbf0a7 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Fri, 18 Jul 2014 21:28:40 -0400
Subject: consolidate web socket onto one port

---
 MediaBrowser.ServerApplication/ApplicationHost.cs | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

(limited to 'MediaBrowser.ServerApplication/ApplicationHost.cs')

diff --git a/MediaBrowser.ServerApplication/ApplicationHost.cs b/MediaBrowser.ServerApplication/ApplicationHost.cs
index da7f8631b..3d6865f85 100644
--- a/MediaBrowser.ServerApplication/ApplicationHost.cs
+++ b/MediaBrowser.ServerApplication/ApplicationHost.cs
@@ -72,7 +72,6 @@ using MediaBrowser.Server.Implementations.ServerManager;
 using MediaBrowser.Server.Implementations.Session;
 using MediaBrowser.Server.Implementations.Sync;
 using MediaBrowser.Server.Implementations.Themes;
-using MediaBrowser.Server.Implementations.WebSocket;
 using MediaBrowser.ServerApplication.EntryPoints;
 using MediaBrowser.ServerApplication.FFMpeg;
 using MediaBrowser.ServerApplication.IO;
@@ -517,8 +516,6 @@ namespace MediaBrowser.ServerApplication
             LocalizationManager = new LocalizationManager(ServerConfigurationManager, FileSystemManager, JsonSerializer);
             RegisterSingleInstance(LocalizationManager);
 
-            RegisterSingleInstance<IWebSocketServer>(() => new AlchemyServer(Logger));
-
             RegisterSingleInstance<IBlurayExaminer>(() => new BdInfoExaminer());
 
             UserDataManager = new UserDataManager(LogManager);
@@ -868,8 +865,6 @@ namespace MediaBrowser.ServerApplication
                     throw;
                 }
             }
-
-            ServerManager.StartWebSocketServer();
         }
 
         /// <summary>
@@ -885,11 +880,6 @@ namespace MediaBrowser.ServerApplication
             {
                 NotifyPendingRestart();
             }
-
-            else if (!ServerManager.SupportsNativeWebSocket && ServerManager.WebSocketPortNumber != ServerConfigurationManager.Configuration.LegacyWebSocketPortNumber)
-            {
-                NotifyPendingRestart();
-            }
         }
 
         /// <summary>
@@ -1022,7 +1012,7 @@ namespace MediaBrowser.ServerApplication
                 Version = ApplicationVersion.ToString(),
                 IsNetworkDeployed = CanSelfUpdate,
                 WebSocketPortNumber = ServerManager.WebSocketPortNumber,
-                SupportsNativeWebSocket = ServerManager.SupportsNativeWebSocket,
+                SupportsNativeWebSocket = true,
                 FailedPluginAssemblies = FailedAssemblies.ToList(),
                 InProgressInstallations = InstallationManager.CurrentInstallations.Select(i => i.Item1).ToList(),
                 CompletedInstallations = InstallationManager.CompletedInstallations.ToList(),
-- 
cgit v1.2.3