From 51e964dae394ae4a211482d562dbc28e79c00c3c Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Tue, 29 Jul 2014 23:31:35 -0400
Subject: support channels with dlna

---
 .../EntryPoints/ExternalPortForwarding.cs                          | 5 -----
 .../EntryPoints/UdpServerEntryPoint.cs                             | 7 +++++--
 2 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'MediaBrowser.Server.Implementations/EntryPoints')

diff --git a/MediaBrowser.Server.Implementations/EntryPoints/ExternalPortForwarding.cs b/MediaBrowser.Server.Implementations/EntryPoints/ExternalPortForwarding.cs
index 04ddb4c4b..a27755d75 100644
--- a/MediaBrowser.Server.Implementations/EntryPoints/ExternalPortForwarding.cs
+++ b/MediaBrowser.Server.Implementations/EntryPoints/ExternalPortForwarding.cs
@@ -97,11 +97,6 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
             var info = _appHost.GetSystemInfo();
 
             CreatePortMap(device, info.HttpServerPortNumber);
-
-            if (info.WebSocketPortNumber != info.HttpServerPortNumber)
-            {
-                CreatePortMap(device, info.WebSocketPortNumber);
-            }
         }
 
         private void CreatePortMap(INatDevice device, int port)
diff --git a/MediaBrowser.Server.Implementations/EntryPoints/UdpServerEntryPoint.cs b/MediaBrowser.Server.Implementations/EntryPoints/UdpServerEntryPoint.cs
index 9191e0bea..3b4379e37 100644
--- a/MediaBrowser.Server.Implementations/EntryPoints/UdpServerEntryPoint.cs
+++ b/MediaBrowser.Server.Implementations/EntryPoints/UdpServerEntryPoint.cs
@@ -4,6 +4,7 @@ using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Plugins;
 using MediaBrowser.Model.Logging;
+using MediaBrowser.Model.Serialization;
 using MediaBrowser.Server.Implementations.Udp;
 using System.Net.Sockets;
 
@@ -37,6 +38,7 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
         /// </summary>
         private readonly IHttpServer _httpServer;
         private readonly IServerApplicationHost _appHost;
+        private readonly IJsonSerializer _json;
 
         public const int PortNumber = 7359;
 
@@ -47,13 +49,14 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
         /// <param name="networkManager">The network manager.</param>
         /// <param name="serverConfigurationManager">The server configuration manager.</param>
         /// <param name="httpServer">The HTTP server.</param>
-        public UdpServerEntryPoint(ILogger logger, INetworkManager networkManager, IServerConfigurationManager serverConfigurationManager, IHttpServer httpServer, IServerApplicationHost appHost)
+        public UdpServerEntryPoint(ILogger logger, INetworkManager networkManager, IServerConfigurationManager serverConfigurationManager, IHttpServer httpServer, IServerApplicationHost appHost, IJsonSerializer json)
         {
             _logger = logger;
             _networkManager = networkManager;
             _serverConfigurationManager = serverConfigurationManager;
             _httpServer = httpServer;
             _appHost = appHost;
+            _json = json;
         }
 
         /// <summary>
@@ -61,7 +64,7 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
         /// </summary>
         public void Run()
         {
-            var udpServer = new UdpServer(_logger, _networkManager, _serverConfigurationManager, _httpServer, _appHost);
+            var udpServer = new UdpServer(_logger, _networkManager, _serverConfigurationManager, _httpServer, _appHost, _json);
 
             try
             {
-- 
cgit v1.2.3