Merge with upstream r2.

git-svn-id: http://svn.drobilla.net/lad/trunk/mda-lv2@2471 a436a847-0d15-0410-975c-d299462d15a1

1 files changed, 19 insertions, 9 deletions

diff --git a/src/mdaDegrade.cpp b/src/mdaDegrade.cpp
index c6f2806..fdf276d 100644
--- a/src/mdaDegrade.cpp
+++ b/src/mdaDegrade.cpp
@@ -24,8 +24,8 @@ mdaDegrade::mdaDegrade(audioMasterCallback audioMaster)	: AudioEffectX(audioMast
 	DECLARE_LVZ_DEPRECATED(canMono) ();
 	canProcessReplacing();
 	strcpy(programName, "Degrade");
-

-  buf0 = buf1 = buf2 = buf3 = buf4 = buf5 = buf6 = buf7 = buf8 = buf9 = 0.0f;

+
+  buf0 = buf1 = buf2 = buf3 = buf4 = buf5 = buf6 = buf7 = buf8 = buf9 = 0.0f;
 
   setParameter(5, 0.5f);
 }
@@ -94,6 +94,16 @@ void mdaDegrade::getProgramName(char *name)
 	strcpy(name, programName);
 }
 
+bool mdaDegrade::getProgramNameIndexed (LvzInt32 category, LvzInt32 index, char* name)
+{
+	if (index == 0) 
+	{
+	    strcpy(name, programName);
+	    return true;
+	}
+	return false;
+}
+
 float mdaDegrade::getParameter(LvzInt32 index)
 {
 	float v=0;
@@ -124,18 +134,18 @@ void mdaDegrade::getParameterName(LvzInt32 index, char *label)
 }
 
 #include <stdio.h>
-void long2string(long value, char *string) { sprintf(string, "%ld", value); }
+void int2strng(LvzInt32 value, char *string) { sprintf(string, "%d", value); }
 
 void mdaDegrade::getParameterDisplay(LvzInt32 index, char *text)
 {
 	switch(index)
   {
-    case 0: long2string((long)(-30.0 * (1.0 - fParam1)), text); break;
-    case 1: long2string((long)(4.0 + 12.0 * fParam2), text); break;
-    case 2: long2string((long)(getSampleRate()/tn), text); break;
-    case 3: long2string((long)pow(10.0f, 2.30104f + 2.f*fParam4), text); break;
-    case 4: long2string((long)(200.0 * fabs(fParam5 - 0.5)), text); break;
-    case 5: long2string((long)(40.0 * fParam6 - 20.0), text); break;
+    case 0: int2strng((LvzInt32)(-30.0 * (1.0 - fParam1)), text); break;
+    case 1: int2strng((LvzInt32)(4.0 + 12.0 * fParam2), text); break;
+    case 2: int2strng((LvzInt32)(getSampleRate()/tn), text); break;
+    case 3: int2strng((LvzInt32)pow(10.0f, 2.30104f + 2.f*fParam4), text); break;
+    case 4: int2strng((LvzInt32)(200.0 * fabs(fParam5 - 0.5)), text); break;
+    case 5: int2strng((LvzInt32)(40.0 * fParam6 - 20.0), text); break;
   }
 }