added beats

Beat.h

@@ -2,9 +2,9 @@
 
 class Beat
 {
+public:
     void trigger() 
     {
-        std::cout << "\atick" << std::endl;
     }
 };
 

CMakeLists.txt

@@ -1,5 +1,6 @@
 cmake_minimum_required (VERSION 2.8.0)
 project (launchpad-sequencer)
+
 include_directories("${CMAKE_SOURCE_DIR}")
 add_definitions(-pthread)
 add_definitions(-std=c++11)

Loop.h

@@ -21,9 +21,10 @@ public:
     std::vector<Bar> bars;
 
     Loop()
-        : bpm(60), stopNext(false), enabled(false), 
-          currentBarIndex(0), currentBeatIndex(0), lastBeatTime(0),
-          loopThread(&Loop::loop, this)
+        : loopThread(&Loop::loop, this),
+          bpm(60), stopNext(false), enabled(false), 
+          currentBarIndex(0), currentBeatIndex(0), 
+          lastBeatTime(0), bars(1)
     {
     }
 
@@ -76,15 +77,23 @@ private:
 
     void beat() 
     {
-        std::cout << "\a" << lastBeatTime.count() << std::endl;
+        // std::cout << "\a" << lastBeatTime.count() << std::endl;
         if(bars.size() > 0) {
             if(currentBarIndex >= bars.size()) {
                 currentBarIndex = 0;
             }
-        
-            std::cout << "trigger bar#" << currentBarIndex << std::endl;
+            if(currentBeatIndex >= bars[currentBarIndex].beatsCount) {
+                currentBeatIndex = 0;
+                currentBarIndex++;
+                if(currentBarIndex >= bars.size()) {
+                    currentBarIndex = 0;
+                }
+            }
+
+            std::cout << "trigger bar#" << currentBarIndex << " beat#" << currentBeatIndex << std::endl;
+            bars[currentBarIndex].beats[currentBeatIndex].trigger();
 
-            currentBarIndex++;
+            currentBeatIndex++;
         }
 
         lastBeatTime = getMillisecondsSinceEpoch();