The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-25 15:31:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7627 from Techjar/netplay-disable-bt-passthrough

Browse Source 
Core/BootManager: Disable bluetooth passthrough when booting NetPlay
This commit is contained in:
JosJuice 2018-12-25 15:48:08 +01:00 committed by GitHub
commit ca2a2c98f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/Core/BootManager.cpp
View File

@ -92,6 +92,7 @@ private:
float m_EmulationSpeed; float m_EmulationSpeed;
float m_OCFactor; float m_OCFactor;
bool m_OCEnable; bool m_OCEnable;
bool m_bt_passthrough_enabled;
std::string strBackend; std::string strBackend;
std::string sBackend; std::string sBackend;
std::string m_strGPUDeterminismMode; std::string m_strGPUDeterminismMode;
@ -128,6 +129,7 @@ void ConfigCache::SaveConfig(const SConfig& config)
m_strGPUDeterminismMode = config.m_strGPUDeterminismMode; m_strGPUDeterminismMode = config.m_strGPUDeterminismMode;
m_OCFactor = config.m_OCFactor; m_OCFactor = config.m_OCFactor;
m_OCEnable = config.m_OCEnable; m_OCEnable = config.m_OCEnable;
m_bt_passthrough_enabled = config.m_bt_passthrough_enabled;
std::copy(std::begin(g_wiimote_sources), std::end(g_wiimote_sources), std::begin(iWiimoteSource)); std::copy(std::begin(g_wiimote_sources), std::end(g_wiimote_sources), std::begin(iWiimoteSource));
std::copy(std::begin(config.m_SIDevice), std::end(config.m_SIDevice), std::begin(Pads)); std::copy(std::begin(config.m_SIDevice), std::end(config.m_SIDevice), std::begin(Pads));
@ -203,6 +205,7 @@ void ConfigCache::RestoreConfig(SConfig* config)
config->m_strGPUDeterminismMode = m_strGPUDeterminismMode; config->m_strGPUDeterminismMode = m_strGPUDeterminismMode;
config->m_OCFactor = m_OCFactor; config->m_OCFactor = m_OCFactor;
config->m_OCEnable = m_OCEnable; config->m_OCEnable = m_OCEnable;
config->m_bt_passthrough_enabled = m_bt_passthrough_enabled;
VideoBackendBase::ActivateBackend(config->m_strVideoBackend); VideoBackendBase::ActivateBackend(config->m_strVideoBackend);
} }
@ -372,6 +375,7 @@ bool BootCore(std::unique_ptr<BootParameters> boot, const WindowSystemInfo& wsi)
StartUp.bMMU = netplay_settings.m_MMU; StartUp.bMMU = netplay_settings.m_MMU;
StartUp.bFastmem = netplay_settings.m_Fastmem; StartUp.bFastmem = netplay_settings.m_Fastmem;
StartUp.bHLE_BS2 = netplay_settings.m_SkipIPL; StartUp.bHLE_BS2 = netplay_settings.m_SkipIPL;
StartUp.m_bt_passthrough_enabled = false;
if (netplay_settings.m_HostInputAuthority && !netplay_settings.m_IsHosting) if (netplay_settings.m_HostInputAuthority && !netplay_settings.m_IsHosting)
config_cache.bSetEmulationSpeed = true; config_cache.bSetEmulationSpeed = true;
} }