ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'join-wiimote-scanning-thread'

This commit is contained in:
Glenn Rice 2013-08-01 07:19:00 -05:00
parent 8c5bc2ba3c be76dc153b
commit 95c234ceb3
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/Src/HW/Wiimote.cpp
View File

@ -32,7 +32,7 @@ void Shutdown()
delete *i; delete *i;
g_plugin.controllers.clear(); g_plugin.controllers.clear();
WiimoteReal::Shutdown(); WiimoteReal::Stop();
g_controller_interface.Shutdown(); g_controller_interface.Shutdown();
} }

1
Source/Core/Core/Src/HW/Wiimote.h
View File

@ -54,6 +54,7 @@ namespace WiimoteReal
{ {
void Initialize(bool wait = false); void Initialize(bool wait = false);
void Stop();
void Shutdown(); void Shutdown();
void Resume(); void Resume();
void Pause(); void Pause();

10
Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp
View File

@ -570,15 +570,17 @@ void Initialize(bool wait)
g_real_wiimotes_initialized = true; g_real_wiimotes_initialized = true;
} }
void Shutdown(void) // called on emulation shutdown
void Stop(void)
{ {
for (unsigned int i = 0; i < MAX_BBMOTES; ++i) for (unsigned int i = 0; i < MAX_BBMOTES; ++i)
if (g_wiimotes[i] && g_wiimotes[i]->IsConnected()) if (g_wiimotes[i] && g_wiimotes[i]->IsConnected())
g_wiimotes[i]->EmuStop(); g_wiimotes[i]->EmuStop();
}
// WiimoteReal is shutdown on app exit // called when the dolphin app exits
return; void Shutdown(void)
{
g_wiimote_scanner.StopScanning(); g_wiimote_scanner.StopScanning();
std::lock_guard<std::recursive_mutex> lk(g_refresh_lock); std::lock_guard<std::recursive_mutex> lk(g_refresh_lock);