merge (with conflict fixes) with master (even against rgareus' recommendation)

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

diff --git a/libs/ardour/vst_plugin.cc b/libs/ardour/vst_plugin.cc
index 5eafe7a612664991ba3bf94639f0b4296e36fd3c..168bd0506ec25c83e0dc13e970eeb654eef6ac17 100644 (file)
--- a/libs/ardour/vst_plugin.cc
+++ b/libs/ardour/vst_plugin.cc
@@ -298,7 +298,7 @@ VSTPlugin::get_parameter_descriptor (uint32_t which, ParameterDescriptor& desc)
 
                char label[64];
                /* some VST plugins expect this buffer to be zero-filled */
-               memset (label, sizeof (label), 0);
+               memset (label, 0, sizeof (label));
 
                _plugin->dispatcher (_plugin, effGetParamName, which, 0, label, 0);
                
@@ -486,7 +486,7 @@ string
 VSTPlugin::describe_parameter (Evoral::Parameter param)
 {
        char name[64];
-       memset (name, sizeof (name), 0);
+       memset (name, 0, sizeof (name));
 
        /* some VST plugins expect this buffer to be zero-filled */