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/mdaCombo.cpp | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) (limited to 'src/mdaCombo.cpp') diff --git a/src/mdaCombo.cpp b/src/mdaCombo.cpp index b23c9b9..da49c19 100644 --- a/src/mdaCombo.cpp +++ b/src/mdaCombo.cpp @@ -162,6 +162,16 @@ void mdaCombo::getProgramName(char *name) strcpy(name, programName); } +bool mdaCombo::getProgramNameIndexed (LvzInt32 category, LvzInt32 index, char* name) +{ + if (index == 0) + { + strcpy(name, programName); + return true; + } + return false; +} + float mdaCombo::getParameter(LvzInt32 index) { float v=0; @@ -194,7 +204,7 @@ void mdaCombo::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 float2strng(float value, char *string) { sprintf(string, "%.2f", value); } void mdaCombo::getParameterDisplay(LvzInt32 index, char *text) @@ -213,13 +223,13 @@ void mdaCombo::getParameterDisplay(LvzInt32 index, char *text) case 6: strcpy(text, "4x12 >"); break; } break; - case 1: long2string((long)(200 * fParam2 - 100), text); break; - case 2: long2string((long)(200 * fParam3 - 100), text); break; - case 3: long2string((long)(40 * fParam4 - 20), text); break; + case 1: int2strng((LvzInt32)(200 * fParam2 - 100), text); break; + case 2: int2strng((LvzInt32)(200 * fParam3 - 100), text); break; + case 3: int2strng((LvzInt32)(40 * fParam4 - 20), text); break; case 4: if(fParam5>0.5) strcpy(text, "STEREO"); else strcpy(text, "MONO"); break; - case 5: long2string((long)(100 * fParam6), text); break; - case 6: long2string((long)(100 * fParam7), text); break; + case 5: int2strng((LvzInt32)(100 * fParam6), text); break; + case 6: int2strng((LvzInt32)(100 * fParam7), text); break; } } @@ -251,7 +261,7 @@ void mdaCombo::process(float **inputs, float **outputs, LvzInt32 sampleFrames) float f1=ff1, f2=ff2, f3=ff3, f4=ff4, f5=ff5; float a2, b2, f6=ff6, f7=ff7, f8=ff8, f9=ff9, f10=ff10; float h0=hh0, h1=hh1; - long d1=del1, d2=del2, bp = bufpos; + LvzInt32 d1=del1, d2=del2, bp = bufpos; trm = trim * i * i * i * i; @@ -376,7 +386,7 @@ void mdaCombo::processReplacing(float **inputs, float **outputs, LvzInt32 sample float f1=ff1, f2=ff2, f3=ff3, f4=ff4, f5=ff5; float a2, b2, f6=ff6, f7=ff7, f8=ff8, f9=ff9, f10=ff10; float hf=hhf, hq=hhq, h0=hh0, h1=hh1; - long d1=del1, d2=del2, bp = bufpos; + LvzInt32 d1=del1, d2=del2, bp = bufpos; trm = trim * i * i * i * i; -- cgit v1.2.1