Skip to content

Commit 5d75449

Browse files
committed
audio input capability objects now working when no audio input device available (microphophone or line input not needed)
1 parent b7fc9be commit 5d75449

File tree

5 files changed

+12
-9
lines changed

5 files changed

+12
-9
lines changed

src/objects/audio_analysis/AudioAnalyzer.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ AudioAnalyzer::AudioAnalyzer() : PatchObject("audio analyzer"){
5353

5454
this->initInletsState();
5555

56-
isAudioINObject = true;
56+
isAudioOUTObject = true;
5757

5858
smoothingValue = 0.0f;
5959
audioInputLevel = 1.0f;
@@ -231,7 +231,7 @@ void AudioAnalyzer::removeObjectContent(bool removeFileFromData){
231231
}
232232

233233
//--------------------------------------------------------------
234-
void AudioAnalyzer::audioInObject(ofSoundBuffer &inputBuffer){
234+
void AudioAnalyzer::audioOutObject(ofSoundBuffer &inputBuffer){
235235
if(this->inletsConnected[0] && isConnected && ofGetElapsedTimeMillis()-startTime > waitTime){
236236

237237
lastBuffer = *static_cast<ofSoundBuffer *>(_inletParams[0]);

src/objects/audio_analysis/AudioAnalyzer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class AudioAnalyzer : public PatchObject {
6060

6161
void removeObjectContent(bool removeFileFromData=false) override;
6262

63-
void audioInObject(ofSoundBuffer &inputBuffer) override;
63+
void audioOutObject(ofSoundBuffer &inputBuffer) override;
6464

6565
void loadAudioSettings();
6666
void doAutoCorrelation(float* signal);

src/objects/sound/AudioExporter.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ AudioExporter::AudioExporter() : PatchObject("audio exporter"){
4848
this->initInletsState();
4949

5050
bang = false;
51-
isAudioINObject = true;
51+
isAudioOUTObject = true;
5252

5353
exportAudioFlag = false;
5454

@@ -293,7 +293,7 @@ void AudioExporter::loadAudioSettings(){
293293
}
294294

295295
//--------------------------------------------------------------
296-
void AudioExporter::audioInObject(ofSoundBuffer &inputBuffer){
296+
void AudioExporter::audioOutObject(ofSoundBuffer &inputBuffer){
297297
if(ofGetElapsedTimeMillis()-lastAudioTimeReset >= 1000){
298298
lastAudioTimeReset = ofGetElapsedTimeMillis();
299299
audioFPS = audioCounter;

src/objects/sound/AudioExporter.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ class AudioExporter : public PatchObject {
5959

6060
void removeObjectContent(bool removeFileFromData=false) override;
6161

62-
void audioInObject(ofSoundBuffer &inputBuffer) override;
62+
void audioOutObject(ofSoundBuffer &inputBuffer) override;
6363

6464
void loadAudioSettings();
6565

src/objects/sound/PDPatch.cpp

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -306,6 +306,12 @@ void PDPatch::removeObjectContent(bool removeFileFromData){
306306

307307
//--------------------------------------------------------------
308308
void PDPatch::audioInObject(ofSoundBuffer &inputBuffer){
309+
310+
}
311+
312+
//--------------------------------------------------------------
313+
void PDPatch::audioOutObject(ofSoundBuffer &outputBuffer){
314+
309315
if(pd.isInited() && pd.isComputingAudio() && currentPatch.isValid()){
310316
if(this->inletsConnected[0]){
311317
lastInputBuffer1 = *static_cast<ofSoundBuffer *>(_inletParams[0]);
@@ -340,10 +346,7 @@ void PDPatch::audioInObject(ofSoundBuffer &inputBuffer){
340346

341347
pd.audioIn(lastInputBuffer.getBuffer().data(), lastInputBuffer.getNumFrames(), lastInputBuffer.getNumChannels());
342348
}
343-
}
344349

345-
//--------------------------------------------------------------
346-
void PDPatch::audioOutObject(ofSoundBuffer &outputBuffer){
347350
if(pd.isInited() && pd.isComputingAudio() && currentPatch.isValid()){
348351
pd.audioOut(lastOutputBuffer.getBuffer().data(), lastOutputBuffer.getNumFrames(), 4);
349352
}else{

0 commit comments

Comments
 (0)