aboutsummaryrefslogtreecommitdiffstats
path: root/src/mdaDither.cpp
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2012-03-28 04:51:46 +0000
committerDavid Robillard <d@drobilla.net>2012-03-28 04:51:46 +0000
commit42cb454c24e2772696c281860e333becffc2e2ca (patch)
tree06fdd0f78a29a4cc0d10c08d12d2ef9636e16ba1 /src/mdaDither.cpp
parente878fbbae2d686d86848b5353747fd9e359cb2d0 (diff)
downloadmda.lv2-42cb454c24e2772696c281860e333becffc2e2ca.tar.gz
mda.lv2-42cb454c24e2772696c281860e333becffc2e2ca.tar.bz2
mda.lv2-42cb454c24e2772696c281860e333becffc2e2ca.zip
Remove pointless int32 typedef.
git-svn-id: http://svn.drobilla.net/lad/trunk/plugins/mda.lv2@4127 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/mdaDither.cpp')
-rw-r--r--src/mdaDither.cpp48
1 files changed, 24 insertions, 24 deletions
diff --git a/src/mdaDither.cpp b/src/mdaDither.cpp
index e1aae27..34095fc 100644
--- a/src/mdaDither.cpp
+++ b/src/mdaDither.cpp
@@ -53,7 +53,7 @@ bool mdaDither::getProductString(char* text) { strcpy(text, "MDA Dither"); retu
bool mdaDither::getVendorString(char* text) { strcpy(text, "mda"); return true; }
bool mdaDither::getEffectName(char* name) { strcpy(name, "Dither"); return true; }
-void mdaDither::setParameter(LvzInt32 index, float value)
+void mdaDither::setParameter(int32_t index, float value)
{
switch(index)
{
@@ -81,7 +81,7 @@ void mdaDither::setParameter(LvzInt32 index, float value)
dith = 2.0f * fParam2 / (wlen * (float)32767);
shap=0.0f;
- switch((LvzInt32)(fParam1*3.9)) //dither mode
+ switch((int32_t)(fParam1*3.9)) //dither mode
{
case 0: dith = 0.0f; break; //off
case 3: shap = 0.5f; break; //noise shaping
@@ -108,7 +108,7 @@ void mdaDither::getProgramName(char *name)
strcpy(name, programName);
}
-bool mdaDither::getProgramNameIndexed (LvzInt32 category, LvzInt32 index, char* name)
+bool mdaDither::getProgramNameIndexed (int32_t category, int32_t index, char* name)
{
if (index == 0)
{
@@ -118,7 +118,7 @@ bool mdaDither::getProgramNameIndexed (LvzInt32 category, LvzInt32 index, char*
return false;
}
-float mdaDither::getParameter(LvzInt32 index)
+float mdaDither::getParameter(int32_t index)
{
float v=0;
@@ -133,7 +133,7 @@ float mdaDither::getParameter(LvzInt32 index)
return v;
}
-void mdaDither::getParameterName(LvzInt32 index, char *label)
+void mdaDither::getParameterName(int32_t index, char *label)
{
switch(index)
{
@@ -146,15 +146,15 @@ void mdaDither::getParameterName(LvzInt32 index, char *label)
}
#include <stdio.h>
-void int2strng(LvzInt32 value, char *string) { sprintf(string, "%d", value); }
+void int2strng(int32_t value, char *string) { sprintf(string, "%d", value); }
void float2strng(float value, char *string) { sprintf(string, "%.2f", value); }
-void mdaDither::getParameterDisplay(LvzInt32 index, char *text)
+void mdaDither::getParameterDisplay(int32_t index, char *text)
{
switch(index)
{
- case 0: int2strng((LvzInt32)bits, text); break;
- case 1: switch((LvzInt32)(fParam1*3.9))
+ case 0: int2strng((int32_t)bits, text); break;
+ case 1: switch((int32_t)(fParam1*3.9))
{ case 0: strcpy(text, "OFF"); break;
case 1: strcpy(text, "TRI"); break;
case 2: strcpy(text, "HP-TRI"); break;
@@ -164,12 +164,12 @@ void mdaDither::getParameterDisplay(LvzInt32 index, char *text)
case 3: float2strng(4.0f * fParam3 - 2.0f, text); break;
case 4: if(fParam4>0.1f)
if(gain<0.0001f) strcpy(text, "-80");
- else int2strng((LvzInt32)(20.0 * log10(gain)), text);
+ else int2strng((int32_t)(20.0 * log10(gain)), text);
else strcpy(text, "OFF"); break;
}
}
-void mdaDither::getParameterLabel(LvzInt32 index, char *label)
+void mdaDither::getParameterLabel(int32_t index, char *label)
{
switch(index)
{
@@ -184,7 +184,7 @@ void mdaDither::getParameterLabel(LvzInt32 index, char *label)
//--------------------------------------------------------------------------------
// process
-void mdaDither::process(float **inputs, float **outputs, LvzInt32 sampleFrames)
+void mdaDither::process(float **inputs, float **outputs, int32_t sampleFrames)
{
float *in1 = inputs[0];
float *in2 = inputs[1];
@@ -195,9 +195,9 @@ void mdaDither::process(float **inputs, float **outputs, LvzInt32 sampleFrames)
float dl=dith; //dither level
float o=offs, w=wlen, wi=1.0f/wlen; //DC offset, word length & inverse
float g=gain; //gain for Zoom mode
- LvzInt32 r1=rnd1, r2, r3=rnd3, r4; //random numbers for dither
- LvzInt32 m=1; //dither mode
- if((LvzInt32)(fParam1 * 3.9f)==1) m=0; //what is the fastest if(?)
+ int32_t r1=rnd1, r2, r3=rnd3, r4; //random numbers for dither
+ int32_t m=1; //dither mode
+ if((int32_t)(fParam1 * 3.9f)==1) m=0; //what is the fastest if(?)
--in1;
--in2;
@@ -218,14 +218,14 @@ void mdaDither::process(float **inputs, float **outputs, LvzInt32 sampleFrames)
a = g * a + sl * (s1 + s1 - s2);
aa = a + o + dl * (float)(r1 - r2);
if(aa<0.0f) aa-=wi;
- aa = wi * (float)(LvzInt32)(w * aa);
+ aa = wi * (float)(int32_t)(w * aa);
s2 = s1;
s1 = a - aa;
b = g * b + sl * (s3 + s3 - s4);
bb = b + o + dl * (float)(r3 - r4);
if(bb<0.0f) bb-=wi;
- bb = wi * (float)(LvzInt32)(w * bb);
+ bb = wi * (float)(int32_t)(w * bb);
s4 = s3;
s3 = b - bb;
@@ -237,7 +237,7 @@ void mdaDither::process(float **inputs, float **outputs, LvzInt32 sampleFrames)
rnd1=r1; rnd3=r3;
}
-void mdaDither::processReplacing(float **inputs, float **outputs, LvzInt32 sampleFrames)
+void mdaDither::processReplacing(float **inputs, float **outputs, int32_t sampleFrames)
{
float *in1 = inputs[0];
float *in2 = inputs[1];
@@ -248,9 +248,9 @@ void mdaDither::processReplacing(float **inputs, float **outputs, LvzInt32 sampl
float dl=dith; //dither level
float o=offs, w=wlen, wi=1.0f/wlen; //DC offset, word length & inverse
float g=gain; //gain for Zoom mode
- LvzInt32 r1=rnd1, r2, r3=rnd3, r4; //random numbers for dither
- LvzInt32 m=1; //dither mode
- if((LvzInt32)(fParam1 * 3.9f)==1) m=0; //what is the fastest if(?)
+ int32_t r1=rnd1, r2, r3=rnd3, r4; //random numbers for dither
+ int32_t m=1; //dither mode
+ if((int32_t)(fParam1 * 3.9f)==1) m=0; //what is the fastest if(?)
--in1;
--in2;
@@ -268,15 +268,15 @@ void mdaDither::processReplacing(float **inputs, float **outputs, LvzInt32 sampl
a = g * a + sl * (s1 + s1 - s2); //target level + error feedback
aa = a + o + dl * (float)(r1 - r2); // + offset + dither
- if(aa<0.0f) aa-=wi; //(LvzInt32) truncates towards zero!
- aa = wi * (float)(LvzInt32)(w * aa); //truncate
+ if(aa<0.0f) aa-=wi; //(int32_t) truncates towards zero!
+ aa = wi * (float)(int32_t)(w * aa); //truncate
s2 = s1;
s1 = a - aa; //error feedback: 2nd order noise shaping
b = g * b + sl * (s3 + s3 - s4);
bb = b + o + dl * (float)(r3 - r4);
if(bb<0.0f) bb-=wi;
- bb = wi * (float)(LvzInt32)(w * bb);
+ bb = wi * (float)(int32_t)(w * bb);
s4 = s3;
s3 = b - bb;