From f8cebe3176e45e7aa5f7f6752d18dbf439344386 Mon Sep 17 00:00:00 2001
From: Paul Brossier <piem@piem.org>
Date: Tue, 19 Jan 2016 22:38:09 +0100
Subject: [PATCH] example_aubioDemo/: use new AttackClass

---
 example_aubioDemo/src/ofApp.cpp | 30 ++++++++++++++----------------
 example_aubioDemo/src/ofApp.h   |  5 +++--
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/example_aubioDemo/src/ofApp.cpp b/example_aubioDemo/src/ofApp.cpp
index d93dd16..bd61a67 100644
--- a/example_aubioDemo/src/ofApp.cpp
+++ b/example_aubioDemo/src/ofApp.cpp
@@ -32,20 +32,15 @@ void ofApp::setup(){
     // setup mel bands object
     bands.setup();
 
-    // setup onsetClass object
-    onsetClass.setup();
-    onsetClass.setBands(bands);
+    // setup attackClass object
+    attackClass.setup();
+    attackClass.setBands(bands);
 
-    onsetClass.setOnset(onset);
-    ofAddListener(onsetClass.gotOnsetClass, this, &ofApp::onsetClassEvent);
+    attackClass.setOnset(onset);
+    ofAddListener(attackClass.gotOnsetClass, this, &ofApp::onsetClassEvent);
 
-    onsetClass.setBeat(beat);
-    ofAddListener(onsetClass.gotBeatClass, this, &ofApp::beatClassEvent);
-
-    beatClass.setup();
-    beatClass.setBeat(beat);
-    beatClass.setBands(bands);
-    ofAddListener(beatClass.gotBeatClass, this, &ofApp::beatClassEvent);
+    attackClass.setBeat(beat);
+    ofAddListener(attackClass.gotBeatClass, this, &ofApp::beatClassEvent);
 
     ofSoundStreamSetup(nOutputs, nInputs, this);
     //ofSoundStreamSetup(nOutputs, nInputs, sampleRate, bufferSize, nBuffers);
@@ -92,7 +87,7 @@ void ofApp::audioIn(float * input, int bufferSize, int nChannels){
     bands.audioIn(input, bufferSize, nChannels);
 
     // compute onset class
-    onsetClass.audioIn(); //, onset, bands);
+    attackClass.audioIn(); //, onset, bands);
 }
 
 void audioOut(){
@@ -147,10 +142,11 @@ void ofApp::draw(){
     bandPlot.draw();
 
     // onset class
-    ofRect(250 + 190 + onsetClass.currentClass * 7, 150, 50, 50);
+    ofRect(250 + 190 + currentOnsetClass * 7, 150, 20, 20);
 
     // beat class
-    ofRect(190 + beatClass.currentClass * 7, 150, 50, 50);
+    ofRect(190 + currentBeatClass * 7, 150, 20, 20);
+
 }
 
 //--------------------------------------------------------------
@@ -219,9 +215,11 @@ void ofApp::tatumEvent(int & t) {
 //---
 void ofApp::onsetClassEvent(int & t) {
     //ofLog() << "got onset class event at " << t << " ";
+    currentOnsetClass = t;
 }
 
 //---
 void ofApp::beatClassEvent(int & t) {
-    ofLog() << "got beat class event of class " << t << " ";
+    ofLog() << "got beat class event of class " << t;
+    currentBeatClass = t;
 }
diff --git a/example_aubioDemo/src/ofApp.h b/example_aubioDemo/src/ofApp.h
index 530d2a2..418a603 100644
--- a/example_aubioDemo/src/ofApp.h
+++ b/example_aubioDemo/src/ofApp.h
@@ -37,8 +37,9 @@ class ofApp : public ofBaseApp{
         ofxAubioPitch pitch;
         ofxAubioBeat beat;
         ofxAubioMelBands bands;
-        ofxAubioAttackClass onsetClass;
-        ofxAubioAttackClass beatClass;
+        ofxAubioAttackClass attackClass;
+        int currentOnsetClass;
+        int currentBeatClass;
 
         ofxPanel pitchGui;
         ofxFloatSlider midiPitch;
-- 
2.11.0