X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fvst_plugin.cc;h=32690f84d21f33226d0487f705f8f6cc4d5807c0;hb=3aade3801d5ff2c8314eefc4375475f46e913fac;hp=a18cc07356106c1f4045dde35699005811ad4b47;hpb=95ccbc452f513a9d6f70de45bc413067e568364c;p=ardour.git

diff --git a/libs/ardour/vst_plugin.cc b/libs/ardour/vst_plugin.cc
index a18cc07356..32690f84d2 100644
--- a/libs/ardour/vst_plugin.cc
+++ b/libs/ardour/vst_plugin.cc
@@ -18,14 +18,13 @@
 */
 
 #include <glib.h>
-#include <glib/gstdio.h>
+#include "pbd/gstdio_compat.h"
 
 #include <glibmm/fileutils.h>
 #include <glibmm/miscutils.h>
 
 #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;
 
@@ -570,8 +569,8 @@ VSTPlugin::connect_and_run (BufferSet& bufs,
 		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);
+			? bufs.get_audio(index).data(offset)
+			: scratch_bufs.get_audio(0).data(offset);
 	}
 
 	if (bufs.count().n_midi() > 0) {
@@ -615,6 +614,9 @@ VSTPlugin::unique_id () const
 const char *
 VSTPlugin::name () const
 {
+	if (!_info->name.empty ()) {
+		return _info->name.c_str();
+	}
 	return _handle->name;
 }
 
@@ -672,7 +674,7 @@ VSTPlugin::find_presets ()
 
 	int const vst_version = _plugin->dispatcher (_plugin, effGetVstVersion, 0, 0, NULL, 0);
 	for (int i = 0; i < _plugin->numPrograms; ++i) {
-		PresetRecord r (string_compose (X_("VST:%1:%2"), unique_id (), i), "", -1, false);
+		PresetRecord r (string_compose (X_("VST:%1:%2"), unique_id (), i), "", false);
 
 		if (vst_version >= 2) {
 			char buf[256];
@@ -702,7 +704,7 @@ VSTPlugin::find_presets ()
 			assert (uri);
 			assert (label);
 
-			PresetRecord r (uri->value(), label->value(), -1, true);
+			PresetRecord r (uri->value(), label->value(), true);
 			_presets.insert (make_pair (r.uri, r));
 		}
 	}