From adacb33bf4eadcd49a744177bf3f059e7b2f2f52 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Mon, 22 Feb 2010 21:24:34 +0000 Subject: Merge with upstream r2. git-svn-id: http://svn.drobilla.net/lad/trunk/mda-lv2@2471 a436a847-0d15-0410-975c-d299462d15a1 --- src/mdaShepard.cpp | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) (limited to 'src/mdaShepard.cpp') diff --git a/src/mdaShepard.cpp b/src/mdaShepard.cpp index c9b8ec1..0e21794 100644 --- a/src/mdaShepard.cpp +++ b/src/mdaShepard.cpp @@ -91,6 +91,16 @@ void mdaShepard::getProgramName(char *name) strcpy(name, programName); } +bool mdaShepard::getProgramNameIndexed (LvzInt32 category, LvzInt32 index, char* name) +{ + if (index == 0) + { + strcpy(name, programName); + return true; + } + return false; +} + float mdaShepard::getParameter(LvzInt32 index) { float v=0; @@ -115,7 +125,7 @@ void mdaShepard::getParameterName(LvzInt32 index, char *label) } #include -void long2string(long value, char *string) { sprintf(string, "%ld", value); } +void int2strng(LvzInt32 value, char *string) { sprintf(string, "%d", value); } void mdaShepard::getParameterDisplay(LvzInt32 index, char *text) { @@ -127,8 +137,8 @@ void mdaShepard::getParameterDisplay(LvzInt32 index, char *text) case 1: strcpy(text, "RING MOD"); break; case 2: strcpy(text, "TONES+IN"); break; } break; - case 1: long2string((long)(200 * fParam1 - 100), text); break; - case 2: long2string((long)(40 * fParam2 - 20), text); break; + case 1: int2strng((LvzInt32)(200 * fParam1 - 100), text); break; + case 2: int2strng((LvzInt32)(40 * fParam2 - 20), text); break; } } @@ -153,7 +163,7 @@ void mdaShepard::process(float **inputs, float **outputs, LvzInt32 sampleFrames) float *out2 = outputs[1]; float a, b, c, d; float r=rate, dr=drate, o=out, p=pos, di; - long x=max, m=mode, i1, i2; + LvzInt32 x=max, m=mode, i1, i2; --in1; --in2; @@ -205,7 +215,7 @@ void mdaShepard::processReplacing(float **inputs, float **outputs, LvzInt32 samp float *out2 = outputs[1]; float a, b; float r=rate, dr=drate, o=out, p=pos, di; - long x=max, m=mode, i1, i2; + LvzInt32 x=max, m=mode, i1, i2; --in1; --in2; -- cgit v1.2.1