Cleaned up NetPlay a bit, fixed some UI text.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6425 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Jordan Woyak
2010-11-16 01:55:29 +00:00
parent d0e8d8a509
commit 71f842e8c0
10 changed files with 88 additions and 228 deletions

View File

@ -30,23 +30,10 @@
#include <wx/gbsizer.h>
#include <wx/listbox.h>
#include <wx/spinctrl.h>
//#include <wx/thread.h>
#include "GameListCtrl.h"
// just leaving these here so i can find something later if i need it
//#include "Frame.h"
//#include "Globals.h"
//#include "BootManager.h"
//#include "Common.h"
//#include "NetStructs.h"
//#include "Core.h"
//#include "HW/SI.h"
//#include "HW/SI_Device.h"
//#include "HW/SI_DeviceGCController.h"
//#include "Timer.h"
#include "LockingQueue.h"
#include "FifoQueue.h"
enum
{
@ -82,8 +69,7 @@ public:
, const std::string& game, const bool is_hosting = false);
~NetPlayDiag();
LockingQueue<std::string> chat_msgs;
//std::string chat_msg;
Common::FifoQueue<std::string> chat_msgs;
void OnStart(wxCommandEvent& event);
void OnStop(wxCommandEvent& event);
@ -109,7 +95,6 @@ private:
std::vector<int> m_playerids;
const CGameListCtrl* const m_game_list;
//NetPlay* const m_netplay;
};
DECLARE_EVENT_TYPE(wxEVT_THREAD, -1)