make monitor=In work during no-roll conditions without auto-input

[ardour.git] / libs / ardour / vstfxinfofile.cc

diff --git a/libs/ardour/vstfxinfofile.cc b/libs/ardour/vstfxinfofile.cc
index 076cdad55fda3770a7ed0da92a028713c4214e49..670ba95661dd887fd7f49578be4027f74f2c217c 100755 (executable)
--- a/libs/ardour/vstfxinfofile.cc
+++ b/libs/ardour/vstfxinfofile.cc
@@ -249,23 +249,8 @@ static VSTFXInfo* vstfx_info_from_plugin(VSTFX *vstfx)
       info->creator = strdup (creator);
     }
 
-#if defined LXVST_64BIT && defined VESTIGE_HEADER
-
-       /*On 64Bit the data alignment in AEffect struct is
-       incorrect using vestige.  see lxvst_plugin.cc*/
-       
-       info->UniqueID = *((int32_t *) &((AEffect*)(((char*)(plugin)) + 12))->unused_id);
-       
-#elif defined LXVST_32BIT && defined VESTIGE_HEADER
-
-    info->UniqueID = *((int32_t *) &plugin->unused_id);
-
-#else
-
     info->UniqueID = plugin->uniqueID;
 
-#endif
-
     info->Category = strdup("None");          // FIXME:  
     info->numInputs = plugin->numInputs;
     info->numOutputs = plugin->numOutputs;
@@ -288,7 +273,8 @@ static VSTFXInfo* vstfx_info_from_plugin(VSTFX *vstfx)
                plugin->dispatcher (plugin, effGetParamName, i, 0, name, 0);
                info->ParamNames[i] = strdup(name);
                
-               plugin->dispatcher (plugin, effGetParamLabel, i, 0, label, 0);
+               //NOTE: 'effGetParamLabel' is no longer defined in vestige headers
+               //plugin->dispatcher (plugin, effGetParamLabel, i, 0, label, 0);
                info->ParamLabels[i] = strdup(label);
     }
     return info;
@@ -297,9 +283,8 @@ static VSTFXInfo* vstfx_info_from_plugin(VSTFX *vstfx)
 /* A simple 'dummy' audiomaster callback which should be ok,
 we will only be instantiating the plugin in order to get its info*/
 
-static long simple_master_callback(struct AEffect *, long opcode, long, long, void *, float)
+static intptr_t simple_master_callback(struct AEffect *, int32_t opcode, int32_t, intptr_t, void *, float)
 {
-
        if (opcode == audioMasterVersion)
                return 2;
        else