Stable version with pause and icons.

georgeke · May 13, 2014 · 58a2b16 · 58a2b16
1 parent 886718b
commit 58a2b16
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 15 deletions.
diff --git a/Macro Recorder/src/player/KeyListener.java b/Macro Recorder/src/player/KeyListener.java
@@ -1,9 +1,5 @@
 package player;
 
-import javax.swing.ImageIcon;
-
-import gui.UI;
-
 import org.jnativehook.keyboard.NativeKeyEvent;
 import org.jnativehook.keyboard.NativeKeyListener;
 

diff --git a/Macro Recorder/src/player/MainPlayer.java b/Macro Recorder/src/player/MainPlayer.java
@@ -17,7 +17,6 @@
 public class MainPlayer {	
 	public static boolean exit = false;
 	public static boolean pause = false;
-	public static double speedMultiplier = 1;
 	public static String filepath = null;
 
 	public static void play() {		
@@ -68,7 +67,7 @@ public static void play() {
 					player.keyRelease(keycode);
 				} else if (split[0].equals("Wait")) {
 					time = Integer.parseInt(split[1]);
-					player.delay((int)(time/speedMultiplier));
+					player.delay(time);
 				} else if (split[0].equals("Exit")) {
 					exit = true;
 				}

diff --git a/Macro Recorder/src/program/MainProgram.java b/Macro Recorder/src/program/MainProgram.java
@@ -6,4 +6,4 @@ public class MainProgram {
 	public static void main(String[] args) {
 		UI.run();
 	}
-}
+}
diff --git a/Macro Recorder/src/recorder/KeyRecorder.java b/Macro Recorder/src/recorder/KeyRecorder.java
@@ -33,12 +33,11 @@ public void nativeKeyPressed(NativeKeyEvent e) {
             String key = NativeKeyEvent.getKeyText(keycode);
             boolean leave = false;
 
-            if (key == "Shift") {
+            if (key.equals("Shift")) {
             	keycode = 16;
-            } else if (key == "Alt") {
+            } else if (key.equals("Alt")) {
             	keycode = 18;
-            } else if (key == "Escape") {
-            	GlobalScreen.unregisterNativeHook();
+            } else if (key.equals("Escape")) {
             	skip = true;
             }
 
@@ -81,12 +80,11 @@ public void nativeKeyReleased(NativeKeyEvent e) {
             String key = NativeKeyEvent.getKeyText(keycode);
             boolean leave = false;
 
-            if (key == "Shift") {
+            if (key.equals("Shift")) {
             	keycode = 16;
-            } else if (key == "Alt") {
+            } else if (key.equals("Alt")) {
             	keycode = 18;
-            } else if (key == "Escape") {
-            	GlobalScreen.unregisterNativeHook();
+            } else if (key.equals("Escape")) {
             	out.write("Exit");
             	out.newLine();
             	exit = true;
@@ -104,6 +102,8 @@ public void nativeKeyReleased(NativeKeyEvent e) {
 	            out.newLine();
 	            out.write("Wait " + timeMs);
 	            out.newLine();
+        	} else {
+        		GlobalScreen.unregisterNativeHook();
         	}
 
             out.close();