ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4273 from JosJuice/traversal-server-label 

DolphinWX: Less duplication in code related to traversal server label
This commit is contained in:
Anthony 2016-10-02 23:13:55 -05:00 committed by GitHub
parent 0e3f91d88b 6ff2bd3243
commit 3ec6c9cbc0
1 changed files with 33 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp
View File

@ -23,20 +23,35 @@
#include "DolphinWX/NetPlay/NetWindow.h" #include "DolphinWX/NetPlay/NetWindow.h"
#include "DolphinWX/WxUtils.h" #include "DolphinWX/WxUtils.h"
static void GetTraversalPort(IniFile::Section& section, std::string* port) static const std::string DEFAULT_TRAVERSAL_SERVER = "stun.dolphin-emu.org";
static const std::string DEFAULT_TRAVERSAL_PORT = "6262";
static std::string GetFromINI(IniFile::Section& section, const std::string& key,
const std::string& default_value)
{ {
section.Get("TraversalPort", port, "6262"); std::string result;
port->erase(std::remove(port->begin(), port->end(), ' '), port->end()); section.Get(key, &result, default_value);
if (port->empty()) result.erase(std::remove(result.begin(), result.end(), ' '), result.end());
*port = "6262"; if (result.empty())
return default_value;
return result;
} }
static void GetTraversalServer(IniFile::Section& section, std::string* server) static std::string GetTraversalPort(IniFile::Section& section)
{ {
section.Get("TraversalServer", server, "stun.dolphin-emu.org"); return GetFromINI(section, "TraversalPort", DEFAULT_TRAVERSAL_PORT);
server->erase(std::remove(server->begin(), server->end(), ' '), server->end()); }
if (server->empty())
*server = "stun.dolphin-emu.org"; static std::string GetTraversalServer(IniFile::Section& section)
{
return GetFromINI(section, "TraversalServer", DEFAULT_TRAVERSAL_SERVER);
}
static wxString GetTraversalLabelText(IniFile::Section& section)
{
std::string server = GetTraversalServer(section);
std::string port = GetTraversalPort(section);
return wxString::Format(_("Traversal Server: %s"), (server + ":" + port).c_str());
} }
NetPlaySetupFrame::NetPlaySetupFrame(wxWindow* const parent, const CGameListCtrl* const game_list) NetPlaySetupFrame::NetPlaySetupFrame(wxWindow* const parent, const CGameListCtrl* const game_list)
@ -98,13 +113,7 @@ NetPlaySetupFrame::NetPlaySetupFrame(wxWindow* const parent, const CGameListCtrl
m_direct_traversal->Select(DIRECT_CHOICE); m_direct_traversal->Select(DIRECT_CHOICE);
} }
std::string centralPort; m_traversal_lbl = new wxStaticText(panel, wxID_ANY, GetTraversalLabelText(netplay_section));
GetTraversalPort(netplay_section, &centralPort);
std::string centralServer;
GetTraversalServer(netplay_section, &centralServer);
m_traversal_lbl = new wxStaticText(panel, wxID_ANY, _("Traversal Server:") + " " +
centralServer + ":" + centralPort);
} }
// tabs // tabs
m_notebook = new wxNotebook(panel, wxID_ANY); m_notebook = new wxNotebook(panel, wxID_ANY);
@ -312,13 +321,11 @@ void NetPlaySetupFrame::MakeNetPlayDiag(int port, const std::string& game, bool
inifile.Load(File::GetUserPath(F_DOLPHINCONFIG_IDX)); inifile.Load(File::GetUserPath(F_DOLPHINCONFIG_IDX));
IniFile::Section& netplay_section = *inifile.GetOrCreateSection("NetPlay"); IniFile::Section& netplay_section = *inifile.GetOrCreateSection("NetPlay");
std::string centralPortString; std::string centralPortString = GetTraversalPort(netplay_section);
GetTraversalPort(netplay_section, &centralPortString);
unsigned long int centralPort; unsigned long int centralPort;
StrToWxStr(centralPortString).ToULong(&centralPort); StrToWxStr(centralPortString).ToULong(&centralPort);
std::string centralServer; std::string centralServer = GetTraversalServer(netplay_section);
GetTraversalServer(netplay_section, &centralServer);
netplay_client = new NetPlayClient(ip, (u16)port, npd, WxStrToStr(m_nickname_text->GetValue()), netplay_client = new NetPlayClient(ip, (u16)port, npd, WxStrToStr(m_nickname_text->GetValue()),
trav, centralServer, (u16)centralPort); trav, centralServer, (u16)centralPort);
@ -394,13 +401,11 @@ void NetPlaySetupFrame::DoHost()
m_host_port_text->GetValue().ToULong(&listen_port); m_host_port_text->GetValue().ToULong(&listen_port);
} }
std::string centralPortString; std::string centralPortString = GetTraversalPort(netplay_section);
GetTraversalPort(netplay_section, &centralPortString);
unsigned long int centralPort; unsigned long int centralPort;
StrToWxStr(centralPortString).ToULong(&centralPort); StrToWxStr(centralPortString).ToULong(&centralPort);
std::string centralServer; std::string centralServer = GetTraversalServer(netplay_section);
GetTraversalServer(netplay_section, &centralServer);
netplay_server = new NetPlayServer((u16)listen_port, trav, centralServer, (u16)centralPort); netplay_server = new NetPlayServer((u16)listen_port, trav, centralServer, (u16)centralPort);
if (netplay_server->is_connected) if (netplay_server->is_connected)
@ -453,11 +458,11 @@ void NetPlaySetupFrame::OnResetTraversal(wxCommandEvent& event)
const std::string dolphin_ini = File::GetUserPath(F_DOLPHINCONFIG_IDX); const std::string dolphin_ini = File::GetUserPath(F_DOLPHINCONFIG_IDX);
inifile.Load(dolphin_ini); inifile.Load(dolphin_ini);
IniFile::Section& netplay_section = *inifile.GetOrCreateSection("NetPlay"); IniFile::Section& netplay_section = *inifile.GetOrCreateSection("NetPlay");
netplay_section.Set("TraversalServer", (std::string) "stun.dolphin-emu.org"); netplay_section.Delete("TraversalServer");
netplay_section.Set("TraversalPort", (std::string) "6262"); netplay_section.Delete("TraversalPort");
inifile.Save(dolphin_ini); inifile.Save(dolphin_ini);
m_traversal_lbl->SetLabelText(_("Traversal Server: ") + "stun.dolphin-emu.org:6262"); m_traversal_lbl->SetLabelText(GetTraversalLabelText(netplay_section));
} }
void NetPlaySetupFrame::OnTraversalListenPortChanged(wxCommandEvent& event) void NetPlaySetupFrame::OnTraversalListenPortChanged(wxCommandEvent& event)