Merge branch '4-improve_visuals' into 'master'

Resolve "improve_visuals"

Closes #4

See merge request !6

Prototype/src/Visualizer.cpp

@@ -13,7 +13,7 @@ void Visualizer::setup() {
 
 	// Setup the audio component
 
-	//song.loadSound("C:/Users/Billy/Desktop/house.mp3");
+	song.loadSound("C:/Users/Billy/Desktop/house.mp3");
 	// TESTING TESTING TESTING
 
 	song.setVolume(1.0f);
@@ -26,6 +26,7 @@ void Visualizer::setup() {
 	ofSoundStream soundStream;
 	soundStream.setup(this, 0, 2, 44100, 256, 4);
 	soundStream.getSampleRate();
+	ofSoundStreamListDevices();
 
 
 	
@@ -68,8 +69,8 @@ void Visualizer::setup() {
 	particles.push_back(mid1);
 
 	// Start the song
-	/*song.setLoop(true);
-	song.play();*/
+	song.setLoop(true);
+	song.play();
 }
 
 //-------------------------------------------

pp_amendments.txt

-As approved by Helen -
-
-.Removed motion tracking part of project, no longer in project in pieces
-
-.Swapped round the project in pieces and naive version for library of visualisations, we had sound working earlier than intended and naive version will now be an expanded library
-
-.RGB light strip will now be working for naive version
-
-
-
-22nd feb
-
-
-.continue to develop library of visuals, use more advance drawing methods such as opengl and shaders
-
-.get rgb strip working with c++/firmata(need lab assistance with this one)
+As approved by Helen -
+
+.Removed motion tracking part of project, no longer in project in pieces
+
+.Swapped round the project in pieces and naive version for library of visualisations, we had sound working earlier than intended and naive version will now be an expanded library
+
+.RGB light strip will now be working for naive version
+
+
+
+22nd feb
+
+
+.continue to develop library of visuals, use more advance drawing methods such as opengl and shaders
+
+.get rgb strip working with c++/firmata(need lab assistance with this one)
+
+7th march 
+
+.get audio working on pc out rather than predefined file, will allow us to create a more dynamic performance in execution

readme.txt

 William Fish, James Carty
 
 
-OCBOX: A visual and audio experience
\ No newline at end of file
+
+
+
+OCBOX: A visual and audio experience 2018