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/mdaRezFilter.cpp | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) (limited to 'src/mdaRezFilter.cpp') diff --git a/src/mdaRezFilter.cpp b/src/mdaRezFilter.cpp index 7e00db7..75b2aea 100644 --- a/src/mdaRezFilter.cpp +++ b/src/mdaRezFilter.cpp @@ -98,6 +98,16 @@ void mdaRezFilter::getProgramName(char *name) strcpy(name, programName); } +bool mdaRezFilter::getProgramNameIndexed (LvzInt32 category, LvzInt32 index, char* name) +{ + if (index == 0) + { + strcpy(name, programName); + return true; + } + return false; +} + float mdaRezFilter::getParameter(LvzInt32 index) { float v=0; @@ -136,24 +146,24 @@ void mdaRezFilter::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 mdaRezFilter::getParameterDisplay(LvzInt32 index, char *text) { switch(index) { - case 0: long2string((long)(100 * fParam0), text); break; - case 1: long2string((long)(100 * fParam1), text); break; - case 2: long2string((long)(40 *fParam2 - 20),text); break; - case 3: long2string((long)(200 * fParam3 - 100), text); break; + case 0: int2strng((LvzInt32)(100 * fParam0), text); break; + case 1: int2strng((LvzInt32)(100 * fParam1), text); break; + case 2: int2strng((LvzInt32)(40 *fParam2 - 20),text); break; + case 3: int2strng((LvzInt32)(200 * fParam3 - 100), text); break; case 4: float2strng((float)(-301.0301 / (getSampleRate() * log10(1.0 - att))),text); break; case 5: float2strng((float)(-301.0301 / (getSampleRate() * log10(rel))),text); break; - case 6: long2string((long)(200 * fParam6 - 100), text); break; + case 6: int2strng((LvzInt32)(200 * fParam6 - 100), text); break; case 7: float2strng((float)pow(10.0f, 4.f*fParam7 - 2.f), text); break; case 8: if(tthr==0.f) strcpy(text, "FREE RUN"); - else long2string((long)(20*log10(0.5*tthr)), text); break; - case 9: long2string((long)(100 * fParam9), text); break; + else int2strng((LvzInt32)(20*log10(0.5*tthr)), text); break; + case 9: int2strng((LvzInt32)(100 * fParam9), text); break; } } -- cgit v1.2.1