rik/jlibwiiuse
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

small modifs for 0.12. Improve closing wiiusej.

Browse Source 
git-svn-id: http://wiiusej.googlecode.com/svn/trunk@157 ae48ae66-6a45-0410-b38e-211266189506
This commit is contained in:
guilhem.duche
2008-06-01 09:09:26 +00:00
parent 70cd478118
commit 2fb184eda3
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
WiiUseJ/src/wiiusej/WiiUseApiManager.java
View File

@@ -112,9 +112,13 @@ public class WiiUseApiManager extends Thread {
* @return an array with connected wiimotes or NULL. * @return an array with connected wiimotes or NULL.
*/ */
private synchronized static Wiimote[] getWiimotesPrivate(int nb, private synchronized static Wiimote[] getWiimotesPrivate(int nb,
boolean rumble, boolean forceStackType, int stackType) { boolean rumble, boolean forceStackType, int stackType) {
WiiUseApiManager manager = getInstance(); WiiUseApiManager manager = getInstance();
if (manager.leave) return null;//wiiusej definitively stopped
if (manager.connected <= 0 && !manager.running.get()) { if (manager.connected <= 0 && !manager.running.get()) {
//connect wiimotes.
int nbWiimotes = manager.connectWiimotes(nb, rumble, int nbWiimotes = manager.connectWiimotes(nb, rumble,
forceStackType, stackType); forceStackType, stackType);
manager.wiimotes = new Wiimote[nbWiimotes]; manager.wiimotes = new Wiimote[nbWiimotes];
@@ -152,15 +156,16 @@ public class WiiUseApiManager extends Thread {
} }
} }
} }
if (manager.connected == 0) { if (manager.connected == 0) {//no wiimote connected
//return empty array
return new Wiimote[0]; return new Wiimote[0];
} }
if (!manager.isAlive()) if (!manager.isAlive())//start wiiuseJ polling
manager.start(); manager.start();
manager.semaphore.release(); manager.semaphore.release(1);
return manager.wiimotes; return manager.wiimotes;
} }

4
WiiUseJ/src/wiiusej/test/WiiuseJGuiTest.java
View File

@@ -1189,7 +1189,7 @@ public class WiiuseJGuiTest extends javax.swing.JFrame implements
java.awt.event.MouseEvent evt) {// GEN-FIRST:event_reconnectWiimotesButtonMousePressed java.awt.event.MouseEvent evt) {// GEN-FIRST:event_reconnectWiimotesButtonMousePressed
// stop manager // stop manager
WiiUseApiManager manager = WiiUseApiManager.getInstance(); WiiUseApiManager manager = WiiUseApiManager.getInstance();
manager.definitiveShutdown(); manager.shutdown();
// unregister previous wiimote // unregister previous wiimote
if (wiimote != null) { if (wiimote != null) {
@@ -1228,7 +1228,7 @@ public class WiiuseJGuiTest extends javax.swing.JFrame implements
// get wiimote // get wiimote
Wiimote[] listWiimote = WiiUseApiManager.getWiimotes(1, true); Wiimote[] listWiimote = WiiUseApiManager.getWiimotes(1, true);
if (listWiimote.length > 0) { if (listWiimote!=null && listWiimote.length > 0) {
wiimote = listWiimote[0]; wiimote = listWiimote[0];
// registers listeners // registers listeners