From: Paul Brossier <piem@piem.org>
Date: Tue, 19 Jan 2016 16:32:29 +0000 (+0100)
Subject: example_aubioDemo/: add tatum event
X-Git-Url: https://git.aubio.org/?a=commitdiff_plain;h=0e7bf64812ed68964a35a195c6ae3790d6ce4f50;p=ofxAubio.git

example_aubioDemo/: add tatum event
---

diff --git a/example_aubioDemo/src/ofApp.cpp b/example_aubioDemo/src/ofApp.cpp
index fc83303..6180041 100644
--- a/example_aubioDemo/src/ofApp.cpp
+++ b/example_aubioDemo/src/ofApp.cpp
@@ -27,6 +27,7 @@ void ofApp::setup(){
     //beat.setup("default", 2 * bufferSize, bufferSize, samplerate);
     // listen to beat event
     ofAddListener(beat.gotBeat, this, &ofApp::beatEvent);
+    ofAddListener(beat.gotTatum, this, &ofApp::tatumEvent);
 
     // setup mel bands object
     bands.setup();
@@ -38,7 +39,7 @@ void ofApp::setup(){
     // setup the gui objects
     int start = 0;
     beatGui.setup("ofxAubioBeat", "settings.xml", start + 10, 10);
-    beatGui.add(bpm_tatumSignature.setup( "tatum signature", 1, 1, 64));
+    beatGui.add(bpm_tatumSignature.setup( "tatum signature", 4, 1, 64));
     beatGui.add(bpm.setup( "bpm", 0, 0, 250));
 
     start += 250;
@@ -93,10 +94,10 @@ void ofApp::draw(){
         ofRect(90,150,50,50);
         gotBeat = false;
     }
-    if (beat.toSendTatum) {
+    if (gotTatum) {
         ofSetColor(ofColor::limeGreen);
         ofRect(140,150,25,25);
-        beat.toSendTatum = false;
+        gotTatum = false;
     }
 
     // update onset info
@@ -175,7 +176,7 @@ void ofApp::dragEvent(ofDragInfo dragInfo){
 
 //----
 void ofApp::onsetEvent(float & time) {
-    ofLog() << "got onset at " << time << " s";
+    //ofLog() << "got onset at " << time << " s";
     gotOnset = true;
 }
 
@@ -184,3 +185,9 @@ void ofApp::beatEvent(float & time) {
     ofLog() << "got beat at " << time << " s";
     gotBeat = true;
 }
+
+//----
+void ofApp::tatumEvent(int & t) {
+    //ofLog() << "got tatum at " << time << " samples";
+    gotTatum = true;
+}
diff --git a/example_aubioDemo/src/ofApp.h b/example_aubioDemo/src/ofApp.h
index a6b18ca..8714b12 100644
--- a/example_aubioDemo/src/ofApp.h
+++ b/example_aubioDemo/src/ofApp.h
@@ -28,6 +28,7 @@ class ofApp : public ofBaseApp{
 
         void onsetEvent(float & time);
         void beatEvent(float & time);
+        void tatumEvent(int & t);
 
     private:
         ofxAubioOnset onset;
@@ -41,6 +42,7 @@ class ofApp : public ofBaseApp{
 
         ofxPanel beatGui;
         bool gotBeat;
+        bool gotTatum;
         ofxIntSlider bpm_tatumSignature;
         ofxFloatSlider bpm;