From 577e61af4e08eb4b9f68f27343802f65a8fcddb0 Mon Sep 17 00:00:00 2001
From: Tim <tim@Admins-Mac-Pro-2.local>
Date: Fri, 14 Jun 2013 18:19:11 +0100
Subject: making audio sync

---
 03_play/src/testApp.cpp | 19 ++++++++++++-------
 03_play/src/testApp.h   | 11 ++++++++---
 2 files changed, 20 insertions(+), 10 deletions(-)

(limited to '03_play/src')

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;
     
 };
 
-- 
cgit v1.2.3