Merge branch 'master' of eclectronics.org@eclectronics.org:TRSS

Conflicts:
	04_playobjects/src/testApp.h

1 files changed, 46 insertions, 1 deletions

diff --git a/06_performance/src/oni.h b/06_performance/src/oni.h
index ccb1417..158d513 100644
--- a/06_performance/src/oni.h
+++ b/06_performance/src/oni.h
@@ -1 +1,46 @@
-#include "ofxOpenNI.h"
\ No newline at end of file
+#include "ofMain.h"
+#include "ofxXmlSettings.h"
+#include "ofxOpenNI.h"
+
+
+
+//in order to play different clips it seems necessary to have a player per clip
+class syncOniPlayer{
+	public:
+		syncOniPlayer() {
+			drawable=false;
+		}
+		~syncOniPlayer(){
+			stop();
+		}
+		void addPlayer(string name);
+		void play();
+		void update();
+		void pause();
+		int getCurrentFrame();
+		void drawWindows();
+		void drawCloud(int step);
+		void stop();
+		string audio;
+		
+	private:
+		vector<ofxOpenNI*> players;
+		vector<string> filenames;
+		ofSoundPlayer soundplayer;
+		bool drawable;
+		
+};
+//========================================
+class oniManager{
+	public:
+		void init(const char* filename);
+		void startPlayer(int num);
+		void update();
+		void drawWindows();
+		void drawCloud(int step);
+		void previous();
+		void next();
+		int playing;
+		ofxXmlSettings XML;
+    	vector<syncOniPlayer> players;
+};
\ No newline at end of file