summaryrefslogtreecommitdiffstats
path: root/flow/gsl/gslwaveosc.c
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-12-31 23:53:28 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-12-31 23:53:28 +0000
commitbf3bdf1468c5264a57b6aac343f8c7d1a50de848 (patch)
tree661c955b7e81b2f207d0f5ee01f1e389738ff4fe /flow/gsl/gslwaveosc.c
parent3aaef8e61de684af6ced2951ab2391cd104e0d4c (diff)
downloadarts-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/gslwaveosc.c')
-rw-r--r--flow/gsl/gslwaveosc.c8
1 files changed, 4 insertions, 4 deletions
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;