added: advanced setting <jsonrpc><tcpport>9090</tcpport></jsonrpc> to…

… be able to configure the tcp port used for json rpc
xbmc · Feb 22, 2011 · cf05a5d · cf05a5d
1 parent 7621740
commit cf05a5d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
@@ -1228,8 +1228,8 @@ void CApplication::StartJSONRPCServer()
 #ifdef HAS_JSONRPC
   if (g_guiSettings.GetBool("services.esenabled"))
   {
-    if (CTCPServer::StartServer(9090, g_guiSettings.GetBool("services.esallinterfaces")))
+    if (CTCPServer::StartServer(g_advancedSettings.m_jsonTcpPort, g_guiSettings.GetBool("services.esallinterfaces")))
-      CZeroconf::GetInstance()->PublishService("servers.jsonrpc", "_xbmc-jsonrpc._tcp", "XBMC JSONRPC", 9090);
+      CZeroconf::GetInstance()->PublishService("servers.jsonrpc", "_xbmc-jsonrpc._tcp", "XBMC JSONRPC", g_advancedSettings.m_jsonTcpPort);
   }
 #endif
 }

diff --git a/xbmc/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp
@@ -276,6 +276,7 @@ void CAdvancedSettings::Initialize()
   m_cacheMemBufferSize = (1048576 * 5);
 
   m_jsonOutputCompact = true;
+  m_jsonTcpPort = 9090;
 }
 
 bool CAdvancedSettings::Load()
@@ -590,6 +591,7 @@ bool CAdvancedSettings::Load()
   if (pElement)
   {
     XMLUtils::GetBoolean(pElement, "compactoutput", m_jsonOutputCompact);
+    XMLUtils::GetUInt(pElement, "tcpport", m_jsonTcpPort);
   }
 
   pElement = pRootElement->FirstChildElement("samba");

diff --git a/xbmc/settings/AdvancedSettings.h b/xbmc/settings/AdvancedSettings.h
@@ -289,6 +289,7 @@ class CAdvancedSettings : public virtual xbmcutil::Referenced
     unsigned int m_cacheMemBufferSize;
 
     bool m_jsonOutputCompact;
+    unsigned int m_jsonTcpPort;
 };
 
 XBMC_GLOBAL(CAdvancedSettings,g_advancedSettings);