mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-24 06:39:46 -06:00
win32: Some more work on real wiimote automatic ingame pairup (automatic paired up wiimotes get connected now ingame as well, but it's not completely working yet, we're almost there tho:P) and changed the automatic unpair real wiimotes routine, so it won't get loaded via dll_detach anymore.
minor code changes and adding comments. And issue fix 2792 with credits to Karloathian for finding and fixing it. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5750 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
@ -105,12 +105,6 @@ BOOL APIENTRY DllMain(HINSTANCE hinstDLL, // DLL module handle
|
||||
|
||||
case DLL_PROCESS_DETACH:
|
||||
{
|
||||
#ifdef _WIN32
|
||||
if (g_Config.bUnpairRealWiimote){
|
||||
WiiMoteReal::Shutdown();
|
||||
WiiMoteReal::WiimotePairUp(true);
|
||||
}
|
||||
#endif
|
||||
#if defined(HAVE_WX) && HAVE_WX
|
||||
wxUninitialize();
|
||||
#endif
|
||||
@ -320,15 +314,7 @@ void Wiimote_Input(u16 _Key, u8 _UpDown)
|
||||
*/
|
||||
void Wiimote_InterruptChannel(int _number, u16 _channelID, const void* _pData, u32 _Size)
|
||||
{
|
||||
// Debugging
|
||||
#if defined(_DEBUG) || defined(DEBUGFAST)
|
||||
DEBUG_LOG(WIIMOTE, "Wiimote_InterruptChannel");
|
||||
DEBUG_LOG(WIIMOTE, " Channel ID: %04x", _channelID);
|
||||
std::string Temp = ArrayToString((const u8*)_pData, _Size);
|
||||
DEBUG_LOG(WIIMOTE, " Data: %s", Temp.c_str());
|
||||
#endif
|
||||
|
||||
// Decice where to send the message
|
||||
// Decide where to send the message
|
||||
if (WiiMoteEmu::WiiMapping[_number].Source <= 1)
|
||||
WiiMoteEmu::InterruptChannel(_number, _channelID, _pData, _Size);
|
||||
#if HAVE_WIIUSE
|
||||
@ -425,6 +411,15 @@ unsigned int Wiimote_GetAttachedControllers()
|
||||
}
|
||||
|
||||
|
||||
// Unpair Wiimotes, TODO: Add linux/osx un-pair function
|
||||
unsigned int Wiimote_UnPairWiimotes()
|
||||
{
|
||||
#ifdef _WIN32
|
||||
if (g_Config.bUnpairRealWiimote)
|
||||
return WiiMoteReal::WiimotePairUp(true);
|
||||
#endif
|
||||
return 0;
|
||||
}
|
||||
|
||||
// Supporting functions
|
||||
|
||||
|
Reference in New Issue
Block a user