From ac795f664ffa7085860c8f2babcec79db4ea4bfe Mon Sep 17 00:00:00 2001 From: letz Date: Tue, 7 Dec 2004 18:00:36 +0000 Subject: [PATCH] Cleanup git-svn-id: svn+ssh://jackaudio.org/trunk/jack@824 0c269be4-1314-0410-8aa9-9f06e86f4224 --- drivers/coreaudio/AudioRender.cpp | 4 ++-- drivers/coreaudio/AudioRender.h | 4 ++-- drivers/coreaudio/AudioRenderBridge.cpp | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/coreaudio/AudioRender.cpp b/drivers/coreaudio/AudioRender.cpp index 972833f..3affff5 100644 --- a/drivers/coreaudio/AudioRender.cpp +++ b/drivers/coreaudio/AudioRender.cpp @@ -461,12 +461,12 @@ OSStatus AudioRender::process(AudioDeviceID inDevice, } } else { for (unsigned int b = 0; b < inInputData->mNumberBuffers; b++) { - classe->channelsPerStream[b] = + classe->channelsPerInputStream[b] = (int) inInputData->mBuffers[b].mNumberChannels; classe->inBuffers[b] = (float *) inInputData->mBuffers[b].mData; // but jack will read only the inBuffers[0], anyway that should not be a problem. } for (unsigned int b = 0; b < outOutputData->mNumberBuffers; b++) { - classe->out_channelsPerStream[b] = + classe->channelsPerOutputStream[b] = (int) outOutputData->mBuffers[b].mNumberChannels; classe->outBuffers[b] = (float *) outOutputData->mBuffers[b].mData; // but jack will read only the outBuffers[0], anyway that should not be a problem. } diff --git a/drivers/coreaudio/AudioRender.h b/drivers/coreaudio/AudioRender.h index 164b13e..3b8274b 100644 --- a/drivers/coreaudio/AudioRender.h +++ b/drivers/coreaudio/AudioRender.h @@ -63,8 +63,8 @@ class AudioRender { static int gOutputChannels; static bool isProcessing; static const AudioTimeStamp *gTime; - int *isInterleaved, *numberOfStreams, *channelsPerStream, - *out_numberOfStreams, *out_channelsPerStream; + int *isInterleaved, *numberOfInputStreams, *channelsPerInputStream, + *numberOfOuputStreams, *channelsPerOutputStream; int n_in_streams, n_out_streams; private: static OSStatus process(AudioDeviceID inDevice, diff --git a/drivers/coreaudio/AudioRenderBridge.cpp b/drivers/coreaudio/AudioRenderBridge.cpp index aede04b..171ece0 100644 --- a/drivers/coreaudio/AudioRenderBridge.cpp +++ b/drivers/coreaudio/AudioRenderBridge.cpp @@ -120,18 +120,18 @@ void setParameter(void *instance, int id, void *data) inst->isInterleaved = (int *) data; break; case 'nstr': - inst->numberOfStreams = (int *) data; - *inst->numberOfStreams = inst->n_in_streams; + inst->numberOfInputStreams = (int *) data; + *inst->numberOfInputStreams = inst->n_in_streams; break; case 'cstr': - inst->channelsPerStream = (int *) data; + inst->channelsPerInputStream = (int *) data; break; case 'nstO': - inst->out_numberOfStreams = (int *) data; - *inst->out_numberOfStreams = inst->n_out_streams; + inst->numberOfOuputStreams = (int *) data; + *inst->numberOfOuputStreams = inst->n_out_streams; break; case 'cstO': - inst->out_channelsPerStream = (int *) data; + inst->channelsPerOutputStream = (int *) data; break; } }