X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fvst_plugin.cc;h=b517b480b6f4a504a95a0b60b07c91583723daa8;hb=0a52b325f4e1eaf39be65a24f9a594ffe1f66e79;hp=5c9c94bdac9a5d303570bc81729125201bf1f10f;hpb=a882e96db1367c26660fd3d3079e9e3e19b1e149;p=ardour.git

diff --git a/libs/ardour/vst_plugin.cc b/libs/ardour/vst_plugin.cc
index 5c9c94bdac..b517b480b6 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"
@@ -45,13 +44,17 @@ VSTPlugin::VSTPlugin (AudioEngine& engine, Session& session, VSTHandle* handle)
 	, _handle (handle)
 	, _state (0)
 	, _plugin (0)
+	, _pi (0)
+	, _num (0)
+	, _transport_frame (0)
+	, _transport_speed (0.f)
 {
-	
+	memset (&_timeInfo, 0, sizeof(_timeInfo));
 }
 
 VSTPlugin::~VSTPlugin ()
 {
-	
+
 }
 
 void
@@ -78,7 +81,7 @@ VSTPlugin::activate ()
 	_plugin->dispatcher (_plugin, effMainsChanged, 0, 1, NULL, 0.0f);
 }
 
-int 
+int
 VSTPlugin::set_block_size (pframes_t nframes)
 {
 	deactivate ();
@@ -93,13 +96,13 @@ VSTPlugin::default_value (uint32_t)
 	return 0;
 }
 
-float 
+float
 VSTPlugin::get_parameter (uint32_t which) const
 {
 	return _plugin->getParameter (_plugin, which);
 }
 
-void 
+void
 VSTPlugin::set_parameter (uint32_t which, float newval)
 {
 	float oldval = get_parameter (which);
@@ -109,7 +112,7 @@ VSTPlugin::set_parameter (uint32_t which, float newval)
 	}
 
 	_plugin->setParameter (_plugin, which, newval);
