diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-12-31 23:53:28 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-12-31 23:53:28 +0000 |
| commit | bf3bdf1468c5264a57b6aac343f8c7d1a50de848 (patch) | |
| tree | 661c955b7e81b2f207d0f5ee01f1e389738ff4fe /flow/gsl/gslengine.c | |
| parent | 3aaef8e61de684af6ced2951ab2391cd104e0d4c (diff) | |
| download | arts-bf3bdf1468c5264a57b6aac343f8c7d1a50de848.tar.gz arts-bf3bdf1468c5264a57b6aac343f8c7d1a50de848.zip | |
Automated conversion
aRts now compiles with TQt for Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/dependencies/arts@1210526 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'flow/gsl/gslengine.c')
| -rw-r--r-- | flow/gsl/gslengine.c | 12 |
1 files changed, 6 insertions, 6 deletions
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"); |