Verschillende fouten met opstartende en afsluitende applicaties opgelost.

java/src/mimis/application/cmd/windows/WindowsApplication.java

@@ -38,10 +38,6 @@ public abstract class WindowsApplication extends CMDApplication {
         }
     }
 
-    public boolean active() {
-        return (handle = Windows.findWindow(name, null)) > 0;
-    }
-
     public void deactivate() throws DeactivateException {
         try {
             VBScript.terminate(program);

java/src/mimis/application/cmd/windows/wmp/WMPApplication.java

@@ -12,7 +12,7 @@ public class WMPApplication extends WindowsApplication {
     protected final static String NAME = "WMPlayerApp";
 
     protected static final int VOLUME_SLEEP = 120;
-    
+
     protected VolumeWorker volumeWorker;
     
     public WMPApplication() {

java/src/mimis/application/vlc/VLCApplication.java

@@ -12,6 +12,7 @@ import mimis.application.cmd.CMDApplication;
 import mimis.exception.worker.ActivateException;
 import mimis.exception.worker.DeactivateException;
 import mimis.util.Native;
+import mimis.util.VBScript;
 import mimis.value.Action;
 import mimis.value.Amount;
 
@@ -65,6 +66,11 @@ public class VLCApplication extends CMDApplication {
         super.stop();
         volumeWorker.stop();
         seekWorker.stop();
+        try {
+            VBScript.terminate(program);
+        } catch (IOException e) {
+            log.error(e);
+        }
     }
     
     public void begin(Action action) {

java/src/mimis/device/wiimote/WiimoteDevice.java

@@ -44,7 +44,7 @@ public class WiimoteDevice extends Device implements GestureListener {
     public WiimoteDevice() {
         super(TITLE);
         eventMapCycle = new WiimoteEventMapCycle();
-        wiimoteDiscovery = new WiimoteDiscovery(this);
+        //wiimoteDiscovery = new WiimoteDiscovery(this);
         gestureDevice = new GestureDevice();
         gestureDevice.add(this);
         gestureId = 0;
@@ -53,20 +53,27 @@ public class WiimoteDevice extends Device implements GestureListener {
 
     /* Worker */
     public void activate() throws ActivateException {
-        connect();
+        //connect();
+        try {
+            wiimote = wiimoteService.getDevice(this);
+            ledWorker.activate();
+        } catch (DeviceNotFoundException e) {
+            log.error(e);
+            throw new ActivateException();
+        }
         add(eventMapCycle.player);
         super.activate();
     }
 
-    public boolean active() {
+    /*public boolean active() {
         if (wiimote != null) {
-            if (!ledWorker.active()) {
+            /*if (!ledWorker.active()) {
                 try {
                     ledWorker.activate();
                 } catch (ActivateException e) {
                     log.error(e);
                 }
-            }
+            }*
             connected = false;
             wiimote.getStatus();
             synchronized (this) {
@@ -86,16 +93,16 @@ public class WiimoteDevice extends Device implements GestureListener {
             }
         }
         return active;
-    }
+    }*/
 
     public void stop() {
         super.stop();
         ledWorker.stop();
-        if (wiimote != null) {
+        /*if (wiimote != null) {
             disconnect();
         }
-        wiimoteService.exit();
-        wiimoteDiscovery.stop();
+        wiimoteService.exit();*/
+        //wiimoteDiscovery.stop();
     }
 
     /* Events */
@@ -163,7 +170,7 @@ public class WiimoteDevice extends Device implements GestureListener {
         }
     }
 
-    public void connected() {
+    /*public void connected() {
         try {
             wiimote = wiimoteService.getDevice(this);
             try {
@@ -174,20 +181,20 @@ public class WiimoteDevice extends Device implements GestureListener {
         } catch (DeviceNotFoundException e) {
             log.error(e);
         }
-    }
+    }*/
 
-    public void disconnect() {
+    /*public void disconnect() {
         wiimote.disconnect();
         wiimote = null;
-    }
+    }*/
 
-    public void disconnected() {
+    /*public void disconnected() {
         try {
             wiimoteDiscovery.activate();
         } catch (ActivateException e) {
             log.error(e);
         }
-    }
+    }*/
 
     /* Listeners */
     public void onButtonsEvent(WiimoteButtonsEvent event) {
@@ -240,12 +247,14 @@ public class WiimoteDevice extends Device implements GestureListener {
         }
 
         protected void setLeds(int leds) {
-            wiimote.setLeds(
-                (leds & 1) > 0,
-                (leds & 2) > 0,
-                (leds & 4) > 0,
-                (leds & 8) > 0);
-                sleep(leds == 8 ? 200 : 100);
+            if (wiimote != null) {
+                wiimote.setLeds(
+                    (leds & 1) > 0,
+                    (leds & 2) > 0,
+                    (leds & 4) > 0,
+                    (leds & 8) > 0);
+                    sleep(leds == 8 ? 200 : 100);
+            }
         }
     }
 }

java/src/mimis/util/VBScript.java

@@ -10,7 +10,6 @@ public class VBScript {
     public static boolean isRunning(String program) throws IOException {
         boolean found = false;
         File file = File.createTempFile("vbsutils", ".vbs");
-        file.deleteOnExit();
         FileWriter fileWriter = new FileWriter(file);
         fileWriter.write(String.format(
               "Set WshShell = WScript.CreateObject(\"WScript.Shell\")\n"
@@ -29,6 +28,9 @@ public class VBScript {
         String line = input.readLine();
         found = line != null && line.equals(program);
         input.close();
+        try {
+            process.waitFor();
+        } catch (InterruptedException e) {}
         file.delete();
         return found;
     }