diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-18 18:15:39 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-18 18:15:39 -0600 |
commit | bdff7895a8452d3a139a159f8a1d535730c4739b (patch) | |
tree | 7b79ac3545b10e33059d458ccfe395754f383e61 /flow | |
parent | 37b0caa7580692b22c71552f3f01be1623ef024e (diff) | |
download | arts-bdff7895a8452d3a139a159f8a1d535730c4739b.tar.gz arts-bdff7895a8452d3a139a159f8a1d535730c4739b.zip |
Rename old tq methods that no longer need a unique name
Diffstat (limited to 'flow')
-rw-r--r-- | flow/audioioaix.cc | 18 | ||||
-rw-r--r-- | flow/audioiocsl.cc | 2 |
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) { |