Merge branch 'multi-tas-input'

4 files changed, 32 insertions, 11 deletions

diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp
index aaa16d80cb..af71066314 100644
--- a/Source/Core/DolphinWX/Src/Frame.cpp
+++ b/Source/Core/DolphinWX/Src/Frame.cpp
@@ -327,7 +327,11 @@ CFrame::CFrame(wxFrame* parent,
 	m_LogWindow->Hide();
 	m_LogWindow->Disable();
 
-	g_TASInputDlg = new TASInputDlg(this);
+	g_TASInputDlg[0] = new TASInputDlg(this);
+	g_TASInputDlg[1] = new TASInputDlg(this);
+	g_TASInputDlg[2] = new TASInputDlg(this);
+	g_TASInputDlg[3] = new TASInputDlg(this);
+
 	Movie::SetInputManip(TASManipFunction);
 
 	State::SetOnAfterLoadCallback(OnAfterLoadCallback);
@@ -784,7 +788,7 @@ int GetCmdForHotkey(unsigned int key)
 void OnAfterLoadCallback()
 {
 	// warning: this gets called from the CPU thread, so we should only queue things to do on the proper thread
-	if(main_frame)
+	if (main_frame)
 	{
 		wxCommandEvent event(wxEVT_HOST_COMMAND, IDM_UPDATEGUI);
 		main_frame->GetEventHandler()->AddPendingEvent(event);
@@ -794,13 +798,24 @@ void OnAfterLoadCallback()
 void TASManipFunction(SPADStatus *PadStatus, int controllerID)
 {
 	if (main_frame)
-		main_frame->g_TASInputDlg->GetValues(PadStatus, controllerID);
+		main_frame->g_TASInputDlg[controllerID]->GetValues(PadStatus, controllerID);
 }
 
+bool TASInputHasFocus()
+{
+	for (int i = 0; i < 4; i++)
+	{
+		if (main_frame->g_TASInputDlg[i]->HasFocus())
+			return true;
+	}
+	return false;
+}
+
+
 void CFrame::OnKeyDown(wxKeyEvent& event)
 {
 	if(Core::GetState() != Core::CORE_UNINITIALIZED &&
-			(RendererHasFocus() || g_TASInputDlg->HasFocus()))
+			(RendererHasFocus() || TASInputHasFocus()))
 	{
 		int WiimoteId = -1;
 		// Toggle fullscreen
@@ -834,7 +849,7 @@ void CFrame::OnKeyDown(wxKeyEvent& event)
 		else
 		{
 			unsigned int i = NUM_HOTKEYS;
-			if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain || g_TASInputDlg->HasFocus())
+			if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bRenderToMain || TASInputHasFocus())
 			{
 				for (i = 0; i < NUM_HOTKEYS; i++)
 				{
diff --git a/Source/Core/DolphinWX/Src/Frame.h b/Source/Core/DolphinWX/Src/Frame.h
index 0a29fffd37..2891d9931c 100644
--- a/Source/Core/DolphinWX/Src/Frame.h
+++ b/Source/Core/DolphinWX/Src/Frame.h
@@ -110,7 +110,7 @@ public:
 	CCodeWindow* g_pCodeWindow;
 	NetPlaySetupDiag* g_NetPlaySetupDiag;
 	wxCheatsWindow* g_CheatsWindow;
-	TASInputDlg* g_TASInputDlg;
+	TASInputDlg* g_TASInputDlg[4];
 
 	void InitBitmaps();
 	void DoPause();
@@ -349,6 +349,7 @@ void OnAfterLoadCallback();
 
 // For TASInputDlg
 void TASManipFunction(SPADStatus *PadStatus, int controllerID);
+bool TASInputHasFocus();
 
 #endif  // __FRAME_H_
 
diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp
index 27a1aaa097..1c70b4e715 100644
--- a/Source/Core/DolphinWX/Src/FrameTools.cpp
+++ b/Source/Core/DolphinWX/Src/FrameTools.cpp
@@ -647,7 +647,16 @@ void CFrame::OnRecordReadOnly(wxCommandEvent& event)
 
 void CFrame::OnTASInput(wxCommandEvent& event)
 {
-	g_TASInputDlg->Show(true);
+	std::string number[4] = {"1","2","3","4"};
+
+	for (int i = 0; i < 4; ++i)
+	{
+		if (SConfig::GetInstance().m_SIDevice[i] == SIDEVICE_GC_CONTROLLER || SConfig::GetInstance().m_SIDevice[i] == SIDEVICE_GC_TARUKONGA)
+		{
+			g_TASInputDlg[i]->Show(true);
+			g_TASInputDlg[i]->SetTitle("TAS Input - Controller " + number[i]);
+		}
+	}
 }
 
 void CFrame::OnTogglePauseMovie(wxCommandEvent& WXUNUSED (event))
diff --git a/Source/Core/DolphinWX/Src/TASInputDlg.cpp b/Source/Core/DolphinWX/Src/TASInputDlg.cpp
index 5b71009644..8845eda961 100644
--- a/Source/Core/DolphinWX/Src/TASInputDlg.cpp
+++ b/Source/Core/DolphinWX/Src/TASInputDlg.cpp
@@ -459,10 +459,6 @@ void TASInputDlg::GetValues(SPADStatus *PadStatus, int controllerID)
 	GetKeyBoardInput(PadStatus);
 	SetLandRTriggers();
 
-	// TODO: implement support for more controllers
-	if (controllerID != 0)
-		return;
-
 	PadStatus->stickX = mainX;
 	PadStatus->stickY = mainY;
 	PadStatus->substickX = cX;