From aaac70a5d1e9bec92a8f474a1ddfa068be9dcb6b Mon Sep 17 00:00:00 2001
From: Paul Brossier <piem@piem.org>
Date: Fri, 30 Oct 2015 16:56:56 +0100
Subject: [PATCH] example_aubioDemo/: add ofxAubioMelBands example

---
 example_aubioDemo/src/ofApp.cpp | 18 ++++++++++++++++++
 example_aubioDemo/src/ofApp.h   |  4 ++++
 2 files changed, 22 insertions(+)

diff --git a/example_aubioDemo/src/ofApp.cpp b/example_aubioDemo/src/ofApp.cpp
index ad44e12..0fa096f 100644
--- a/example_aubioDemo/src/ofApp.cpp
+++ b/example_aubioDemo/src/ofApp.cpp
@@ -23,6 +23,9 @@ void ofApp::setup(){
     beat.setup();
     //beat.setup("default", 2 * bufferSize, bufferSize, samplerate);
 
+    // setup mel bands object
+    bands.setup();
+
     ofSoundStreamSetup(nOutputs, nInputs, this);
     //ofSoundStreamSetup(nOutputs, nInputs, sampleRate, bufferSize, nBuffers);
     //ofSoundStreamListDevices();
@@ -46,6 +49,10 @@ void ofApp::setup(){
     pitchGui.add(midiPitch.setup( "midi pitch", 0, 0, 128));
     pitchGui.add(pitchConfidence.setup( "confidence", 0, 0, 1));
 
+    bandsGui.setup("ofxAubioMelBands", "settings.xml", start + 10, 115);
+    for (int i = 0; i < 40; i++) {
+        bandPlot.addVertex( 50 + i * 650 / 40., 240 - 100 * bands.energies[i]);
+    }
 }
 
 void ofApp::exit(){
@@ -60,6 +67,8 @@ void ofApp::audioIn(float * input, int bufferSize, int nChannels){
     pitch.audioIn(input, bufferSize, nChannels);
     // compute beat location
     beat.audioIn(input, bufferSize, nChannels);
+    // compute bands
+    bands.audioIn(input, bufferSize, nChannels);
 }
 
 void audioOut(){
@@ -98,6 +107,15 @@ void ofApp::draw(){
     pitchGui.draw();
     beatGui.draw();
     onsetGui.draw();
+
+    ofSetColor(ofColor::orange);
+    ofSetLineWidth(3.);
+    bandsGui.draw();
+    //bandPlot.clear();
+    for (int i = 0; i < bandPlot.size(); i++) {
+        bandPlot[i].y = 240 - 100 * bands.energies[i];
+    }
+    bandPlot.draw();
 }
 
 //--------------------------------------------------------------
diff --git a/example_aubioDemo/src/ofApp.h b/example_aubioDemo/src/ofApp.h
index 6c5fd37..5376022 100644
--- a/example_aubioDemo/src/ofApp.h
+++ b/example_aubioDemo/src/ofApp.h
@@ -30,6 +30,7 @@ class ofApp : public ofBaseApp{
         ofxAubioOnset onset;
         ofxAubioPitch pitch;
         ofxAubioBeat beat;
+        ofxAubioMelBands bands;
 
         ofxPanel pitchGui;
         ofxFloatSlider midiPitch;
@@ -43,4 +44,7 @@ class ofApp : public ofBaseApp{
         ofxFloatSlider onsetThreshold;
         ofxFloatSlider onsetNovelty;
         ofxFloatSlider onsetThresholdedNovelty;
+
+        ofxPanel bandsGui;
+        ofPolyline bandPlot;
 };
-- 
2.11.0