piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 06:39:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7143 from lioncash/bt-helper

Browse Source 
BTEmu: Make m_WiiMotes private
This commit is contained in:
Markus Wick
2018-06-21 10:00:28 +02:00
committed by GitHub
parent 4ca05810be 7eb86cdb67
commit b4b9b53239
9 changed files with 51 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/DolphinQt2/MainWindow.cpp
View File

@ -1401,7 +1401,7 @@ void MainWindow::OnConnectWiiRemote(int id)
Core::RunAsCPUThread([&] {
const auto bt = std::static_pointer_cast<IOS::HLE::Device::BluetoothEmu>(
ios->GetDeviceByName("/dev/usb/oh1/57e/305"));
const bool is_connected = bt && bt->AccessWiiMote(id | 0x100)->IsConnected();
const bool is_connected = bt && bt->AccessWiiMoteByIndex(id)->IsConnected();
Wiimote::Connect(id, !is_connected);
});
}

10
Source/Core/DolphinQt2/MenuBar.cpp
View File

@ -914,14 +914,16 @@ void MenuBar::UpdateToolsMenu(bool emulation_started)
const auto bt = ios ? std::static_pointer_cast<IOS::HLE::Device::BluetoothEmu>(
ios->GetDeviceByName("/dev/usb/oh1/57e/305")) :
nullptr;
bool enable_wiimotes =
const bool enable_wiimotes =
emulation_started && bt && !SConfig::GetInstance().m_bt_passthrough_enabled;
for (int i = 0; i < 5; i++)
for (std::size_t i = 0; i < m_wii_remotes.size(); i++)
{
m_wii_remotes[i]->setEnabled(enable_wiimotes);
QAction* const wii_remote = m_wii_remotes[i];
wii_remote->setEnabled(enable_wiimotes);
if (enable_wiimotes)
m_wii_remotes[i]->setChecked(bt->AccessWiiMote(0x0100 + i)->IsConnected());
wii_remote->setChecked(bt->AccessWiiMoteByIndex(i)->IsConnected());
}
}