From 9529f203c09d6dc8f4c2f12c3add9ec906f4bdba Mon Sep 17 00:00:00 2001 From: David Robillard Date: Tue, 22 May 2012 23:25:45 +0000 Subject: Remove some silly temporary variables and unnecessary stores. git-svn-id: http://svn.drobilla.net/lad/trunk/plugins/blip.lv2@4440 a436a847-0d15-0410-975c-d299462d15a1 --- src/amp.c | 7 ++----- src/difference.c | 20 +++----------------- src/interpolator.c | 5 ++--- src/product.c | 14 ++------------ src/ratio.c | 17 ++++------------- src/sawtooth.c | 6 +----- src/square.c | 6 +----- src/sum.c | 14 ++------------ 8 files changed, 17 insertions(+), 72 deletions(-) (limited to 'src') diff --git a/src/amp.c b/src/amp.c index 4c528f9..edb9291 100644 --- a/src/amp.c +++ b/src/amp.c @@ -112,12 +112,9 @@ runAmp_gcia_oa(LV2_Handle instance, /* Output */ float* output = plugin->output; - float in; - float scale = (float)EXPF(M_LN10 * gain * 0.05f); + const float scale = (float)EXPF(M_LN10 * gain * 0.05f); for (uint32_t s = 0; s < sample_count; s++) { - in = input[s]; - - output[s] = scale * in; + output[s] = scale * input[s]; } } diff --git a/src/difference.c b/src/difference.c index 0e4ea30..bee9552 100644 --- a/src/difference.c +++ b/src/difference.c @@ -82,14 +82,8 @@ runDifference_iama_oa(LV2_Handle instance, /* Output (array of floats of length sample_count) */ float* output = plugin->output; - float in; - float mi; - for (uint32_t s = 0; s < sample_count; ++s) { - in = input[s]; - mi = minus[s]; - - output[s] = in - mi; + output[s] = input[s] - minus[s]; } } @@ -108,12 +102,8 @@ runDifference_iamc_oa(LV2_Handle instance, /* Output (array of floats of length sample_count) */ float* output = plugin->output; - float in; - for (uint32_t s = 0; s < sample_count; ++s) { - in = input[s]; - - output[s] = in - minus; + output[s] = input[s] - minus; } } @@ -132,12 +122,8 @@ runDifference_icma_oa(LV2_Handle instance, /* Output (array of floats of length sample_count) */ float* output = plugin->output; - float mi; - for (uint32_t s = 0; s < sample_count; ++s) { - mi = minus[s]; - - output[s] = input - mi; + output[s] = input - minus[s]; } } diff --git a/src/interpolator.c b/src/interpolator.c index 67d7114..52a6c37 100644 --- a/src/interpolator.c +++ b/src/interpolator.c @@ -108,11 +108,10 @@ runInterpolator(LV2_Handle instance, float p1 = plugin->p1; float p0 = plugin->p0; - float interval; - float inv_scount = 1.0f / (float)sample_count; + const float inv_scount = 1.0f / (float)sample_count; for (uint32_t s = 0; s < sample_count; ++s) { - interval = (float)s * inv_scount; + const float interval = (float)s * inv_scount; output[s] = interpolate(interval, p1, p0, input); } diff --git a/src/product.c b/src/product.c index 3ac4470..0b892a1 100644 --- a/src/product.c +++ b/src/product.c @@ -82,14 +82,8 @@ runProduct_iaia_oa(LV2_Handle instance, /* Output (array of floats of length sample_count) */ float* output = plugin->output; - float in1; - float in2; - for (uint32_t s = 0; s < sample_count; ++s) { - in1 = input1[s]; - in2 = input2[s]; - - output[s] = in1 * in2; + output[s] = input1[s] * input2[s]; } } @@ -108,12 +102,8 @@ runProduct_iaic_oa(LV2_Handle instance, /* Output (array of floats of length sample_count) */ float* output = plugin->output; - float in1; - for (uint32_t s = 0; s < sample_count; ++s) { - in1 = input1[s]; - - output[s] = in1 * input2; + output[s] = input1[s] * input2; } } diff --git a/src/ratio.c b/src/ratio.c index 48a7336..4659f4f 100644 --- a/src/ratio.c +++ b/src/ratio.c @@ -84,12 +84,9 @@ runRatio_nada_oa(LV2_Handle instance, /* Output (array of floats of length sample_count) */ float* output = plugin->output; - float n; - float d; - for (uint32_t s = 0; s < sample_count; ++s) { - n = numerator[s]; - d = denominator[s]; + const float n = numerator[s]; + float d = denominator[s]; d = COPYSIGNF(f_max(FABSF(d), 1e-16f), d); @@ -112,14 +109,10 @@ runRatio_nadc_oa(LV2_Handle instance, /* Output (array of floats of length sample_count) */ float* output = plugin->output; - float n; - denominator = COPYSIGNF(f_max(FABSF(denominator), 1e-16f), denominator); for (uint32_t s = 0; s < sample_count; ++s) { - n = numerator[s]; - - output[s] = n / denominator; + output[s] = numerator[s] / denominator; } } @@ -138,10 +131,8 @@ runRatio_ncda_oa(LV2_Handle instance, /* Output (array of floats of length sample_count) */ float* output = plugin->output; - float d; - for (uint32_t s = 0; s < sample_count; ++s) { - d = denominator[s]; + float d = denominator[s]; d = COPYSIGNF(f_max(FABSF(d), 1e-16f), d); output[s] = numerator / d; diff --git a/src/sawtooth.c b/src/sawtooth.c index 24aa529..3c242e1 100644 --- a/src/sawtooth.c +++ b/src/sawtooth.c @@ -98,13 +98,9 @@ runSawtooth_fa_oa(LV2_Handle instance, Wavedata* wdat = &plugin->wdat; float phase = plugin->phase; - float freq; - for (uint32_t s = 0; s < sample_count; s++) { - freq = frequency[s]; - /* Lookup table to play */ - wavedata_get_table(wdat, freq); + wavedata_get_table(wdat, frequency[s]); output[s] = wavedata_get_sample(wdat, phase); diff --git a/src/square.c b/src/square.c index 66f38a2..fb78859 100644 --- a/src/square.c +++ b/src/square.c @@ -98,13 +98,9 @@ runSquare_fa_oa(LV2_Handle instance, Wavedata* wdat = &plugin->wdat; float phase = plugin->phase; - float freq; - for (uint32_t s = 0; s < sample_count; ++s) { - freq = frequency[s]; - /* Get table to play */ - wavedata_get_table(wdat, freq); + wavedata_get_table(wdat, frequency[s]); /* Get interpolated sample */ output[s] = wavedata_get_sample(wdat, phase); diff --git a/src/sum.c b/src/sum.c index ead52d7..2384d73 100644 --- a/src/sum.c +++ b/src/sum.c @@ -82,14 +82,8 @@ runSum_iaia_oa(LV2_Handle instance, /* Output (array of floats of length sample_count) */ float* output = plugin->output; - float in1; - float in2; - for (uint32_t s = 0; s < sample_count; ++s) { - in1 = input1[s]; - in2 = input2[s]; - - output[s] = in1 + in2; + output[s] = input1[s] + input2[s]; } } @@ -108,12 +102,8 @@ runSum_iaic_oa(LV2_Handle instance, /* Output (array of floats of length sample_count) */ float* output = plugin->output; - float in1; - for (uint32_t s = 0; s < sample_count; ++s) { - in1 = input1[s]; - - output[s] = in1 + input2; + output[s] = input1[s] + input2; } } -- cgit v1.2.1