summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinQt2/MainWindow.cpp
diff options
context:
space:
mode:
authorRukai <rubickent@gmail.com>2018-01-31 22:35:09 +1100
committerLucas Kent <rubickent@gmail.com>2018-02-13 07:15:54 +1100
commitd07e212cef40624276617bcc0519aef6325c7da3 (patch)
tree6625cde63b9e983f9aae405ff83024430a55583a /Source/Core/DolphinQt2/MainWindow.cpp
parent3f1ffbad0d02e3ac68d7d8e12adef12ea8db75a6 (diff)
Qt: Implement Wii TAS input window
Diffstat (limited to 'Source/Core/DolphinQt2/MainWindow.cpp')
-rw-r--r--Source/Core/DolphinQt2/MainWindow.cpp27
1 files changed, 21 insertions, 6 deletions
diff --git a/Source/Core/DolphinQt2/MainWindow.cpp b/Source/Core/DolphinQt2/MainWindow.cpp
index 661fa2f83b..b6b84be1c2 100644
--- a/Source/Core/DolphinQt2/MainWindow.cpp
+++ b/Source/Core/DolphinQt2/MainWindow.cpp
@@ -65,6 +65,7 @@
#include "DolphinQt2/Resources.h"
#include "DolphinQt2/Settings.h"
#include "DolphinQt2/TAS/GCTASInputWindow.h"
+#include "DolphinQt2/TAS/WiiTASInputWindow.h"
#include "DolphinQt2/WiiUpdate.h"
#include "InputCommon/ControllerInterface/ControllerInterface.h"
@@ -168,13 +169,20 @@ void MainWindow::CreateComponents()
m_controllers_window = new ControllersWindow(this);
m_settings_window = new SettingsWindow(this);
- std::generate(m_gc_tas_input_windows.begin(), m_gc_tas_input_windows.end(),
- [this] { return new GCTASInputWindow(this); });
+ for (int i = 0; i < 4; i++)
+ {
+ m_gc_tas_input_windows[i] = new GCTASInputWindow(this, i);
+ m_wii_tas_input_windows[i] = new WiiTASInputWindow(this, i);
+ }
+
Movie::SetGCInputManip([this](GCPadStatus* pad_status, int controller_id) {
m_gc_tas_input_windows[controller_id]->GetValues(pad_status);
});
- // TODO: create wii input windows
+ Movie::SetWiiInputManip([this](u8* input_data, WiimoteEmu::ReportFeatures rptf, int controller_id,
+ int ext, wiimote_key key) {
+ m_wii_tas_input_windows[controller_id]->GetValues(input_data, rptf, ext, key);
+ });
m_hotkey_window = new MappingWindow(this, MappingWindow::Type::MAPPING_HOTKEYS, 0);
@@ -1099,12 +1107,19 @@ void MainWindow::ShowTASInput()
m_gc_tas_input_windows[i]->show();
m_gc_tas_input_windows[i]->raise();
m_gc_tas_input_windows[i]->activateWindow();
- m_gc_tas_input_windows[i]->setWindowTitle(
- tr("TAS Input - Gamecube Controller %1").arg(i + 1));
}
}
- // TODO: show wii input windows
+ for (int i = 0; i < 4; i++)
+ {
+ if (g_wiimote_sources[i] == WIIMOTE_SRC_EMU &&
+ (!Core::IsRunning() || SConfig::GetInstance().bWii))
+ {
+ m_wii_tas_input_windows[i]->show();
+ m_wii_tas_input_windows[i]->raise();
+ m_wii_tas_input_windows[i]->activateWindow();
+ }
+ }
}
void MainWindow::OnConnectWiiRemote(int id)