summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--03_play/Makfile4
-rw-r--r--03_play/bin/data/TRSS_nesbitt_recordings.xml46
-rwxr-xr-x[-rw-r--r--]03_play/bin/data/tone0.wavbin10628 -> 10628 bytes
-rwxr-xr-x[-rw-r--r--]03_play/bin/data/tone1.wavbin10628 -> 10628 bytes
-rw-r--r--03_play/src/testApp.cpp19
-rw-r--r--03_play/src/testApp.h11
6 files changed, 47 insertions, 33 deletions
diff --git a/03_play/Makfile b/03_play/Makfile
index 10b7e43..0d8b4a1 100644
--- a/03_play/Makfile
+++ b/03_play/Makfile
@@ -92,6 +92,10 @@ ifeq ($(findstring Release,$(MAKECMDGOALS)),Release)
TARGET = bin/$(BIN_NAME)
endif
+ifeq ($(findstring Release,$(MAKECMDGOALS)),clang)
+ CXX = clang
+endif
+
ifeq ($(MAKECMDGOALS),)
TARGET_NAME = Release
BIN_NAME = $(APPNAME)
diff --git a/03_play/bin/data/TRSS_nesbitt_recordings.xml b/03_play/bin/data/TRSS_nesbitt_recordings.xml
index 251824c..ed139e7 100644
--- a/03_play/bin/data/TRSS_nesbitt_recordings.xml
+++ b/03_play/bin/data/TRSS_nesbitt_recordings.xml
@@ -1,29 +1,29 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<TRSS description="James Nesbitt">
<rec left="recs/kinectRecord_0_15201313189.oni" right="recs/kinectRecord_1_15201313189.oni" description="1809 box shot 1"/>
- <rec sound="00.wav" left="recs/kinectRecord_0_15201313204.oni" right="recs/kinectRecord_1_15201313204.oni" description="2040 or 2004 BIG"/>
- <rec sound="01.wav" left="recs/kinectRecord_0_152013132358.oni" right="recs/kinectRecord_1_152013132358.oni"/>
- <rec sound="02.wav" left="recs/kinectRecord_0_15201313246.oni" right="recs/kinectRecord_1_15201313246.oni" description="2406"/>
- <rec sound="03.wav" left="recs/kinectRecord_0_152013132416.oni" right="recs/kinectRecord_1_152013132416.oni"/>
- <rec sound="04.wav" left="recs/kinectRecord_0_152013132426.oni" right="recs/kinectRecord_1_152013132426.oni"/>
- <rec sound="05.wav" left="recs/kinectRecord_0_152013132439.oni" right="recs/kinectRecord_1_152013132439.oni"/>
- <rec sound="06.wav" left="recs/kinectRecord_0_152013132447.oni" right="recs/kinectRecord_1_152013132447.oni"/>
- <rec sound="07.wav" left="recs/kinectRecord_0_15201313252.oni" right="recs/kinectRecord_1_15201313252.oni" description="2502 or 2052"/>
- <rec sound="08.wav" left="recs/kinectRecord_0_152013132455.oni" right="recs/kinectRecord_1_152013132455.oni"/>
- <rec sound="09.wav" left="recs/kinectRecord_0_15201313259.oni" right="recs/kinectRecord_1_15201313259.oni" description="2509 or 2059"/>
- <rec sound="10.wav" left="recs/kinectRecord_0_152013132517.oni" right="recs/kinectRecord_1_152013132517.oni"/>
- <rec sound="11.wav" left="recs/kinectRecord_0_152013132524.oni" right="recs/kinectRecord_1_152013132524.oni"/>
- <rec sound="101.wav" left="recs/kinectRecord_0_152013132532.oni" right="recs/kinectRecord_1_152013132532.oni"/>
- <rec sound="102.wav" left="recs/kinectRecord_0_152013132542.oni" right="recs/kinectRecord_1_152013132542.oni"/>
- <rec sound="103.wav" left="recs/kinectRecord_0_152013132550.oni" right="recs/kinectRecord_1_152013132550.oni"/>
- <rec sound="104.wav" left="recs/kinectRecord_0_15201313295.oni" right="recs/kinectRecord_1_15201313295.oni" description="2905"/>
- <rec sound="105.wav" left="recs/kinectRecord_0_152013132915.oni" right="recs/kinectRecord_1_152013132915.oni"/>
- <rec sound="106.wav" left="recs/kinectRecord_0_152013132923.oni" right="recs/kinectRecord_1_152013132923.oni"/>
- <rec sound="107.wav" left="recs/kinectRecord_0_152013132931.oni" right="recs/kinectRecord_1_152013132931.oni"/>
- <rec sound="108.wav" left="recs/kinectRecord_0_152013132940.oni" right="recs/kinectRecord_1_152013132940.oni"/>
- <rec sound="109.wav" left="recs/kinectRecord_0_152013132947.oni" right="recs/kinectRecord_1_152013132947.oni"/>
- <rec sound="110.wav" left="recs/kinectRecord_0_152013132954.oni" right="recs/kinectRecord_1_152013132954.oni"/>
- <rec sound="111.wav" left="recs/kinectRecord_0_15201313300.oni" right="recs/kinectRecord_1_15201313300.oni" description="3000"/>
+ <rec audio="00.wav" left="recs/kinectRecord_0_15201313204.oni" right="recs/kinectRecord_1_15201313204.oni" description="2040 or 2004 BIG"/>
+ <rec audio="01.wav" left="recs/kinectRecord_0_152013132358.oni" right="recs/kinectRecord_1_152013132358.oni"/>
+ <rec audio="02.wav" left="recs/kinectRecord_0_15201313246.oni" right="recs/kinectRecord_1_15201313246.oni" description="2406"/>
+ <rec audio="03.wav" left="recs/kinectRecord_0_152013132416.oni" right="recs/kinectRecord_1_152013132416.oni"/>
+ <rec audio="04.wav" left="recs/kinectRecord_0_152013132426.oni" right="recs/kinectRecord_1_152013132426.oni"/>
+ <rec audio="05.wav" left="recs/kinectRecord_0_152013132439.oni" right="recs/kinectRecord_1_152013132439.oni"/>
+ <rec audio="06.wav" left="recs/kinectRecord_0_152013132447.oni" right="recs/kinectRecord_1_152013132447.oni"/>
+ <rec audio="07.wav" left="recs/kinectRecord_0_15201313252.oni" right="recs/kinectRecord_1_15201313252.oni" description="2502 or 2052"/>
+ <rec audio="08.wav" left="recs/kinectRecord_0_152013132455.oni" right="recs/kinectRecord_1_152013132455.oni"/>
+ <rec audio="09.wav" left="recs/kinectRecord_0_15201313259.oni" right="recs/kinectRecord_1_15201313259.oni" description="2509 or 2059"/>
+ <rec audio="10.wav" left="recs/kinectRecord_0_152013132517.oni" right="recs/kinectRecord_1_152013132517.oni"/>
+ <rec audio="11.wav" left="recs/kinectRecord_0_152013132524.oni" right="recs/kinectRecord_1_152013132524.oni"/>
+ <rec audio="101.wav" left="recs/kinectRecord_0_152013132532.oni" right="recs/kinectRecord_1_152013132532.oni"/>
+ <rec audio="102.wav" left="recs/kinectRecord_0_152013132542.oni" right="recs/kinectRecord_1_152013132542.oni"/>
+ <rec audio="103.wav" left="recs/kinectRecord_0_152013132550.oni" right="recs/kinectRecord_1_152013132550.oni"/>
+ <rec audio="104.wav" left="recs/kinectRecord_0_15201313295.oni" right="recs/kinectRecord_1_15201313295.oni" description="2905"/>
+ <rec audio="105.wav" left="recs/kinectRecord_0_152013132915.oni" right="recs/kinectRecord_1_152013132915.oni"/>
+ <rec audio="106.wav" left="recs/kinectRecord_0_152013132923.oni" right="recs/kinectRecord_1_152013132923.oni"/>
+ <rec audio="107.wav" left="recs/kinectRecord_0_152013132931.oni" right="recs/kinectRecord_1_152013132931.oni"/>
+ <rec audio="108.wav" left="recs/kinectRecord_0_152013132940.oni" right="recs/kinectRecord_1_152013132940.oni"/>
+ <rec audio="109.wav" left="recs/kinectRecord_0_152013132947.oni" right="recs/kinectRecord_1_152013132947.oni"/>
+ <rec audio="110.wav" left="recs/kinectRecord_0_152013132954.oni" right="recs/kinectRecord_1_152013132954.oni"/>
+ <rec audio="111.wav" left="recs/kinectRecord_0_15201313300.oni" right="recs/kinectRecord_1_15201313300.oni" description="3000"/>
<rec left="recs/kinectRecord_0_15201313304.oni" right="recs/kinectRecord_1_15201313304.oni" description="3004"/>
<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"/>
diff --git a/03_play/bin/data/tone0.wav b/03_play/bin/data/tone0.wav
index efe86ea..efe86ea 100644..100755
--- a/03_play/bin/data/tone0.wav
+++ 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
index fe3a0ff..fe3a0ff 100644..100755
--- a/03_play/bin/data/tone1.wav
+++ b/03_play/bin/data/tone1.wav
Binary files differ
diff --git a/03_play/src/testApp.cpp b/03_play/src/testApp.cpp
index 3670a8b..e990ea8 100644
--- a/03_play/src/testApp.cpp
+++ b/03_play/src/testApp.cpp
@@ -19,9 +19,10 @@ void testApp::setup() {
int num=XML.getNumTags("rec");
if(num) {
for (int i=0;i<num;i++) {
- vector<string> rec;
- rec.push_back(XML.getAttribute("rec","left","",i));
- rec.push_back(XML.getAttribute("rec","right","",i));
+ record rec;
+ rec.data.push_back(XML.getAttribute("rec","left","",i));
+ rec.data.push_back(XML.getAttribute("rec","right","",i));
+ rec.audio=XML.getAttribute("rec","audio","",i);
recs.push_back(rec);
}
}
@@ -35,10 +36,10 @@ void testApp::setup() {
openNIPlayers[deviceID].start();
//openNIPlayers[deviceID].startPlayer(ofToDataPath(recs[playing][deviceID]));
}
- soundplayer.loadSound("02.wav");
+ soundplayer.setLoop(false);
startPlayers();
- ofSetFrameRate(25.0f);
+ //ofSetFrameRate(25.0f);
}
void testApp::startPlayers(){
@@ -46,10 +47,14 @@ void testApp::startPlayers(){
//openNIPlayers[deviceID].stop();
//openNIPlayers[deviceID].setup(false);
//openNIPlayers[deviceID].start();
- openNIPlayers[deviceID].startPlayer(ofToDataPath(recs[playing][deviceID]));
+ openNIPlayers[deviceID].startPlayer(ofToDataPath(recs[playing].data[deviceID]));
+ soundplayer.stop();
soundplayer.setPosition(0.0f);
- soundplayer.play();
+ if (recs[playing].audio!=""){
+ soundplayer.loadSound(recs[playing].audio);
+ soundplayer.play();
+ }
}
}
diff --git a/03_play/src/testApp.h b/03_play/src/testApp.h
index a276a59..c162d2b 100644
--- a/03_play/src/testApp.h
+++ b/03_play/src/testApp.h
@@ -7,6 +7,11 @@
#define MAX_DEVICES 2
+struct record{
+ vector<string> data;
+ string audio;
+};
+
class testApp : public ofBaseApp{
public:
@@ -32,13 +37,13 @@ public:
ofTrueTypeFont verdana;
- vector<vector<string> > recs;
-
ofxXmlSettings XML;
- vector<pair<string,string> > filenames;
+ vector<record> recs;
ofSoundPlayer soundplayer;
+
+ float offset;
};
generated by cgit v1.2.3 (git 2.39.1) at 2025-12-06 10:50:39 +0000