diff options
| author | Timothy Pearson <[email protected]> | 2011-12-16 09:57:56 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2011-12-16 09:57:56 -0600 |
| commit | 37b0caa7580692b22c71552f3f01be1623ef024e (patch) | |
| tree | cff054e06fca1e35d587f14b81672bee7e2fb6c7 /flow/gsl | |
| parent | 6e637ec10f4d608e38c6b685524640c0247eb1ce (diff) | |
| download | arts-37b0caa7580692b22c71552f3f01be1623ef024e.tar.gz arts-37b0caa7580692b22c71552f3f01be1623ef024e.zip | |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 6e637ec10f4d608e38c6b685524640c0247eb1ce.
Diffstat (limited to 'flow/gsl')
| -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 |
4 files changed, 9 insertions, 9 deletions
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) { |