HotkeyScheduler: Handle Wii Remote connections independently
Allow connecting or disconnecting multiple Wii Remotes simultaneously instead of only handling the highest index whose hotkey is pressed. This allows using a single hotkey to toggle multiple remotes.
This commit is contained in:
parent
5af0ae25e6
commit
16bf5a86d3
|
@ -277,20 +277,16 @@ void HotkeyScheduler::Run()
|
||||||
|
|
||||||
if (Core::System::GetInstance().IsWii())
|
if (Core::System::GetInstance().IsWii())
|
||||||
{
|
{
|
||||||
int wiimote_id = -1;
|
|
||||||
if (IsHotkey(HK_WIIMOTE1_CONNECT))
|
if (IsHotkey(HK_WIIMOTE1_CONNECT))
|
||||||
wiimote_id = 0;
|
emit ConnectWiiRemote(0);
|
||||||
if (IsHotkey(HK_WIIMOTE2_CONNECT))
|
if (IsHotkey(HK_WIIMOTE2_CONNECT))
|
||||||
wiimote_id = 1;
|
emit ConnectWiiRemote(1);
|
||||||
if (IsHotkey(HK_WIIMOTE3_CONNECT))
|
if (IsHotkey(HK_WIIMOTE3_CONNECT))
|
||||||
wiimote_id = 2;
|
emit ConnectWiiRemote(2);
|
||||||
if (IsHotkey(HK_WIIMOTE4_CONNECT))
|
if (IsHotkey(HK_WIIMOTE4_CONNECT))
|
||||||
wiimote_id = 3;
|
emit ConnectWiiRemote(3);
|
||||||
if (IsHotkey(HK_BALANCEBOARD_CONNECT))
|
if (IsHotkey(HK_BALANCEBOARD_CONNECT))
|
||||||
wiimote_id = 4;
|
emit ConnectWiiRemote(4);
|
||||||
|
|
||||||
if (wiimote_id > -1)
|
|
||||||
emit ConnectWiiRemote(wiimote_id);
|
|
||||||
|
|
||||||
if (IsHotkey(HK_TOGGLE_SD_CARD))
|
if (IsHotkey(HK_TOGGLE_SD_CARD))
|
||||||
Settings::Instance().SetSDCardInserted(!Settings::Instance().IsSDCardInserted());
|
Settings::Instance().SetSDCardInserted(!Settings::Instance().IsSDCardInserted());
|
||||||
|
|
Loading…
Reference in New Issue