# HG changeset patch
# User Robert McIntyre <rlm@mit.edu>
# Date 1394492288 14400
# Node ID 877ae4b2993c7de09e34bcaa453e2de61f8993e8
# Parent  dd97f65f940ca55f25ad234ef072081041f77048# Parent  a67aef438383af4ed00e2bbb021649057f2a53e9
merge laptop changes.

diff -r dd97f65f940c -r 877ae4b2993c src/com/aurellem/capture/IsoTimer.java
--- a/src/com/aurellem/capture/IsoTimer.java	Mon Mar 10 18:57:00 2014 -0400
+++ b/src/com/aurellem/capture/IsoTimer.java	Mon Mar 10 18:58:08 2014 -0400
@@ -45,19 +45,19 @@
 	}
 
 	public long getTime() {
-		return this.ticks;
+		return ticks;
 	}
 
 	public long getResolution() {
-		return (long) framerate;
+		return framerate;
 	}
 
 	public float getFrameRate() {
-		return this.framerate;
+		return framerate;
 	}
 
 	public float getTimePerFrame() {
-		return (float) (1.0f / this.framerate);
+		return (float) (1.0f / framerate);
 	}
 
 	public void update() {this.ticks++;}
diff -r dd97f65f940c -r 877ae4b2993c src/com/aurellem/capture/RatchetTimer.java
--- a/src/com/aurellem/capture/RatchetTimer.java	Mon Mar 10 18:57:00 2014 -0400
+++ b/src/com/aurellem/capture/RatchetTimer.java	Mon Mar 10 18:58:08 2014 -0400
@@ -11,12 +11,12 @@
  */
 
 public class RatchetTimer extends Timer{
-	private float framerate;
+    private long framerate;
     private int ticks;
     private long lastTime = 0;
 
     public RatchetTimer(float framerate) {
-        this.framerate = framerate;
+        this.framerate = (long) framerate;
         this.ticks = 0;
     }
     
@@ -24,19 +24,19 @@
      * return time in milliseconds
      */
     public long getTime() {
-        return (long) (this.ticks * (1.0f / this.framerate) * 1000f);
+	return ticks;
     }
 
     public long getResolution() {
-        return 1000000000L;
+	return framerate;
     }
 
     public float getFrameRate() {
-        return this.framerate;
+        return framerate;
     }
 
     public float getTimePerFrame() {
-        return (float) (1.0f / this.framerate);
+        return (float) (1.0f / framerate);
     }
 
     public void update() {