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

Only call wiiuse with the number of slots we have configured for real

Browse Source 
wiimotes, so that wiiuse_find has a chance to return early when that
number is found rather than wait for the 5 second timeout always.

Hide the auto-(re)connect UI elements on non-Windows so as not to
confuse users until that functionality is implemented generally.

Empty strings are not allowed in wxChoice lists.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5714 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang
2010-06-16 00:15:58 +00:00
parent 8d2a23e43b
commit f8cf2aaa3e
3 changed files with 37 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Source/Plugins/Plugin_Wiimote/Src/wiimote_real.cpp
View File

@ -341,6 +341,8 @@ void FlashLights(bool Connect)
int Initialize()
{
int i, wiimote_slots = 0;
// Return if already initialized
if (g_RealWiiMoteInitialized)
return g_NumberOfWiiMotes;
@ -349,15 +351,28 @@ int Initialize()
// Clear the wiimote classes
memset(g_WiiMotes, 0, sizeof(CWiiMote*) * MAX_WIIMOTES);
for (int i = 0; i < MAX_WIIMOTES; i++)
for (i = 0; i < MAX_WIIMOTES; i++)
g_WiimoteInUse[i] = false;
g_RealWiiMotePresent = false;
g_RealWiiMoteAllocated = false;
// Only call wiiuse_find with the number of slots configured for real wiimotes
for (i = 0; i < MAX_WIIMOTES; i++)
{
// Found a WiiMote (slot) that wants to be real :P
if (WiiMoteEmu::WiiMapping[i].Source == 2) {
wiimote_slots++;
}
}
// Don't bother initializing wiiuse if we don't want any real wiimotes
if (wiimote_slots < 1)
return 0;
// Call Wiiuse.dll
g_WiiMotesFromWiiUse = wiiuse_init(MAX_WIIMOTES);
g_NumberOfWiiMotes = wiiuse_find(g_WiiMotesFromWiiUse, MAX_WIIMOTES, 5);
g_NumberOfWiiMotes = wiiuse_find(g_WiiMotesFromWiiUse, wiimote_slots, 5);
DEBUG_LOG(WIIMOTE, "Found No of Wiimotes: %i", g_NumberOfWiiMotes);
if (g_NumberOfWiiMotes > 0)
{
@ -374,7 +389,7 @@ int Initialize()
else
return 0;
for (int i = 0; i < g_NumberOfWiiMotes; i++)
for (i = 0; i < g_NumberOfWiiMotes; i++)
{
// Remove the wiiuse_poll() threshold
wiiuse_set_accel_threshold(g_WiiMotesFromWiiUse[i], 0);
@ -408,7 +423,7 @@ int Initialize()
we update its eeprom? In any case it's probably better to let the
current calibration be where it is and adjust the global values after
that to avoid overwriting critical data on any Wiimote. */
for (int i = 0; i < g_NumberOfWiiMotes; i++)
for (i = 0; i < g_NumberOfWiiMotes; i++)
{
byte *data = (byte*)malloc(sizeof(byte) * sizeof(WiiMoteEmu::EepromData_0));
wiiuse_read_data(g_WiiMotesFromWiiUse[i], data, 0, sizeof(WiiMoteEmu::EepromData_0));