X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fvst_plugin.cc;h=3b7f9776d0abb4563419df28c759e7e4f65cf937;hb=cab88c6aad6782e621ae9c51aac5af24a2f3d5b8;hp=f04aa2bce199101a123b51a688adbfc1d1080e12;hpb=b92f208b521f0e733b123ef5e7552ee26b4d439d;p=ardour.git

diff --git a/libs/ardour/vst_plugin.cc b/libs/ardour/vst_plugin.cc
index f04aa2bce1..3b7f9776d0 100644
--- a/libs/ardour/vst_plugin.cc
+++ b/libs/ardour/vst_plugin.cc
@@ -44,8 +44,10 @@ VSTPlugin::VSTPlugin (AudioEngine& engine, Session& session, VSTHandle* handle)
 	, _handle (handle)
 	, _state (0)
 	, _plugin (0)
+	, _pi (0)
+	, _num (0)
 {
-
+	memset (&_timeInfo, 0, sizeof(_timeInfo));
 }
 
 VSTPlugin::~VSTPlugin ()
@@ -158,7 +160,7 @@ VSTPlugin::set_chunk (gchar const * data, bool single)
 void
 VSTPlugin::add_state (XMLNode* root) const
 {
-	LocaleGuard lg (X_("C"));
+	LocaleGuard lg;
 
 	if (_plugin->flags & 32 /* effFlagsProgramsChunks */) {
 
@@ -195,7 +197,7 @@ VSTPlugin::add_state (XMLNode* root) const
 int
 VSTPlugin::set_state (const XMLNode& node, int version)
 {
-	LocaleGuard lg (X_("C"));
+	LocaleGuard lg;
 	int ret = -1;
 
 	if (node.name() != state_node_name()) {
@@ -375,7 +377,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);
 
@@ -409,8 +411,8 @@ VSTPlugin::load_user_preset (PresetRecord r)
 
 			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);
@@ -510,7 +512,11 @@ VSTPlugin::signal_latency () const
 		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>
@@ -565,7 +571,12 @@ VSTPlugin::connect_and_run (BufferSet& bufs,
 
 	uint32_t out_index = 0;
 	for (i = 0; i < (int32_t) _plugin->numOutputs; ++i) {
-		outs[i] = scratch_bufs.get_audio(i).data(offset);
+		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);
 	}
 
 	if (bufs.count().n_midi() > 0) {
@@ -592,16 +603,6 @@ 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;
 }
 
@@ -703,8 +704,8 @@ 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);