diff options
Diffstat (limited to 'flow')
| -rw-r--r-- | flow/audioioaix.cc | 18 | ||||
| -rw-r--r-- | flow/audioiocsl.cc | 2 | ||||
| -rw-r--r-- | flow/gsl/gslengine.c | 2 | ||||
| -rw-r--r-- | flow/gsl/gslieee754.h | 4 | ||||
| -rw-r--r-- | flow/gsl/gslloader-wav.c | 10 | ||||
| -rw-r--r-- | flow/gsl/gslopschedule.c | 2 |
6 files changed, 19 insertions, 19 deletions
diff --git a/flow/audioioaix.cc b/flow/audioioaix.cc index b5c288b..2e77685 100644 --- a/flow/audioioaix.cc +++ b/flow/audioioaix.cc @@ -116,9 +116,9 @@ AudioIOAIX::AudioIOAIX() int fd = openDevice(); if( fd >= 0 ) { - audio_status audioStatus; - memset( &audioStatus, 0, sizeof(audio_status) ); - ioctl(fd, AUDIO_STATUS, &audioStatus); + audio_status audiotqStatus; + memset( &audiotqStatus, 0, sizeof(audio_status) ); + ioctl(fd, AUDIO_STATUS, &audiotqStatus); audio_buffer audioBuffer; memset( &audioBuffer, 0, sizeof(audio_buffer) ); @@ -129,14 +129,14 @@ AudioIOAIX::AudioIOAIX() /* * default parameters */ - param(samplingRate) = audioStatus.srate; - param(fragmentSize) = audioStatus.bsize; - param(fragmentCount) = audioBuffer.write_buf_cap / audioStatus.bsize; - param(channels) = audioStatus.channels; + param(samplingRate) = audiotqStatus.srate; + param(fragmentSize) = audiotqStatus.bsize; + param(fragmentCount) = audioBuffer.write_buf_cap / audiotqStatus.bsize; + param(channels) = audiotqStatus.channels; param(direction) = 2; - param(format) = ( audioStatus.bits_per_sample==8 ) ? 8 - : ( ( audioStatus.flags & AUDIO_BIG_ENDIAN ) ? 17 : 16 ); + param(format) = ( audiotqStatus.bits_per_sample==8 ) ? 8 + : ( ( audiotqStatus.flags & AUDIO_BIG_ENDIAN ) ? 17 : 16 ); } } diff --git a/flow/audioiocsl.cc b/flow/audioiocsl.cc index 7f3d5dd..e5532a2 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; - CslPcmStatus status; + CslPcmtqStatus status; switch(p) { diff --git a/flow/gsl/gslengine.c b/flow/gsl/gslengine.c index d85ebfb..6c6c9f5 100644 --- a/flow/gsl/gslengine.c +++ b/flow/gsl/gslengine.c @@ -664,7 +664,7 @@ gsl_engine_init (gboolean run_threaded, gsl_engine_threaded = run_threaded; gsl_externvar_bsize = block_size; gsl_externvar_sample_freq = sample_freq; - gsl_externvar_sub_sample_mask = sub_sample_mask << 2; /* shift out sizeof (float) alignment */ + gsl_externvar_sub_sample_mask = sub_sample_mask << 2; /* shift out sizeof (float) tqalignment */ gsl_externvar_sub_sample_steps = sub_sample_mask + 1; _gsl_tick_stamp_set_leap (block_size); diff --git a/flow/gsl/gslieee754.h b/flow/gsl/gslieee754.h index 211b06c..6250842 100644 --- a/flow/gsl/gslieee754.h +++ b/flow/gsl/gslieee754.h @@ -26,14 +26,14 @@ extern "C" { #endif /* __cplusplus */ -/* IEEE 754 single precision floating point layout: +/* IEEE 754 single precision floating point tqlayout: * 31 30 23 22 0 * +--------+---------------+---------------+ * | s 1bit | e[30:23] 8bit | f[22:0] 23bit | * +--------+---------------+---------------+ * B0------------------->B1------->B2-->B3--> * - * IEEE 754 double precision floating point layout: + * IEEE 754 double precision floating point tqlayout: * 63 62 52 51 32 31 0 * +--------+----------------+----------------+ +---------------+ * | s 1bit | e[62:52] 11bit | f[51:32] 20bit | | f[31:0] 32bit | diff --git a/flow/gsl/gslloader-wav.c b/flow/gsl/gslloader-wav.c index 6cb8831..85e4cc3 100644 --- a/flow/gsl/gslloader-wav.c +++ b/flow/gsl/gslloader-wav.c @@ -201,7 +201,7 @@ typedef struct static GslErrorType wav_read_data_header (gint fd, DataHeader *header, - guint byte_alignment) + guint byte_tqalignment) { guint n_bytes; @@ -241,12 +241,12 @@ wav_read_data_header (gint fd, WAV_DEBUG ("failed to seek while skipping sub-chunk"); return GSL_ERROR_IO; } - return wav_read_data_header (fd, header, byte_alignment); + return wav_read_data_header (fd, header, byte_tqalignment); } - if (header->data_length < 1 || header->data_length % byte_alignment != 0) + if (header->data_length < 1 || header->data_length % byte_tqalignment != 0) { - WAV_DEBUG ("invalid data length (%u) or alignment (%u)", - header->data_length, header->data_length % byte_alignment); + WAV_DEBUG ("invalid data length (%u) or tqalignment (%u)", + header->data_length, header->data_length % byte_tqalignment); return GSL_ERROR_FORMAT_INVALID; } diff --git a/flow/gsl/gslopschedule.c b/flow/gsl/gslopschedule.c index a72f52b..8e797a3 100644 --- a/flow/gsl/gslopschedule.c +++ b/flow/gsl/gslopschedule.c @@ -158,7 +158,7 @@ static void _engine_schedule_grow (EngineSchedule *sched, guint leaf_level) { - guint ll = 1 << g_bit_storage (leaf_level); /* power2 growth alignment, ll >= leaf_level+1 */ + guint ll = 1 << g_bit_storage (leaf_level); /* power2 growth tqalignment, ll >= leaf_level+1 */ if (sched->leaf_levels < ll) { |