# HG changeset patch
# User Robert McIntyre <rlm@mit.edu>
# Date 1369862141 14400
# Node ID ddb300c5335f477f10eb9f579b26c100dab958b4
# Parent  302d5e9ad120ee4d9593487d3a1f05687dee4634
fixed RatchetTimer time reporting.

diff -r 302d5e9ad120 -r ddb300c5335f src/com/aurellem/capture/IsoTimer.java
--- a/src/com/aurellem/capture/IsoTimer.java	Thu Jul 19 12:28:55 2012 -0500
+++ b/src/com/aurellem/capture/IsoTimer.java	Wed May 29 17:15:41 2013 -0400
@@ -49,15 +49,15 @@
 	}
 
 	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 302d5e9ad120 -r ddb300c5335f src/com/aurellem/capture/RatchetTimer.java
--- a/src/com/aurellem/capture/RatchetTimer.java	Thu Jul 19 12:28:55 2012 -0500
+++ b/src/com/aurellem/capture/RatchetTimer.java	Wed May 29 17:15:41 2013 -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() {