1 files changed, 18 insertions, 4 deletions

@@ -5,17 +5,23 @@ class Schedule {
 public:
 
   explicit Schedule(
-    size_t bpm) :
+    double bpm) :
       bpm_(bpm),
-      tick_(60.0 / static_cast<double>(bpm_))
+      bps_(bpm_ / 60.0),
+      tick_(1.0 / bps_)
   {
   }
 
-  size_t getBPM() const
+  double getBPM() const
   {
     return bpm_;
   }
 
+  double getBPS() const
+  {
+    return bps_;
+  }
+
   void accumulate(double dt)
   {
     accum_ += dt;
@@ -26,6 +32,7 @@ public:
     if (accum_ > tick_)
     {
       accum_ -= tick_;
+      beats_++;
 
       return true;
     } else {
@@ -33,11 +40,18 @@ public:
     }
   }
 
+  size_t getBeat() const
+  {
+    return beats_;
+  }
+
 private:
 
-  size_t bpm_;
+  double bpm_;
+  double bps_;
   double tick_;
   double accum_ = 0.0;
+  size_t beats_ = 0;
 
 };