X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fvst_plugin.cc;h=ad5ecb40c60903448c3276bef271fe0d34755f7e;hb=dee324cc36787d84612fd636cfceb4d964792db6;hp=a18cc07356106c1f4045dde35699005811ad4b47;hpb=8c9749e42faf7808034ed8b7afce4a2fe6dc6f33;p=ardour.git

diff --git a/libs/ardour/vst_plugin.cc b/libs/ardour/vst_plugin.cc
index a18cc07356..ad5ecb40c6 100644
--- a/libs/ardour/vst_plugin.cc
+++ b/libs/ardour/vst_plugin.cc
@@ -25,7 +25,6 @@
 
 #include "pbd/floating.h"
 #include "pbd/locale_guard.h"
-#include "pbd/pathscanner.h"
 
 #include "ardour/vst_plugin.h"
 #include "ardour/vestige/aeffectx.h"
@@ -159,7 +158,7 @@ VSTPlugin::set_chunk (gchar const * data, bool single)
 void
 VSTPlugin::add_state (XMLNode* root) const
 {
-	LocaleGuard lg (X_("POSIX"));
+	LocaleGuard lg (X_("C"));
 
 	if (_plugin->flags & 32 /* effFlagsProgramsChunks */) {
 
@@ -196,7 +195,7 @@ VSTPlugin::add_state (XMLNode* root) const
 int
 VSTPlugin::set_state (const XMLNode& node, int version)
 {
-	LocaleGuard lg (X_("POSIX"));
+	LocaleGuard lg (X_("C"));
 	int ret = -1;
 
 	if (node.name() != state_node_name()) {
@@ -550,7 +549,7 @@ VSTPlugin::connect_and_run (BufferSet& bufs,
 	*/
 
 	float** ins = (float**)alloca(_plugin->numInputs*sizeof(float*));
-	float** outs = (float**)alloca(_plugin->numInputs*sizeof(float*));
+	float** outs = (float**)alloca(_plugin->numOutputs*sizeof(float*));
 
 	int32_t i;
 
@@ -566,12 +565,7 @@ VSTPlugin::connect_and_run (BufferSet& bufs,
 
 	uint32_t out_index = 0;
 	for (i = 0; i < (int32_t) _plugin->numOutputs; ++i) {
-		uint32_t  index;
-		bool      valid = false;
-		index = out_map.get(DataType::AUDIO, out_index++, &valid);
-		outs[i] = (valid)
-					? bufs.get_audio(index).data(offset)
-					: scratch_bufs.get_audio(0).data(offset);
+		outs[i] = scratch_bufs.get_audio(i).data(offset);
 	}
 
 	if (bufs.count().n_midi() > 0) {
@@ -598,6 +592,16 @@ VSTPlugin::connect_and_run (BufferSet& bufs,
 	_plugin->processReplacing (_plugin, &ins[0], &outs[0], nframes);
 	_midi_out_buf = 0;
 
+	out_index = 0;
+	for (i = 0; i < (int32_t) _plugin->numOutputs; ++i) {
+		uint32_t  index;
+		bool      valid = false;
+		index = out_map.get(DataType::AUDIO, out_index++, &valid);
+		if (!valid) {
+			continue;
+		}
+		copy_vector (bufs.get_audio(index).data(offset), outs[i], nframes);
+	}
 	return 0;
 }
 
@@ -615,6 +619,9 @@ VSTPlugin::unique_id () const
 const char *
 VSTPlugin::name () const
 {
+	if (!_info->name.empty ()) {
+		return _info->name.c_str();
+	}
 	return _handle->name;
 }