very nearly ready

4 files changed, 32 insertions, 4 deletions

diff --git a/06_performance/bin/data/videos.xml b/06_performance/bin/data/videos.xml
index 73c6dee..b4a13da 100755
--- a/06_performance/bin/data/videos.xml
+++ b/06_performance/bin/data/videos.xml
@@ -1,19 +1,23 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <TRSS description="videos">
-	<video file="video/Two Cities.mp4"/>
+	
 	<video file="video/Foyle Arts Building.mp4"/>
 	<video file="video/Playpark 1.mp4"/>
 	<video file="video/Playpark 2.mp4"/>
-	<video file="video/Cinema.mp4" description="my girl?"/>
+	
 	<video file="video/See-Saw.mp4"/>
 	<video file="video/Under New Bridge 2.mp4"/>
 	<video file="video/Under New Bridge.mp4"/>
 	<video file="video/Under Foyle Bridge.mp4"/>
 	<video file="video/Under Craigavon Bridge.mp4"/>
-	<video file="video/Climbing Frame.mp4" description="esau?"/>
+	
 	<video file="video/Castle 1.mp4"/>
 	<video file="video/Castle 2.mp4"/>
 	<video file="video/New Bridge Guildhall.mp4"/>
 	<video file="video/Marina Wall 1.mp4"/>
 	<video file="video/Marina Wall 2.mp4"/>
 </TRSS>
+
+<video file="video/Two Cities.mp4"/>
+<video file="video/Cinema.mp4" description="my girl?"/>
+<video file="video/Climbing Frame.mp4" description="esau?"/>
\ No newline at end of file
diff --git a/06_performance/src/oni.cpp b/06_performance/src/oni.cpp
index 20b67bb..9d432d8 100644
--- a/06_performance/src/oni.cpp
+++ b/06_performance/src/oni.cpp
@@ -46,6 +46,10 @@ void syncOniPlayer::pause(){
 		players[i]->setPaused(true);
 	}
 }
+bool syncOniPlayer::isPlaying(){
+	if (players.size()) return players[0]->isPlaying();
+	else return false;
+}
 int syncOniPlayer::getCurrentFrame(){
 	if (players.size()) return players[0]->getCurrentFrame();
 	else return -1;
@@ -213,7 +217,7 @@ void oniManager::init(const char* filename){
 void oniManager::startPlayer(int newplayer){
 	if (players.size()>newplayer){
 	    if (playing>-1) players[playing].stop();
-	    usleep(500000);
+	    //usleep(500000);
 	    playing=newplayer;
 	    players[playing].play();
 	}
@@ -222,6 +226,7 @@ int oniManager::getNumClips(){
 	return players.size();
 }
 void oniManager::update(){
+	//if (playing>-1&&!players[playing].isPlaying()) players[playing].play();
 	if (players.size()>playing&&playing>-1) players[playing].update();
 }
 void oniManager::drawWindows(){
diff --git a/06_performance/src/oni.h b/06_performance/src/oni.h
index 73edeee..821dba7 100644
--- a/06_performance/src/oni.h
+++ b/06_performance/src/oni.h
@@ -60,6 +60,7 @@ class syncOniPlayer{
 		void play();
 		void update();
 		void pause();
+		bool isPlaying();
 		int getCurrentFrame();
 		float getPosition();
 		int getNumParticles();
diff --git a/06_performance/src/testApp.cpp b/06_performance/src/testApp.cpp
index 75bb6eb..e1f6d71 100644
--- a/06_performance/src/testApp.cpp
+++ b/06_performance/src/testApp.cpp
@@ -36,6 +36,7 @@ void testApp::setup(){
 
 	//soundStream.setDeviceID(0);
 	soundStream.setup(this, 0, 2, 44100, BUFFER_SIZE, 4);
+	//soundStream.setup(this, 0, 4, 44100, BUFFER_SIZE, 4);
 
 	ofSetHexColor(0x666666);
 
@@ -53,6 +54,23 @@ void testApp::setup(){
 	rFFTanalyzer.linearEQIntercept = 0.9f; // reduced gain at lowest frequency
 	rFFTanalyzer.linearEQSlope = 0.01f; // increasing gain at higher frequencies
 
+	if (4chan)
+	{
+		lFFTanalyzer2.setup(44100, BUFFER_SIZE/2,32);
+
+		lFFTanalyzer2.peakHoldTime = 15; // hold longer
+		lFFTanalyzer2.peakDecayRate = 0.95f; // decay slower
+		lFFTanalyzer2.linearEQIntercept = 0.9f; // reduced gain at lowest frequency
+		lFFTanalyzer2.linearEQSlope = 0.01f; // increasing gain at higher frequencies
+
+		rFFTanalyzer2.setup(44100, BUFFER_SIZE/2,32);
+
+		rFFTanalyzer2.peakHoldTime = 15; // hold longer
+		rFFTanalyzer2.peakDecayRate = 0.95f; // decay slower
+		rFFTanalyzer2.linearEQIntercept = 0.9f; // reduced gain at lowest frequency
+		rFFTanalyzer2.linearEQSlope = 0.01f; // increasing gain at higher frequencies
+	}
+
 	ofSetFrameRate(60);
 
 	ofBackground(0,0,0);