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

Conflicts:
	glitcher/src/audioGlitcher.h

1 files changed, 2 insertions, 2 deletions

diff --git a/glitcher/src/ofApp.cpp b/glitcher/src/ofApp.cpp
index acdd644..3a1b2b3 100644
--- a/glitcher/src/ofApp.cpp
+++ b/glitcher/src/ofApp.cpp
@@ -9,9 +9,9 @@ void ofApp::setup() {
 
 	int bufferSize=	ofGetWidth(); //should be based on the size of glitch buffer
 
-	soundStream.listDevices();
+	//soundStream.listDevices();
 	//nb all you have to do to make audio work is to turn off pulseaudio in configuration
-	soundStream.setup(this, 0, 1, 44100, bufferSize, 1);
+	//soundStream.setup(this, 0, 1, 44100, bufferSize, 1);
 	samples.resize(bufferSize);
 
 	glitch.setup(ofGetWidth(),ofGetHeight(),&samples);