summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--03_play/bin/TRSS_nesbitt_recordings.xml66
-rw-r--r--03_play/bin/data/02.wavbin0 -> 11001588 bytes
-rw-r--r--03_play/bin/data/soundeditnotes.odsbin0 -> 8608 bytes
-rw-r--r--03_play/bin/data/tone0.wavbin0 -> 10628 bytes
-rw-r--r--03_play/bin/data/tone1.wavbin0 -> 10628 bytes
-rw-r--r--03_play/src/main.cpp2
-rw-r--r--03_play/src/testApp.cpp55
-rw-r--r--03_play/src/testApp.h4
-rw-r--r--vamphost/src/testApp.cpp7
-rw-r--r--vamphost/src/testApp.h1
10 files changed, 49 insertions, 86 deletions
diff --git a/03_play/bin/TRSS_nesbitt_recordings.xml b/03_play/bin/TRSS_nesbitt_recordings.xml
deleted file mode 100644
index 7154306..0000000
--- a/03_play/bin/TRSS_nesbitt_recordings.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<TRSS description="James Nesbitt">
- <rec left="recs/kinectRecord_0_152013105138.oni" right="recs/kinectRecord_1_152013105138.oni"/>
- <rec left="recs/kinectRecord_0_152013105352.oni" right="recs/kinectRecord_1_152013105352.oni"/>
- <rec left="recs/kinectRecord_0_15201312253.oni" right="recs/kinectRecord_1_15201312253.oni"/>
- <rec left="recs/kinectRecord_0_152013131850.oni" right="recs/kinectRecord_1_152013131850.oni"/>
- <rec left="recs/kinectRecord_0_15201313189.oni" right="recs/kinectRecord_1_15201313189.oni"/>
- <rec left="recs/kinectRecord_0_15201313204.oni" right="recs/kinectRecord_1_15201313204.oni"/>
- <rec left="recs/kinectRecord_0_152013132358.oni" right="recs/kinectRecord_1_152013132358.oni"/>
- <rec left="recs/kinectRecord_0_152013132416.oni" right="recs/kinectRecord_1_152013132416.oni"/>
- <rec left="recs/kinectRecord_0_152013132426.oni" right="recs/kinectRecord_1_152013132426.oni"/>
- <rec left="recs/kinectRecord_0_152013132439.oni" right="recs/kinectRecord_1_152013132439.oni"/>
- <rec left="recs/kinectRecord_0_152013132447.oni" right="recs/kinectRecord_1_152013132447.oni"/>
- <rec left="recs/kinectRecord_0_152013132455.oni" right="recs/kinectRecord_1_152013132455.oni"/>
- <rec left="recs/kinectRecord_0_15201313246.oni" right="recs/kinectRecord_1_15201313246.oni"/>
- <rec left="recs/kinectRecord_0_152013132517.oni" right="recs/kinectRecord_1_152013132517.oni"/>
- <rec left="recs/kinectRecord_0_152013132524.oni" right="recs/kinectRecord_1_152013132524.oni"/>
- <rec left="recs/kinectRecord_0_15201313252.oni" right="recs/kinectRecord_1_15201313252.oni"/>
- <rec left="recs/kinectRecord_0_152013132532.oni" right="recs/kinectRecord_1_152013132532.oni"/>
- <rec left="recs/kinectRecord_0_152013132542.oni" right="recs/kinectRecord_1_152013132542.oni"/>
- <rec left="recs/kinectRecord_0_152013132550.oni" right="recs/kinectRecord_1_152013132550.oni"/>
- <rec left="recs/kinectRecord_0_15201313259.oni" right="recs/kinectRecord_1_15201313259.oni"/>
- <rec left="recs/kinectRecord_0_152013132915.oni" right="recs/kinectRecord_1_152013132915.oni"/>
- <rec left="recs/kinectRecord_0_152013132923.oni" right="recs/kinectRecord_1_152013132923.oni"/>
- <rec left="recs/kinectRecord_0_152013132931.oni" right="recs/kinectRecord_1_152013132931.oni"/>
- <rec left="recs/kinectRecord_0_152013132940.oni" right="recs/kinectRecord_1_152013132940.oni"/>
- <rec left="recs/kinectRecord_0_152013132947.oni" right="recs/kinectRecord_1_152013132947.oni"/>
- <rec left="recs/kinectRecord_0_152013132954.oni" right="recs/kinectRecord_1_152013132954.oni"/>
- <rec left="recs/kinectRecord_0_15201313295.oni" right="recs/kinectRecord_1_15201313295.oni"/>
- <rec left="recs/kinectRecord_0_15201313300.oni" right="recs/kinectRecord_1_15201313300.oni"/>
- <rec left="recs/kinectRecord_0_152013133011.oni" right="recs/kinectRecord_1_152013133011.oni"/>
- <rec left="recs/kinectRecord_0_152013133020.oni" right="recs/kinectRecord_1_152013133020.oni"/>
- <rec left="recs/kinectRecord_0_152013133029.oni" right="recs/kinectRecord_1_152013133029.oni"/>
- <rec left="recs/kinectRecord_0_152013133037.oni" right="recs/kinectRecord_1_152013133037.oni"/>
- <rec left="recs/kinectRecord_0_15201313304.oni" right="recs/kinectRecord_1_15201313304.oni"/>
- <rec left="recs/kinectRecord_0_152013133128.oni" right="recs/kinectRecord_1_152013133128.oni"/>
- <rec left="recs/kinectRecord_0_152013133137.oni" right="recs/kinectRecord_1_152013133137.oni"/>
- <rec left="recs/kinectRecord_0_15201313326.oni" right="recs/kinectRecord_1_15201313326.oni"/>
- <rec left="recs/kinectRecord_0_152013133530.oni" right="recs/kinectRecord_1_152013133530.oni"/>
- <rec left="recs/kinectRecord_0_152013133539.oni" right="recs/kinectRecord_1_152013133539.oni"/>
- <rec left="recs/kinectRecord_0_152013133548.oni" right="recs/kinectRecord_1_152013133548.oni"/>
- <rec left="recs/kinectRecord_0_152013133557.oni" right="recs/kinectRecord_1_152013133557.oni"/>
- <rec left="recs/kinectRecord_0_152013133618.oni" right="recs/kinectRecord_1_152013133618.oni"/>
- <rec left="recs/kinectRecord_0_152013133627.oni" right="recs/kinectRecord_1_152013133627.oni"/>
- <rec left="recs/kinectRecord_0_152013133634.oni" right="recs/kinectRecord_1_152013133634.oni"/>
- <rec left="recs/kinectRecord_0_152013133641.oni" right="recs/kinectRecord_1_152013133641.oni"/>
- <rec left="recs/kinectRecord_0_152013133648.oni" right="recs/kinectRecord_1_152013133648.oni"/>
- <rec left="recs/kinectRecord_0_15201313364.oni" right="recs/kinectRecord_1_15201313364.oni"/>
- <rec left="recs/kinectRecord_0_152013133656.oni" right="recs/kinectRecord_1_152013133656.oni"/>
- <rec left="recs/kinectRecord_0_152013133714.oni" right="recs/kinectRecord_1_152013133714.oni"/>
- <rec left="recs/kinectRecord_0_152013133744.oni" right="recs/kinectRecord_1_152013133744.oni"/>
- <rec left="recs/kinectRecord_0_15201313377.oni" right="recs/kinectRecord_1_15201313377.oni"/>
- <rec left="recs/kinectRecord_0_152013133848.oni" right="recs/kinectRecord_1_152013133848.oni"/>
- <rec left="recs/kinectRecord_0_152013134138.oni" right="recs/kinectRecord_1_152013134138.oni"/>
- <rec left="recs/kinectRecord_0_3042013212620.oni" right="recs/kinectRecord_1_3042013212620.oni"/>
- <rec left="recs/kinectRecord_0_3042013213029.oni" right="recs/kinectRecord_1_3042013213029.oni"/>
- <rec left="recs/kinectRecord_0_304201321304.oni" right="recs/kinectRecord_1_304201321304.oni"/>
- <rec left="recs/kinectRecord_0_3042013213141.oni" right="recs/kinectRecord_1_3042013213141.oni"/>
- <rec left="recs/kinectRecord_0_304201321326.oni" right="recs/kinectRecord_1_304201321326.oni"/>
- <rec left="recs/kinectRecord_0_3042013213625.oni" right="recs/kinectRecord_1_3042013213625.oni"/>
- <rec left="recs/kinectRecord_0_3042013214949.oni" right="recs/kinectRecord_1_3042013214949.oni"/>
- <rec left="recs/kinectRecord_0_3042013215132.oni" right="recs/kinectRecord_1_3042013215132.oni"/>
- <rec left="recs/kinectRecord_0_3042013215311.oni" right="recs/kinectRecord_1_3042013215311.oni"/>
- <rec left="recs/kinectRecord_0_304201322041.oni" right="recs/kinectRecord_1_304201322041.oni"/>
- <rec left="recs/kinectRecord_0_3042013221151.oni" right="recs/kinectRecord_1_3042013221151.oni"/>
-</TRSS> \ No newline at end of file
diff --git a/03_play/bin/data/02.wav b/03_play/bin/data/02.wav
new file mode 100644
index 0000000..40b53cc
--- /dev/null
+++ b/03_play/bin/data/02.wav
Binary files differ
diff --git a/03_play/bin/data/soundeditnotes.ods b/03_play/bin/data/soundeditnotes.ods
new file mode 100644
index 0000000..1abf4cf
--- /dev/null
+++ b/03_play/bin/data/soundeditnotes.ods
Binary files differ
diff --git a/03_play/bin/data/tone0.wav b/03_play/bin/data/tone0.wav
new file mode 100644
index 0000000..efe86ea
--- /dev/null
+++ b/03_play/bin/data/tone0.wav
Binary files differ
diff --git a/03_play/bin/data/tone1.wav b/03_play/bin/data/tone1.wav
new file mode 100644
index 0000000..fe3a0ff
--- /dev/null
+++ b/03_play/bin/data/tone1.wav
Binary files differ
diff --git a/03_play/src/main.cpp b/03_play/src/main.cpp
index 87dc35f..f0d25bb 100644
--- a/03_play/src/main.cpp
+++ b/03_play/src/main.cpp
@@ -7,7 +7,7 @@
int main( ){
ofAppGlutWindow window;
- ofSetupOpenGL(&window, 1600,900, OF_FULLSCREEN); // <-------- setup the GL context
+ ofSetupOpenGL(&window, 1200,800, OF_WINDOW); // <-------- setup the GL context
// this kicks off the running of my app
// can be OF_WINDOW or OF_FULLSCREEN
diff --git a/03_play/src/testApp.cpp b/03_play/src/testApp.cpp
index 74f0799..3670a8b 100644
--- a/03_play/src/testApp.cpp
+++ b/03_play/src/testApp.cpp
@@ -10,7 +10,9 @@ void testApp::setup() {
playing=0;
numDevices=2;
- if( !XML.loadFile("TRSS_nesbitt_recordings.xml") ){
+ string filename="TRSS_nesbitt_recordings.xml";
+
+ if( !XML.loadFile(filename) ){
printf("unable to load recordings, check data/ folder\n");
}else{
if(XML.pushTag("TRSS")) {
@@ -26,12 +28,28 @@ void testApp::setup() {
else printf("no recordings!\n");
}
}
+ for (int deviceID = 0; deviceID < numDevices; deviceID++){
+ //openNIPlayers[deviceID].stop();
+ openNIPlayers[deviceID].setup(true);
+ openNIPlayers[deviceID].start();
+ //openNIPlayers[deviceID].startPlayer(ofToDataPath(recs[playing][deviceID]));
+ }
+ soundplayer.loadSound("02.wav");
+ startPlayers();
+ ofSetFrameRate(25.0f);
+}
+
+void testApp::startPlayers(){
for (int deviceID = 0; deviceID < numDevices; deviceID++){
- openNIPlayers[deviceID].setup(false);
- openNIPlayers[deviceID].start();
+ //openNIPlayers[deviceID].stop();
+ //openNIPlayers[deviceID].setup(false);
+ //openNIPlayers[deviceID].start();
openNIPlayers[deviceID].startPlayer(ofToDataPath(recs[playing][deviceID]));
+
+ soundplayer.setPosition(0.0f);
+ soundplayer.play();
}
}
@@ -50,17 +68,18 @@ void testApp::draw(){
ofPushMatrix();
for (int deviceID = 0; deviceID < numDevices; deviceID++){
- ofTranslate(0, deviceID * 450);
+ ofTranslate(0, deviceID * 400);
//openNIPlayers[deviceID].drawDebug();
- openNIPlayers[deviceID].drawDepth(200, 0,600,450);
- openNIPlayers[deviceID].drawImage(800, 0,600,450);
+ openNIPlayers[deviceID].drawDepth(50, 0,520,390);
+ openNIPlayers[deviceID].drawImage(600, 0,520,390);
}
ofPopMatrix();
ofSetColor(255, 255, 255);
- string msg = "MILLIS: " + ofToString(ofGetElapsedTimeMillis()) + "\nFPS: " + ofToString(ofGetFrameRate());
-
+ string msg = "MILLIS: " + ofToString(ofGetElapsedTimeMillis());
+ msg += "\nFPS: " + ofToString(ofGetFrameRate());
+ msg += "\nset: "+ofToString(playing);
verdana.drawString(msg, 10, 10);
}
@@ -73,21 +92,25 @@ void testApp::exit(){
//--------------------------------------------------------------
void testApp::keyPressed(int key){
+ bool changed=false;
switch (key) {
- case '.':
+ case ',':
if (playing==0) playing=recs.size();
playing--;
- for (int deviceID = 0; deviceID < numDevices; deviceID++){
- openNIPlayers[deviceID].startPlayer(ofToDataPath(recs[playing][deviceID]));
- }
+ changed=true;
break;
- case ',':
+ case '.':
playing=(playing+1)%recs.size();
- for (int deviceID = 0; deviceID < numDevices; deviceID++){
- openNIPlayers[deviceID].startPlayer(ofToDataPath(recs[playing][deviceID]));
- }
+ changed=true;
+ break;
+ case 'z':
+ soundplayer.setPosition(soundplayer.getPosition()-.04f);
+ break;
+ case 'x':
+ soundplayer.setPosition(soundplayer.getPosition()+.04f);
break;
}
+ if (changed) startPlayers();
/* why do this?
switch (key) {
diff --git a/03_play/src/testApp.h b/03_play/src/testApp.h
index db29f0c..a276a59 100644
--- a/03_play/src/testApp.h
+++ b/03_play/src/testApp.h
@@ -23,6 +23,8 @@ public:
void mouseReleased(int x, int y, int button);
void windowResized(int w, int h);
+ void startPlayers();
+
int numDevices;
ofxOpenNI openNIPlayers[MAX_DEVICES];
@@ -35,6 +37,8 @@ public:
ofxXmlSettings XML;
vector<pair<string,string> > filenames;
+
+ ofSoundPlayer soundplayer;
};
diff --git a/vamphost/src/testApp.cpp b/vamphost/src/testApp.cpp
index ebd6c1f..4ecc049 100644
--- a/vamphost/src/testApp.cpp
+++ b/vamphost/src/testApp.cpp
@@ -46,15 +46,13 @@ void testApp::setup() {
scaledVol = 0.0;
//if you want to set a different device id
- //soundStream.setDeviceID(0); //bear in mind the device id corresponds to all audio devices, including input-only and output-only devices.
+ soundStream.setDeviceID(4); //bear in mind the device id corresponds to all audio devices, including input-only and output-only devices.
soundStream.setup(this, 0, channels, rate, bufferSize, 4);
ofSetFrameRate(25);
-
-
}
@@ -163,6 +161,9 @@ ofSetColor(225);
string reportString = "buffers received: "+ofToString(bufferCounter)+"\ndraw routines called: "+ofToString(drawCounter)+"\nticks: " + ofToString(soundStream.getTickCount());
reportString +="\nfeatures found: "+ofToString(vamphost.numFeat)+" average signal: "+ofToString(vamphost.avg)+" samples: "+ofToString(vamphost.num);
reportString +="\n"+vamphost.key;
+ for (int i=0;i<vamphost.feat.size();i++) {
+ reportString +="\nfeature channels: "+ofToString(vamphost.feat[i].size());
+ }
ofDrawBitmapString(reportString, 32, 589);
}
diff --git a/vamphost/src/testApp.h b/vamphost/src/testApp.h
index 112f697..8c94b31 100644
--- a/vamphost/src/testApp.h
+++ b/vamphost/src/testApp.h
@@ -37,6 +37,7 @@ public:
Vamphost vamphost;
int whichplugin;
+
};