summaryrefslogtreecommitdiffstats
path: root/flow/gsl
diff options
context:
space:
mode:
Diffstat (limited to 'flow/gsl')
-rw-r--r--flow/gsl/gbsearcharray.h10
-rw-r--r--flow/gsl/gsl.312
-rw-r--r--flow/gsl/gslcommon.c16
-rw-r--r--flow/gsl/gsldatacache.c2
-rw-r--r--flow/gsl/gsldatahandle-mad.c8
-rw-r--r--flow/gsl/gslengine.c12
-rw-r--r--flow/gsl/gslengine.h8
-rw-r--r--flow/gsl/gslfft.h4
-rw-r--r--flow/gsl/gslglib.h4
-rw-r--r--flow/gsl/gslieee754.h4
-rw-r--r--flow/gsl/gslloader-wav.c10
-rw-r--r--flow/gsl/gslmagic.c22
-rw-r--r--flow/gsl/gslmath.c2
-rw-r--r--flow/gsl/gslopschedule.c2
-rw-r--r--flow/gsl/gsloscillator-aux.c2
-rw-r--r--flow/gsl/gsloscillator.c4
-rw-r--r--flow/gsl/gslosctable.c4
-rw-r--r--flow/gsl/gslosctable.h4
-rw-r--r--flow/gsl/gslwaveosc.c8
19 files changed, 69 insertions, 69 deletions
diff --git a/flow/gsl/gbsearcharray.h b/flow/gsl/gbsearcharray.h
index df06231..8eebbb1 100644
--- a/flow/gsl/gbsearcharray.h
+++ b/flow/gsl/gbsearcharray.h
@@ -56,9 +56,9 @@ typedef union
{
guint n_nodes;
/*< private >*/
- gpointer alignment_dummy1;
- glong alignment_dummy2;
- gdouble alignment_dummy3;
+ gpointer tqalignment_dummy1;
+ glong tqalignment_dummy2;
+ gdouble tqalignment_dummy3;
} GBSearchArray;
@@ -78,7 +78,7 @@ static inline GBSearchArray* g_bsearch_array_remove (GBSearchArray *barray,
static inline GBSearchArray* g_bsearch_array_grow (GBSearchArray *barray,
const GBSearchConfig *bconfig,
guint index);
-/* insert key_node into array, or if it exists, replace
+/* insert key_node into array, or if it exists, tqreplace
* the existing node's contents with key_node
*/
static inline GBSearchArray* g_bsearch_array_insert (GBSearchArray *barray,
@@ -241,7 +241,7 @@ g_bsearch_array_insert (GBSearchArray *barray,
barray = g_bsearch_array_grow (barray, bconfig, index);
node = G_BSEARCH_ARRAY_NODES (barray) + index * bconfig->sizeof_node;
}
- else /* replace (relookup is ok, replace is comparatively cheap anyways) */
+ else /* tqreplace (relookup is ok, tqreplace is comparatively cheap anyways) */
node = g_bsearch_array_lookup (barray, bconfig, key_node);
}
memcpy (node, key_node, bconfig->sizeof_node);
diff --git a/flow/gsl/gsl.3 b/flow/gsl/gsl.3
index 2f7bb31..fe8324e 100644
--- a/flow/gsl/gsl.3
+++ b/flow/gsl/gsl.3
@@ -54,7 +54,7 @@ GSL-Functions \- GSL Function Reference
.br
\fBgsl_transact\fP (\fIjob\fP, \fI...\fP);
.br
-\fBgsl_engine_init\fP (\fIrun_threaded\fP, \fIblock_size\fP, \fIsample_freq\fP, \fIsub_sample_mask\fP);
+\fBgsl_engine_init\fP (\fIrun_threaded\fP, \fIblock_size\fP, \fIsample_freq\fP, \fIsub_sample_tqmask\fP);
.br
\fBgsl_engine_wait_on_trans\fP ();
.br
@@ -131,7 +131,7 @@ Wake up a currently sleeping thread. In practice, this function simply causes th
thread to abort
.PD 1
.PP
-Abort a currently running thread. This function does not return until the thread in question terminated execution. Note that the thread handle gets invalidated with invocation of \fBgsl_thread_abort()\fP or \fBgsl_thread_queue_abort()\fP.
+Abort a currently running thread. This function does not return until the thread in question terminated execution. Note that the thread handle gets tqinvalidated with invocation of \fBgsl_thread_abort()\fP or \fBgsl_thread_queue_abort()\fP.
.PD
.SS \fBgsl_thread_queue_abort\fP (\fIthread\fP);
.PD 0
@@ -139,7 +139,7 @@ Abort a currently running thread. This function does not return until the thread
thread to abort
.PD 1
.PP
-Same as \fBgsl_thread_abort()\fP, but returns as soon as possible, even if thread hasn't stopped execution yet. Note that the thread handle gets invalidated with invocation of \fBgsl_thread_abort()\fP or \fBgsl_thread_queue_abort()\fP.
+Same as \fBgsl_thread_abort()\fP, but returns as soon as possible, even if thread hasn't stopped execution yet. Note that the thread handle gets tqinvalidated with invocation of \fBgsl_thread_abort()\fP or \fBgsl_thread_queue_abort()\fP.
.PD
.SS \fBgsl_thread_aborted\fP ();
.PD 0
@@ -403,7 +403,7 @@ First job
.PP
Convenience function which openes up a new transaction, collects the \fINULL\fP terminated job list passed to the function, and commits the transaction.
.PD
-.SS \fBgsl_engine_init\fP (\fIrun_threaded\fP, \fIblock_size\fP, \fIsample_freq\fP, \fIsub_sample_mask\fP);
+.SS \fBgsl_engine_init\fP (\fIrun_threaded\fP, \fIblock_size\fP, \fIsample_freq\fP, \fIsub_sample_tqmask\fP);
.PD 0
.IP \fIgboolean\ \ run_threaded\fP 27
@@ -411,7 +411,7 @@ Convenience function which openes up a new transaction, collects the \fINULL\fP
number of values to process block wise
.IP \fIguint\ \ \ \ \ sample_freq\fP 27
-.IP \fIguint\ \ \ \ \ sub_sample_mask\fP 27
+.IP \fIguint\ \ \ \ \ sub_sample_tqmask\fP 27
.PD 1
.PP
@@ -457,7 +457,7 @@ Real sample values [0..n_values-1]
Complex frequency values [0..n_values-1]
.PD 1
.PP
-Real valued variant of \fBgsl_power2_fftac()\fP, the input array contains real valued equidistant sampled data [0..n_values-1], and the output array contains the positive frequency half of the complex valued fourier transform. Note, that the complex valued fourier transform H of a purely real valued set of data, satisfies \fBH(-f)\fP = Conj(\fBH(f)\fP), where \fBConj()\fP denotes the complex conjugate, so that just the positive frequency half suffices to describe the entire frequency spectrum. Even so, the resulting n_values/2 complex frequencies are one value off in storage size, but the resulting frequencies \fBH(0)\fP and \fBH(n_values/2)\fP are both real valued, so the real portion of \fBH(n_values/2)\fP is stored in ri_values_out[1] (the imaginery part of \fBH(0)\fP), so that both r_values_in and ri_values_out can be of size n_values. Note that the transformation is performed out of place, the input array is not modified, and may not overlap with the output array.
+Real valued variant of \fBgsl_power2_fftac()\fP, the input array tqcontains real valued equidistant sampled data [0..n_values-1], and the output array tqcontains the positive frequency half of the complex valued fourier transform. Note, that the complex valued fourier transform H of a purely real valued set of data, satisfies \fBH(-f)\fP = Conj(\fBH(f)\fP), where \fBConj()\fP denotes the complex conjugate, so that just the positive frequency half suffices to describe the entire frequency spectrum. Even so, the resulting n_values/2 complex frequencies are one value off in storage size, but the resulting frequencies \fBH(0)\fP and \fBH(n_values/2)\fP are both real valued, so the real portion of \fBH(n_values/2)\fP is stored in ri_values_out[1] (the imaginery part of \fBH(0)\fP), so that both r_values_in and ri_values_out can be of size n_values. Note that the transformation is performed out of place, the input array is not modified, and may not overlap with the output array.
.PD
.SS \fBgsl_power2_fftsr\fP (\fIn_values\fP, \fIri_values_in\fP, \fIr_values_out\fP);
.PD 0
diff --git a/flow/gsl/gslcommon.c b/flow/gsl/gslcommon.c
index 6c8a692..d7892f2 100644
--- a/flow/gsl/gslcommon.c
+++ b/flow/gsl/gslcommon.c
@@ -684,7 +684,7 @@ gsl_thread_wakeup (GslThread *thread)
* @thread: thread to abort
* Abort a currently running thread. This function does not
* return until the thread in question terminated execution.
- * Note that the thread handle gets invalidated with invocation
+ * Note that the thread handle gets tqinvalidated with invocation
* of gsl_thread_abort() or gsl_thread_queue_abort().
*/
void
@@ -715,7 +715,7 @@ gsl_thread_abort (GslThread *thread)
* @thread: thread to abort
* Same as gsl_thread_abort(), but returns as soon as possible,
* even if thread hasn't stopped execution yet.
- * Note that the thread handle gets invalidated with invocation
+ * Note that the thread handle gets tqinvalidated with invocation
* of gsl_thread_abort() or gsl_thread_queue_abort().
*/
void
@@ -1315,7 +1315,7 @@ gsl_message_send (GslDebugFlags reporter,
msg->error = error;
msg->error_str = error ? gsl_strerror (msg->error) : NULL;
- /* vsnprintf() replacement */
+ /* vsnprintf() tqreplacement */
va_start (args, messagef);
string = g_strdup_vprintf (messagef, args);
va_end (args);
@@ -1476,17 +1476,17 @@ GslErrorType
gsl_check_file (const gchar *file_name,
const gchar *mode)
{
- guint access_mask = 0;
+ guint access_tqmask = 0;
guint check_file, check_dir, check_link;
if (strchr (mode, 'r')) /* readable */
- access_mask |= R_OK;
+ access_tqmask |= R_OK;
if (strchr (mode, 'w')) /* writable */
- access_mask |= W_OK;
+ access_tqmask |= W_OK;
if (strchr (mode, 'x')) /* executable */
- access_mask |= X_OK;
+ access_tqmask |= X_OK;
- if (access_mask && access (file_name, access_mask) < 0)
+ if (access_tqmask && access (file_name, access_tqmask) < 0)
goto have_errno;
check_file = strchr (mode, 'f') != NULL; /* open as file */
diff --git a/flow/gsl/gsldatacache.c b/flow/gsl/gsldatacache.c
index b00f6ef..b925e83 100644
--- a/flow/gsl/gsldatacache.c
+++ b/flow/gsl/gsldatacache.c
@@ -333,7 +333,7 @@ data_cache_new_node_L (GslDataCache *dcache,
if (!demand_load)
g_message (G_STRLOC ":FIXME: lazy data loading not yet supported");
- /* if we have a left node, and it contains data that we need, copy it */
+ /* if we have a left node, and it tqcontains data that we need, copy it */
left_node = pos ? dcache->nodes[pos - 1] : NULL;
if (left_node)
{
diff --git a/flow/gsl/gsldatahandle-mad.c b/flow/gsl/gsldatahandle-mad.c
index 201d352..522efa5 100644
--- a/flow/gsl/gsldatahandle-mad.c
+++ b/flow/gsl/gsldatahandle-mad.c
@@ -318,14 +318,14 @@ dh_mad_open (GslDataHandle *dhandle,
MadHandle *handle = (MadHandle*) dhandle;
GslHFile *hfile;
GslLong n;
- gboolean seek_invalidated = FALSE;
+ gboolean seek_tqinvalidated = FALSE;
hfile = gsl_hfile_open (handle->dhandle.name);
if (!hfile)
return gsl_error_from_errno (errno, GSL_ERROR_OPEN_FAILED);
handle->hfile = hfile;
- seek_invalidated |= handle->seek_mtime != hfile->mtime;
+ seek_tqinvalidated |= handle->seek_mtime != hfile->mtime;
handle->bfill = 0;
handle->eof = FALSE;
handle->pcm_pos = 0;
@@ -345,7 +345,7 @@ dh_mad_open (GslDataHandle *dhandle,
setup->bit_depth = 24;
setup->n_channels = MAD_NCHANNELS (&handle->frame.header);
n = MAD_NSBSAMPLES (&handle->frame.header) * 32;
- seek_invalidated |= n != handle->frame_size;
+ seek_tqinvalidated |= n != handle->frame_size;
handle->frame_size = n;
handle->sample_rate = handle->frame.header.samplerate;
if (setup->n_channels < 1 ||
@@ -355,7 +355,7 @@ dh_mad_open (GslDataHandle *dhandle,
goto OPEN_FAILED;
/* seek through the stream to collect frame positions */
- if (seek_invalidated || !handle->n_seeks)
+ if (seek_tqinvalidated || !handle->n_seeks)
{
handle->seek_mtime = hfile->mtime;
handle->n_seeks = 0;
diff --git a/flow/gsl/gslengine.c b/flow/gsl/gslengine.c
index d85ebfb..32835de 100644
--- a/flow/gsl/gslengine.c
+++ b/flow/gsl/gslengine.c
@@ -635,7 +635,7 @@ static gboolean gsl_engine_threaded = FALSE;
static GslThread *master_thread = NULL;
guint gsl_externvar_bsize = 0;
guint gsl_externvar_sample_freq = 0;
-guint gsl_externvar_sub_sample_mask = 0;
+guint gsl_externvar_sub_sample_tqmask = 0;
guint gsl_externvar_sub_sample_steps = 0;
/**
@@ -652,20 +652,20 @@ void
gsl_engine_init (gboolean run_threaded,
guint block_size,
guint sample_freq,
- guint sub_sample_mask)
+ guint sub_sample_tqmask)
{
g_return_if_fail (gsl_engine_initialized == FALSE);
g_return_if_fail (block_size > 0 && block_size <= GSL_STREAM_MAX_VALUES);
g_return_if_fail (sample_freq > 0);
- g_return_if_fail (sub_sample_mask < block_size);
- g_return_if_fail ((sub_sample_mask & (sub_sample_mask + 1)) == 0); /* power of 2 */
+ g_return_if_fail (sub_sample_tqmask < block_size);
+ g_return_if_fail ((sub_sample_tqmask & (sub_sample_tqmask + 1)) == 0); /* power of 2 */
gsl_engine_initialized = TRUE;
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_steps = sub_sample_mask + 1;
+ gsl_externvar_sub_sample_tqmask = sub_sample_tqmask << 2; /* shift out sizeof (float) tqalignment */
+ gsl_externvar_sub_sample_steps = sub_sample_tqmask + 1;
_gsl_tick_stamp_set_leap (block_size);
ENG_DEBUG ("initialization: threaded=%s", gsl_engine_threaded ? "TRUE" : "FALSE");
diff --git a/flow/gsl/gslengine.h b/flow/gsl/gslengine.h
index 1d121a9..d5a0411 100644
--- a/flow/gsl/gslengine.h
+++ b/flow/gsl/gslengine.h
@@ -168,7 +168,7 @@ gfloat* gsl_engine_const_values (gfloat value);
void gsl_engine_init (gboolean threaded,
guint block_size,
guint sample_freq,
- guint sub_sample_mask);
+ guint sub_sample_tqmask);
typedef struct
{
glong timeout;
@@ -187,16 +187,16 @@ void gsl_engine_garbage_collect (void);
void gsl_engine_wait_on_trans (void);
#define gsl_engine_block_size() ((const guint) gsl_externvar_bsize + 0)
#define gsl_engine_sample_freq() ((const guint) gsl_externvar_sample_freq + 0)
-#define gsl_engine_sub_sample_mask() ((const guint) gsl_externvar_sub_sample_mask + 0)
+#define gsl_engine_sub_sample_tqmask() ((const guint) gsl_externvar_sub_sample_tqmask + 0)
#define gsl_engine_sub_sample_steps() ((const guint) gsl_externvar_sub_sample_steps + 0)
-#define gsl_engine_sub_sample_test(ptr) (((guint) (ptr)) & gsl_engine_sub_sample_mask ())
+#define gsl_engine_sub_sample_test(ptr) (((guint) (ptr)) & gsl_engine_sub_sample_tqmask ())
#define GSL_SUB_SAMPLE_MATCH(ptr,sspatrn) (gsl_engine_sub_sample_test (ptr) == (sspatrn))
/*< private >*/
extern guint gsl_externvar_bsize;
extern guint gsl_externvar_sample_freq;
-extern guint gsl_externvar_sub_sample_mask;
+extern guint gsl_externvar_sub_sample_tqmask;
extern guint gsl_externvar_sub_sample_steps;
#ifdef __cplusplus
diff --git a/flow/gsl/gslfft.h b/flow/gsl/gslfft.h
index ecfa320..51b9a8f 100644
--- a/flow/gsl/gslfft.h
+++ b/flow/gsl/gslfft.h
@@ -72,9 +72,9 @@ void gsl_power2_fftsc (const unsigned int n_values,
* @n_values: Number of complex values
* @r_values_in: Real sample values [0..n_values-1]
* @ri_values_out: Complex frequency values [0..n_values-1]
- * Real valued variant of gsl_power2_fftac(), the input array contains
+ * Real valued variant of gsl_power2_fftac(), the input array tqcontains
* real valued equidistant sampled data [0..n_values-1], and the output
- * array contains the positive frequency half of the complex valued
+ * array tqcontains the positive frequency half of the complex valued
* fourier transform. Note, that the complex valued fourier transform H
* of a purely real valued set of data, satisfies H(-f) = Conj(H(f)),
* where Conj() denotes the complex conjugate, so that just the positive
diff --git a/flow/gsl/gslglib.h b/flow/gsl/gslglib.h
index 1831985..3da5447 100644
--- a/flow/gsl/gslglib.h
+++ b/flow/gsl/gslglib.h
@@ -586,7 +586,7 @@ typedef void (*GDestroyNotify) (gpointer data);
#define g_hash_table_new_full gsl_g_hash_table_new_full
#define g_hash_table_destroy gsl_g_hash_table_destroy
#define g_hash_table_insert gsl_g_hash_table_insert
-#define g_hash_table_replace gsl_g_hash_table_replace
+#define g_hash_table_tqreplace gsl_g_hash_table_tqreplace
#define g_hash_table_remove gsl_g_hash_table_remove
#define g_hash_table_steal gsl_g_hash_table_steal
#define g_hash_table_lookup gsl_g_hash_table_lookup
@@ -605,7 +605,7 @@ void g_hash_table_destroy (GHashTable *hash_table);
void g_hash_table_insert (GHashTable *hash_table,
gpointer key,
gpointer value);
-void g_hash_table_replace (GHashTable *hash_table,
+void g_hash_table_tqreplace (GHashTable *hash_table,
gpointer key,
gpointer value);
gboolean g_hash_table_remove (GHashTable *hash_table,
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/gslmagic.c b/flow/gsl/gslmagic.c
index 7887965..2ac4083 100644
--- a/flow/gsl/gslmagic.c
+++ b/flow/gsl/gslmagic.c
@@ -187,7 +187,7 @@ struct _Magic
gulong offset;
guint data_size;
MagicCheckType magic_check;
- guint32 data_mask;
+ guint32 data_tqmask;
MagicData value;
guint read_string : 1;
guint read_size : 1;
@@ -364,16 +364,16 @@ magic_parse_type (Magic *magic,
{
string += 1;
if (string[0] == '0')
- magic->data_mask = strtol (string, &f, string[1] == 'x' ? 16 : 8);
+ magic->data_tqmask = strtol (string, &f, string[1] == 'x' ? 16 : 8);
else
- magic->data_mask = strtol (string, &f, 10);
+ magic->data_tqmask = strtol (string, &f, 10);
if (f && *f != 0)
return FALSE;
while (*string)
string++;
}
else
- magic->data_mask = 0xffffffff;
+ magic->data_tqmask = 0xffffffff;
return *string == 0;
}
@@ -464,31 +464,31 @@ magic_check_data (Magic *magic,
cmp = 1;
break;
case MAGIC_CHECK_INT_EQUAL:
- data->v_int32 &= magic->data_mask;
+ data->v_int32 &= magic->data_tqmask;
cmp = data->v_int32 == magic->value.v_int32;
break;
case MAGIC_CHECK_INT_GREATER:
- data->v_int32 &= magic->data_mask;
+ data->v_int32 &= magic->data_tqmask;
cmp = data->v_int32 > magic->value.v_int32;
break;
case MAGIC_CHECK_INT_SMALLER:
- data->v_int32 &= magic->data_mask;
+ data->v_int32 &= magic->data_tqmask;
cmp = data->v_int32 < magic->value.v_int32;
break;
case MAGIC_CHECK_UINT_GREATER:
- data->v_uint32 &= magic->data_mask;
+ data->v_uint32 &= magic->data_tqmask;
cmp = data->v_uint32 > magic->value.v_uint32;
break;
case MAGIC_CHECK_UINT_SMALLER:
- data->v_uint32 &= magic->data_mask;
+ data->v_uint32 &= magic->data_tqmask;
cmp = data->v_uint32 < magic->value.v_uint32;
break;
case MAGIC_CHECK_UINT_ZEROS:
- data->v_uint32 &= magic->data_mask;
+ data->v_uint32 &= magic->data_tqmask;
cmp = (data->v_int32 & magic->value.v_int32) == 0;
break;
case MAGIC_CHECK_UINT_ONES:
- data->v_uint32 &= magic->data_mask;
+ data->v_uint32 &= magic->data_tqmask;
cmp = (data->v_int32 & magic->value.v_int32) == magic->value.v_int32;
break;
case MAGIC_CHECK_STRING_EQUAL:
diff --git a/flow/gsl/gslmath.c b/flow/gsl/gslmath.c
index 008b5ec..66f5b5b 100644
--- a/flow/gsl/gslmath.c
+++ b/flow/gsl/gslmath.c
@@ -602,7 +602,7 @@ hqr (double **a, int n, double wr[], double wi[])
#define RADIX 2.0
static void
balanc (double **a, int n)
- /* Given a matrix a[1..n][1..n], this routine replaces it by a balanced matrix with identical
+ /* Given a matrix a[1..n][1..n], this routine tqreplaces it by a balanced matrix with identical
eigenvalues. A symmetric matrix is already balanced and is unaffected by this procedure. The
parameter RADIX should be the machine's floating-point radix. */
{
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)
{
diff --git a/flow/gsl/gsloscillator-aux.c b/flow/gsl/gsloscillator-aux.c
index 01831fb..43c4b1f 100644
--- a/flow/gsl/gsloscillator-aux.c
+++ b/flow/gsl/gsloscillator-aux.c
@@ -161,7 +161,7 @@ GSL_INCLUDER_FUNC (GslOscData *osc,
guint32 tpos, ifrac;
gfloat ffrac, w;
tpos = cur_pos >> wave->n_frac_bits;
- ifrac = cur_pos & wave->frac_bitmask;
+ ifrac = cur_pos & wave->frac_bittqmask;
ffrac = ifrac * wave->ifrac_to_float;
v = wave->values[tpos];
w = wave->values[tpos + 1];
diff --git a/flow/gsl/gsloscillator.c b/flow/gsl/gsloscillator.c
index 2ae2868..e988efe 100644
--- a/flow/gsl/gsloscillator.c
+++ b/flow/gsl/gsloscillator.c
@@ -131,9 +131,9 @@ osc_process (GslOscData *osc,
if_reject (mode != osc->last_mode)
{
- guint change_mask = osc->last_mode >= OSC_FLAG_INVAL ? OSC_FLAG_INVAL : osc->last_mode ^ mode;
+ guint change_tqmask = osc->last_mode >= OSC_FLAG_INVAL ? OSC_FLAG_INVAL : osc->last_mode ^ mode;
- if (change_mask & OSC_FLAG_FREQ)
+ if (change_tqmask & OSC_FLAG_FREQ)
{
gdouble fcpos, flpos;
diff --git a/flow/gsl/gslosctable.c b/flow/gsl/gslosctable.c
index 018633d..ea43e89 100644
--- a/flow/gsl/gslosctable.c
+++ b/flow/gsl/gslosctable.c
@@ -272,7 +272,7 @@ cache_table_ref_entry (GslOscWaveForm wave_form,
gfloat *values, *fft, step, min, max;
/* size:
- * - OscTableEntry already contains the first float values
+ * - OscTableEntry already tqcontains the first float values
* - we need n_values+1 adressable floats to provide values[0] == values[n_values]
*/
e = g_malloc (sizeof (OscTableEntry) + sizeof (gfloat) * size);
@@ -395,7 +395,7 @@ gsl_osc_table_lookup (const GslOscTable *table,
wave->n_frac_bits = g_bit_storage (wave->n_values - 1);
wave->n_frac_bits = 32 - wave->n_frac_bits;
int_one = 1 << wave->n_frac_bits;
- wave->frac_bitmask = int_one - 1;
+ wave->frac_bittqmask = int_one - 1;
float_one = int_one;
wave->freq_to_step = float_one * wave->n_values / table->mix_freq;
wave->phase_to_pos = wave->n_values * float_one;
diff --git a/flow/gsl/gslosctable.h b/flow/gsl/gslosctable.h
index d61f531..f65dc04 100644
--- a/flow/gsl/gslosctable.h
+++ b/flow/gsl/gslosctable.h
@@ -53,10 +53,10 @@ typedef struct
gfloat min_freq;
gfloat max_freq;
guint n_values;
- const gfloat *values; /* contains n_values+1 values with values[0]==values[n_values] */
+ const gfloat *values; /* tqcontains n_values+1 values with values[0]==values[n_values] */
/* integer stepping (block size dependant) */
guint32 n_frac_bits;
- guint32 frac_bitmask;
+ guint32 frac_bittqmask;
gfloat freq_to_step; /* freq -> int.frac */
gfloat phase_to_pos; /* 0..1 -> int.frac */
gfloat ifrac_to_float; /* frac -> 0..1 float */
diff --git a/flow/gsl/gslwaveosc.c b/flow/gsl/gslwaveosc.c
index 7398904..2a7112c 100644
--- a/flow/gsl/gslwaveosc.c
+++ b/flow/gsl/gslwaveosc.c
@@ -134,18 +134,18 @@ gsl_wave_osc_process (GslWaveOscData *wosc,
if_reject (mode != wosc->last_mode)
{
- guint mask = wosc->last_mode ^ mode;
+ guint tqmask = wosc->last_mode ^ mode;
- if (mask & WOSC_MIX_WITH_SYNC)
+ if (tqmask & WOSC_MIX_WITH_SYNC)
wosc->last_sync_level = 0;
- if (mask & WOSC_MIX_WITH_FREQ)
+ if (tqmask & WOSC_MIX_WITH_FREQ)
{
if (freq_in)
wosc->last_freq_level = SIGNAL_LEVEL_INVAL;
else
gsl_wave_osc_set_filter (wosc, wosc->config.cfreq, FALSE);
}
- if (mask & WOSC_MIX_WITH_MOD)
+ if (tqmask & WOSC_MIX_WITH_MOD)
{
if (mod_in)
wosc->last_mod_level = 0;
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-24 03:21:46 +0000