summaryrefslogtreecommitdiffstats
path: root/flow
diff options
context:
space:
mode:
Diffstat (limited to 'flow')
-rw-r--r--flow/audioioaix.cc18
-rw-r--r--flow/audioiocsl.cc2
2 files changed, 10 insertions, 10 deletions
diff --git a/flow/audioioaix.cc b/flow/audioioaix.cc
index 2e77685..b5c288b 100644
--- a/flow/audioioaix.cc
+++ b/flow/audioioaix.cc
@@ -116,9 +116,9 @@ AudioIOAIX::AudioIOAIX()
int fd = openDevice();
if( fd >= 0 )
{
- audio_status audiotqStatus;
- memset( &audiotqStatus, 0, sizeof(audio_status) );
- ioctl(fd, AUDIO_STATUS, &audiotqStatus);
+ audio_status audioStatus;
+ memset( &audioStatus, 0, sizeof(audio_status) );
+ ioctl(fd, AUDIO_STATUS, &audioStatus);
audio_buffer audioBuffer;
memset( &audioBuffer, 0, sizeof(audio_buffer) );
@@ -129,14 +129,14 @@ AudioIOAIX::AudioIOAIX()
/*
* default parameters
*/
- param(samplingRate) = audiotqStatus.srate;
- param(fragmentSize) = audiotqStatus.bsize;
- param(fragmentCount) = audioBuffer.write_buf_cap / audiotqStatus.bsize;
- param(channels) = audiotqStatus.channels;
+ param(samplingRate) = audioStatus.srate;
+ param(fragmentSize) = audioStatus.bsize;
+ param(fragmentCount) = audioBuffer.write_buf_cap / audioStatus.bsize;
+ param(channels) = audioStatus.channels;
param(direction) = 2;
- param(format) = ( audiotqStatus.bits_per_sample==8 ) ? 8
- : ( ( audiotqStatus.flags & AUDIO_BIG_ENDIAN ) ? 17 : 16 );
+ param(format) = ( audioStatus.bits_per_sample==8 ) ? 8
+ : ( ( audioStatus.flags & AUDIO_BIG_ENDIAN ) ? 17 : 16 );
}
}
diff --git a/flow/audioiocsl.cc b/flow/audioiocsl.cc
index e5532a2..7f3d5dd 100644
--- a/flow/audioiocsl.cc
+++ b/flow/audioiocsl.cc
@@ -470,7 +470,7 @@ void AudioIOCSL::setParam(AudioParam p, int& value)
int AudioIOCSL::getParam(AudioParam p)
{
CslErrorType error;
- CslPcmtqStatus status;
+ CslPcmStatus status;
switch(p)
{