summaryrefslogtreecommitdiff
path: root/glitcher/src/ofApp.cpp
diff options
context:
space:
mode:
authorComment <tim@gray.(none)>2014-03-04 09:12:14 +0000
committerComment <tim@gray.(none)>2014-03-04 09:12:14 +0000
commitdcba98848683f582fd8348a937007f1fcdddd879 (patch)
tree7b2c5d7eb18d659343959f2e03eb51823335199b /glitcher/src/ofApp.cpp
parent598b4ac2377c6359323f54d570b704f5d912f483 (diff)
parentcaa1426e767efdba526c1d2df0b61aafbd6fcca7 (diff)
Merge branch 'master' of eclectronics.org@eclectronics.org:based
Conflicts: glitcher/src/audioGlitcher.h
Diffstat (limited to 'glitcher/src/ofApp.cpp')
-rw-r--r--glitcher/src/ofApp.cpp4
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);