mild code cleanup

Author: mattneub

bk2ch22p784smackMe/ch35p1041smackMe/MyTimer.swift

@@ -2,29 +2,30 @@
 
 import UIKit
 
-class MyTimer: NSObject {
+class CancelableTimer: NSObject {
 
-    var q = dispatch_queue_create("timer",nil)
-    var timer : dispatch_source_t!
-    var firsttime = true
-    var once : Bool
-    var handler : () -> ()
+    private var q = dispatch_queue_create("timer",nil)
+    private var timer : dispatch_source_t!
+    private var firsttime = true
+    private var once : Bool
+    private var handler : () -> ()
 
     init(once:Bool, handler:()->()) {
         self.once = once
         self.handler = handler
         super.init()
     }
 
-    func start(interval:Double) {
+    func startWithInterval(interval:Double) {
         self.firsttime = true
         self.cancel()
         self.timer = dispatch_source_create(
             DISPATCH_SOURCE_TYPE_TIMER,
             0, 0, self.q)
         dispatch_source_set_timer(self.timer,
             dispatch_walltime(nil, 0),
-            UInt64(interval * Double(NSEC_PER_SEC)), UInt64(0.05 * Double(NSEC_PER_SEC)))
+            UInt64(interval * Double(NSEC_PER_SEC)),
+            UInt64(0.05 * Double(NSEC_PER_SEC)))
         dispatch_source_set_event_handler(self.timer, {
             if self.firsttime {
                 self.firsttime = false

bk2ch22p784smackMe/ch35p1041smackMe/ViewController.swift

@@ -6,7 +6,7 @@ class ViewController: UIViewController {
 
     let motman = CMMotionManager()
     var polltimer : NSTimer!
-    var canceltimer : MyTimer!
+    var canceltimer : CancelableTimer!
 
     var oldX = 0.0
     var oldY = 0.0
@@ -46,28 +46,24 @@ class ViewController: UIViewController {
                 self.oldTime = dat.timestamp
                 self.lastSlap = -1
                 self.canceltimer?.cancel()
-                self.canceltimer = MyTimer(once: true) {
-                    self.report("left")
+                self.canceltimer = CancelableTimer(once: true) {
+                    println("left")
                 }
-                self.canceltimer.start(0.5)
+                self.canceltimer.startWithInterval(0.5)
             }
         } else if x > thresh {
             if dat.timestamp - self.oldTime > 0.5 || self.lastSlap == -1 {
                 self.oldTime = dat.timestamp
                 self.lastSlap = 1
                 self.canceltimer?.cancel()
-                self.canceltimer = MyTimer(once: true) {
-                    self.report("right")
+                self.canceltimer = CancelableTimer(once: true) {
+                    println("right")
                 }
-                self.canceltimer.start(0.5)
+                self.canceltimer.startWithInterval(0.5)
             }
         }
     }
 
-    func report(s:String) {
-        println(s)
-    }
-
 
 
 }