-	
+
 	float curval = get_parameter (which);
 
 	if (!PBD::floateq (curval, oldval, 1)) {
@@ -159,7 +162,7 @@ VSTPlugin::set_chunk (gchar const * data, bool single)
 void
 VSTPlugin::add_state (XMLNode* root) const
 {
-	LocaleGuard lg (X_("POSIX"));
+	LocaleGuard lg;
 
 	if (_plugin->flags & 32 /* effFlagsProgramsChunks */) {
 
@@ -196,7 +199,7 @@ VSTPlugin::add_state (XMLNode* root) const
 int
 VSTPlugin::set_state (const XMLNode& node, int version)
 {
-	LocaleGuard lg (X_("POSIX"));
+	LocaleGuard lg;
 	int ret = -1;
 
 	if (node.name() != state_node_name()) {
@@ -215,8 +218,8 @@ VSTPlugin::set_state (const XMLNode& node, int version)
 		for (n = child->children ().begin (); n != child->children ().end (); ++n) {
 			if ((*n)->is_content ()) {
 				/* XXX: this may be dubious for the same reasons that we delay
-				   execution of load_preset.
-				*/
+					 execution of load_preset.
+					 */
 				ret = set_chunk ((*n)->content().c_str(), false);
 			}
 		}
@@ -250,6 +253,7 @@ VSTPlugin::get_parameter_descriptor (uint32_t which, ParameterDescriptor& desc)
 {
 	VstParameterProperties prop;
 
+	memset (&prop, 0, sizeof (VstParameterProperties));
 	desc.min_unbound = false;
 	desc.max_unbound = false;
 	prop.flags = 0;
@@ -257,6 +261,7 @@ VSTPlugin::get_parameter_descriptor (uint32_t which, ParameterDescriptor& desc)
 	if (_plugin->dispatcher (_plugin, effGetParameterProperties, which, 0, &prop, 0)) {
 
 		/* i have yet to find or hear of a VST plugin that uses this */
+		/* RG: faust2vsti does use this :) */
 
 		if (prop.flags & kVstParameterUsesIntegerMinMax) {
 			desc.lower = prop.minInteger;
@@ -287,6 +292,10 @@ VSTPlugin::get_parameter_descriptor (uint32_t which, ParameterDescriptor& desc)
 			desc.largestep = desc.step * 10.0f;
 		}
 
+		if (strlen(prop.label) == 0) {
+			_plugin->dispatcher (_plugin, effGetParamName, which, 0, prop.label, 0);
+		}
+
 		desc.toggled = prop.flags & kVstParameterIsSwitch;
 		desc.logarithmic = false;
 		desc.sr_dependent = false;
@@ -301,7 +310,7 @@ VSTPlugin::get_parameter_descriptor (uint32_t which, ParameterDescriptor& desc)
 		memset (label, 0, sizeof (label));
 
 		_plugin->dispatcher (_plugin, effGetParamName, which, 0, label, 0);
-		
+
 		desc.label = label;
 		desc.integer_step = false;
 		desc.lower = 0.0f;
@@ -335,7 +344,7 @@ VSTPlugin::load_preset (PresetRecord r)
 	return s;
 }
 
-bool 
+bool
 VSTPlugin::load_plugin_preset (PresetRecord r)
 {
 	/* This is a plugin-provided preset.
@@ -348,15 +357,14 @@ VSTPlugin::load_plugin_preset (PresetRecord r)
 #ifndef NDEBUG
 	int const p = sscanf (r.uri.c_str(), "VST:%d:%d", &id, &index);
 	assert (p == 2);
-#else 
+#else
 	sscanf (r.uri.c_str(), "VST:%d:%d", &id, &index);
 #endif
-	
 	_state->want_program = index;
 	return true;
 }
 
-bool 
+bool
 VSTPlugin::load_user_preset (PresetRecord r)
 {
 	/* This is a user preset; we load it, and this code also knows about the
@@ -371,7 +379,7 @@ VSTPlugin::load_user_preset (PresetRecord r)
 	XMLNode* root = t->root ();
 
 	for (XMLNodeList::const_iterator i = root->children().begin(); i != root->children().end(); ++i) {
-		XMLProperty* label = (*i)->property (X_("label"));
+		XMLProperty const * label = (*i)->property (X_("label"));
 
 		assert (label);
 
@@ -402,11 +410,11 @@ VSTPlugin::load_user_preset (PresetRecord r)
 			return false;
 
 		} else {
-			
+
 			for (XMLNodeList::const_iterator j = (*i)->children().begin(); j != (*i)->children().end(); ++j) {
 				if ((*j)->name() == X_("Parameter")) {
-						XMLProperty* index = (*j)->property (X_("index"));
-						XMLProperty* value = (*j)->property (X_("value"));
+						XMLProperty const * index = (*j)->property (X_("index"));
+						XMLProperty const * value = (*j)->property (X_("value"));
 
 						assert (index);
 						assert (value);
@@ -420,7 +428,7 @@ VSTPlugin::load_user_preset (PresetRecord r)
 	return false;
 }
 
-string 
+string
 VSTPlugin::do_save_preset (string name)
 {
 	boost::shared_ptr<XMLTree> t (presets_tree ());
@@ -466,7 +474,7 @@ VSTPlugin::do_save_preset (string name)
 	return uri;
 }
 
-void 
+void
 VSTPlugin::do_remove_preset (string name)
 {
 	boost::shared_ptr<XMLTree> t (presets_tree ());
@@ -482,7 +490,7 @@ VSTPlugin::do_remove_preset (string name)
 	t->write (f);
 }
 
-string 
+string
 VSTPlugin::describe_parameter (Evoral::Parameter param)
 {
 	char name[64];
@@ -499,17 +507,21 @@ VSTPlugin::describe_parameter (Evoral::Parameter param)
 	return name;
 }
 
-framecnt_t 
+framecnt_t
 VSTPlugin::signal_latency () const
 {
 	if (_user_latency) {
 		return _user_latency;
 	}
 
+#if ( defined(__x86_64__) || defined(_M_X64) )
+	return *((int32_t *) (((char *) &_plugin->flags) + 24)); /* initialDelay */
+#else
 	return *((int32_t *) (((char *) &_plugin->flags) + 12)); /* initialDelay */
+#endif
 }
 
-set<Evoral::Parameter> 
+set<Evoral::Parameter>
 VSTPlugin::automatable () const
 {
 	set<Evoral::Parameter> ret;
@@ -523,28 +535,33 @@ VSTPlugin::automatable () const
 
 int
 VSTPlugin::connect_and_run (BufferSet& bufs,
-			    ChanMapping in_map, ChanMapping out_map,
-			    pframes_t nframes, framecnt_t offset)
+		framepos_t start, framepos_t end, double speed,
+		ChanMapping in_map, ChanMapping out_map,
+		pframes_t nframes, framecnt_t offset)
 {
-	Plugin::connect_and_run (bufs, in_map, out_map, nframes, offset);
+	Plugin::connect_and_run(bufs, start, end, speed, in_map, out_map, nframes, offset);
+
+	_transport_frame = start;
+	_transport_speed = speed;
 
 	ChanCount bufs_count;
 	bufs_count.set(DataType::AUDIO, 1);
 	bufs_count.set(DataType::MIDI, 1);
+	_midi_out_buf = 0;
 
 	BufferSet& silent_bufs  = _session.get_silent_buffers(bufs_count);
 	BufferSet& scratch_bufs = _session.get_scratch_buffers(bufs_count);
 
-	/* VC++ doesn't support the C99 extension that allows 
+	/* VC++ doesn't support the C99 extension that allows
 
 	   typeName foo[variableDefiningSize];
-	   
+
 	   Use alloca instead of dynamic array (rather than std::vector which
 	   allocs on the heap) because this is realtime code.
 	*/
-	   
+
 	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;
 
@@ -564,63 +581,82 @@ 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) {
-		VstEvents* v = bufs.get_vst_midi (0);
-		_plugin->dispatcher (_plugin, effProcessEvents, 0, 0, v, 0);
+		VstEvents* v = 0;
+		bool valid = false;
+		const uint32_t buf_index_in = in_map.get(DataType::MIDI, 0, &valid);
+		if (valid) {
+			v = bufs.get_vst_midi (buf_index_in);
+		}
+		valid = false;
+		const uint32_t buf_index_out = out_map.get(DataType::MIDI, 0, &valid);
+		if (valid) {
+			_midi_out_buf = &bufs.get_midi(buf_index_out);
+			_midi_out_buf->silence(0, 0);
+		} else {
+			_midi_out_buf = 0;
+		}
+		if (v) {
+			_plugin->dispatcher (_plugin, effProcessEvents, 0, 0, v, 0);
+		}
 	}
 
 	/* we already know it can support processReplacing */
 	_plugin->processReplacing (_plugin, &ins[0], &outs[0], nframes);
+	_midi_out_buf = 0;
 
 	return 0;
 }
 
-string 
+string
 VSTPlugin::unique_id () const
 {
 	char buf[32];
 
 	snprintf (buf, sizeof (buf), "%d", _plugin->uniqueID);
-	
+
 	return string (buf);
 }
 
 
-const char * 
+const char *
 VSTPlugin::name () const
 {
+	if (!_info->name.empty ()) {
+		return _info->name.c_str();
+	}
 	return _handle->name;
 }
 
-const char * 
+const char *
 VSTPlugin::maker () const
 {
 	return _info->creator.c_str();
 }
 
-const char * 
+const char *
 VSTPlugin::label () const
 {
 	return _handle->name;
 }
 
-uint32_t 
+uint32_t
 VSTPlugin::parameter_count () const
 {
 	return _plugin->numParams;
 }
 
-bool 
+bool
 VSTPlugin::has_editor () const
 {
 	return _plugin->flags & effFlagsHasEditor;
 }
 
-void 
+void
 VSTPlugin::print_parameter (uint32_t param, char *buf, uint32_t /*len*/) const
 {
 	char *first_nonws;
@@ -650,7 +686,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];
@@ -674,13 +710,13 @@ VSTPlugin::find_presets ()
 		XMLNode* root = t->root ();
 		for (XMLNodeList::const_iterator i = root->children().begin(); i != root->children().end(); ++i) {
 
-			XMLProperty* uri = (*i)->property (X_("uri"));
-			XMLProperty* label = (*i)->property (X_("label"));
+			XMLProperty const * uri = (*i)->property (X_("uri"));
+			XMLProperty const * label = (*i)->property (X_("label"));
 
 			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));
 		}
 	}