From c452e72ca7c483f393b3592a6cf6a9f9b7dd3cff Mon Sep 17 00:00:00 2001 From: mathieui Date: Fri, 1 May 2015 01:49:24 +0200 Subject: [PATCH] =?UTF-8?q?Netplay:=20don=E2=80=99t=20show=20traversal=20s?= =?UTF-8?q?erver/port=20options=20(INI=20config=20only)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DolphinWX/NetPlay/NetPlaySetupFrame.cpp | 59 ++++++++----------- .../DolphinWX/NetPlay/NetPlaySetupFrame.h | 4 -- 2 files changed, 26 insertions(+), 37 deletions(-) diff --git a/Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp b/Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp index 857a082ae4..0dc56d76b1 100644 --- a/Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp +++ b/Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.cpp @@ -62,20 +62,6 @@ NetPlaySetupFrame::NetPlaySetupFrame(wxWindow* const parent, const CGameListCtrl nick_szr->Add(nick_lbl, 0, wxCENTER); nick_szr->Add(m_nickname_text, 0, wxALL, 5); - std::string centralServer; - netplay_section.Get("TraversalServer", ¢ralServer, ""); - m_traversal_server_lbl = new wxStaticText(panel, wxID_ANY, _("Traversal:")); - m_traversal_server = new wxTextCtrl(panel, wxID_ANY, StrToWxStr(centralServer)); - nick_szr->Add(m_traversal_server_lbl, 0, wxCENTER); - nick_szr->Add(m_traversal_server, 0, wxALL, 5); - - std::string centralPort; - netplay_section.Get("TraversalPort", ¢ralPort, ""); - m_traversal_port_lbl = new wxStaticText(panel, wxID_ANY, _("Port:")); - m_traversal_port = new wxTextCtrl(panel, wxID_ANY, StrToWxStr(centralPort)); - nick_szr->Add(m_traversal_port_lbl, 0, wxCENTER); - nick_szr->Add(m_traversal_port, 0, wxALL, 5); - // tabs wxNotebook* const notebook = new wxNotebook(panel, wxID_ANY); wxPanel* const connect_tab = new wxPanel(notebook, wxID_ANY); @@ -210,8 +196,6 @@ NetPlaySetupFrame::~NetPlaySetupFrame() } netplay_section.Set("Nickname", WxStrToStr(m_nickname_text->GetValue())); - netplay_section.Set("TraversalServer", WxStrToStr(m_traversal_server->GetValue())); - netplay_section.Set("TraversalPort", WxStrToStr(m_traversal_port->GetValue())); if (m_direct_traversal->GetCurrentSelection() == 0) { @@ -246,9 +230,19 @@ void NetPlaySetupFrame::MakeNetPlayDiag(int port, const std::string &game, bool else trav = false; - unsigned long centralPort = 0; - m_traversal_port->GetValue().ToULong(¢ralPort); - netplay_client = new NetPlayClient(ip, (u16)port, npd, WxStrToStr(m_nickname_text->GetValue()), trav, WxStrToStr(m_traversal_server->GetValue()), (u16)centralPort); + IniFile inifile; + inifile.Load(File::GetUserPath(D_CONFIG_IDX) + "Dolphin.ini"); + IniFile::Section& netplay_section = *inifile.GetOrCreateSection("NetPlay"); + + std::string centralPortString; + netplay_section.Get("TraversalPort", ¢ralPortString, "6262"); + unsigned long int centralPort; + StrToWxStr(centralPortString).ToULong(¢ralPort); + + std::string centralServer; + netplay_section.Get("TraversalServer", ¢ralServer, "stun.dolphin-emu.org"); + + netplay_client = new NetPlayClient(ip, (u16)port, npd, WxStrToStr(m_nickname_text->GetValue()), trav, centralServer, (u16) centralPort); if (netplay_client->is_connected) { npd->Show(); @@ -288,9 +282,19 @@ void NetPlaySetupFrame::OnHost(wxCommandEvent&) unsigned long port = 0; m_host_port_text->GetValue().ToULong(&port); - unsigned long centralPort = 0; - m_traversal_port->GetValue().ToULong(¢ralPort); - netplay_server = new NetPlayServer((u16)port, trav, WxStrToStr(m_traversal_server->GetValue()), (u16)centralPort); + IniFile inifile; + inifile.Load(File::GetUserPath(D_CONFIG_IDX) + "Dolphin.ini"); + IniFile::Section& netplay_section = *inifile.GetOrCreateSection("NetPlay"); + + std::string centralPortString; + netplay_section.Get("TraversalPort", ¢ralPortString, "6262"); + unsigned long int centralPort; + StrToWxStr(centralPortString).ToULong(¢ralPort); + + std::string centralServer; + netplay_section.Get("TraversalServer", ¢ralServer, "stun.dolphin-emu.org"); + + netplay_server = new NetPlayServer((u16)port, trav, centralServer, (u16) centralPort); if (netplay_server->is_connected) { netplay_server->ChangeGame(game); @@ -331,12 +335,6 @@ void NetPlaySetupFrame::OnChoice(wxCommandEvent& event) if (sel == 1) { - m_traversal_server_lbl->Show(); - m_traversal_server->Show(); - - m_traversal_port_lbl->Show(); - m_traversal_port->Show(); - //Traversal //client tab { @@ -359,11 +357,6 @@ void NetPlaySetupFrame::OnChoice(wxCommandEvent& event) } else { - m_traversal_server_lbl->Hide(); - m_traversal_server->Hide(); - - m_traversal_port_lbl->Hide(); - m_traversal_port->Hide(); // Direct // Client tab { diff --git a/Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.h b/Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.h index 15cddb1841..f7e30557ad 100644 --- a/Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.h +++ b/Source/Core/DolphinWX/NetPlay/NetPlaySetupFrame.h @@ -36,10 +36,6 @@ private: wxTextCtrl* m_connect_port_text; wxTextCtrl* m_connect_ip_text; wxChoice* m_direct_traversal; - wxStaticText* m_traversal_server_lbl; - wxTextCtrl* m_traversal_server; - wxStaticText* m_traversal_port_lbl; - wxTextCtrl* m_traversal_port; wxListBox* m_game_lbox; #ifdef USE_UPNP