From 59d6df7046b1ed1137d28da02aec3809e3e6439c Mon Sep 17 00:00:00 2001 From: Braden Date: Sun, 11 Nov 2012 15:35:08 -0600 Subject: Adds Support for multiple GameCube Controllers Conflicts: Source/Core/DolphinWX/Src/Frame.cpp --- Source/Core/DolphinWX/Src/FrameTools.cpp | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) (limited to 'Source/Core/DolphinWX/Src/FrameTools.cpp') diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp index 27a1aaa097..70b0a26f59 100644 --- a/Source/Core/DolphinWX/Src/FrameTools.cpp +++ b/Source/Core/DolphinWX/Src/FrameTools.cpp @@ -647,7 +647,29 @@ void CFrame::OnRecordReadOnly(wxCommandEvent& event) void CFrame::OnTASInput(wxCommandEvent& event) { - g_TASInputDlg->Show(true); + if(SConfig::GetInstance().m_SIDevice[0] == SIDEVICE_GC_CONTROLLER) + { + g_TASInputDlg->Show(true); + g_TASInputDlg->SetTitle("TAS Input - Controller 1"); + } + + if(SConfig::GetInstance().m_SIDevice[1] == SIDEVICE_GC_CONTROLLER) + { + g_TASInputDlg1->Show(true); + g_TASInputDlg1->SetTitle("TAS Input - Controller 2"); + } + + if(SConfig::GetInstance().m_SIDevice[2] == SIDEVICE_GC_CONTROLLER) + { + g_TASInputDlg2->Show(true); + g_TASInputDlg2->SetTitle("TAS Input - Controller 3"); + } + + if(SConfig::GetInstance().m_SIDevice[3] == SIDEVICE_GC_CONTROLLER) + { + g_TASInputDlg3->Show(true); + g_TASInputDlg3->SetTitle("TAS Input - Controller 4"); + } } void CFrame::OnTogglePauseMovie(wxCommandEvent& WXUNUSED (event)) -- cgit v1.2.3 From ec148008d0638ea4eafffd6bf95706e8d3507c5e Mon Sep 17 00:00:00 2001 From: Braden Date: Sun, 11 Nov 2012 16:38:01 -0600 Subject: Clean up code for multiple GameCube Controllers Conflicts: Source/Core/DolphinWX/Src/Frame.cpp Source/Core/DolphinWX/Src/FrameTools.cpp --- Source/Core/DolphinWX/Src/FrameTools.cpp | 33 ++++++++++---------------------- 1 file changed, 10 insertions(+), 23 deletions(-) (limited to 'Source/Core/DolphinWX/Src/FrameTools.cpp') diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp index 70b0a26f59..5409e98f6a 100644 --- a/Source/Core/DolphinWX/Src/FrameTools.cpp +++ b/Source/Core/DolphinWX/Src/FrameTools.cpp @@ -647,29 +647,16 @@ void CFrame::OnRecordReadOnly(wxCommandEvent& event) void CFrame::OnTASInput(wxCommandEvent& event) { - if(SConfig::GetInstance().m_SIDevice[0] == SIDEVICE_GC_CONTROLLER) - { - g_TASInputDlg->Show(true); - g_TASInputDlg->SetTitle("TAS Input - Controller 1"); - } - - if(SConfig::GetInstance().m_SIDevice[1] == SIDEVICE_GC_CONTROLLER) - { - g_TASInputDlg1->Show(true); - g_TASInputDlg1->SetTitle("TAS Input - Controller 2"); - } - - if(SConfig::GetInstance().m_SIDevice[2] == SIDEVICE_GC_CONTROLLER) - { - g_TASInputDlg2->Show(true); - g_TASInputDlg2->SetTitle("TAS Input - Controller 3"); - } - - if(SConfig::GetInstance().m_SIDevice[3] == SIDEVICE_GC_CONTROLLER) - { - g_TASInputDlg3->Show(true); - g_TASInputDlg3->SetTitle("TAS Input - Controller 4"); - } + std::string number[4] = {"1","2","3","4"}; + + for(int i = 0; i < 4; i++) + { + if(SConfig::GetInstance().m_SIDevice[i] == SIDEVICE_GC_CONTROLLER) + { + g_TASInputDlg[i]->Show(true); + g_TASInputDlg[i]->SetTitle("TAS Input - Controller " + number[i]); + } + } } void CFrame::OnTogglePauseMovie(wxCommandEvent& WXUNUSED (event)) -- cgit v1.2.3 From 3f03588decc18ddb4441cd6480eb36885eae7f8a Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Tue, 23 Jul 2013 20:43:51 -0400 Subject: Tas input works with bongos too. --- Source/Core/DolphinWX/Src/FrameTools.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Source/Core/DolphinWX/Src/FrameTools.cpp') diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp index 5409e98f6a..1c70b4e715 100644 --- a/Source/Core/DolphinWX/Src/FrameTools.cpp +++ b/Source/Core/DolphinWX/Src/FrameTools.cpp @@ -649,9 +649,9 @@ void CFrame::OnTASInput(wxCommandEvent& event) { std::string number[4] = {"1","2","3","4"}; - for(int i = 0; i < 4; i++) + for (int i = 0; i < 4; ++i) { - if(SConfig::GetInstance().m_SIDevice[i] == SIDEVICE_GC_CONTROLLER) + 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]); -- cgit v1.2.3