X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fvst_plugin.cc;h=728219b0fea89e41029d342df04895fd40c76b19;hb=cf52d6e4b40111eb04b244ec054055a4ec15dbe0;hp=ad5ecb40c60903448c3276bef271fe0d34755f7e;hpb=69ac138bf23f0781df98eb65ffba0403a79d2a09;p=ardour.git

diff --git a/libs/ardour/vst_plugin.cc b/libs/ardour/vst_plugin.cc
index ad5ecb40c6..728219b0fe 100644
--- a/libs/ardour/vst_plugin.cc
+++ b/libs/ardour/vst_plugin.cc
@@ -18,7 +18,7 @@
 */
 
 #include <glib.h>
-#include <glib/gstdio.h>
+#include "pbd/gstdio_compat.h"
 
 #include <glibmm/fileutils.h>
 #include <glibmm/miscutils.h>
@@ -33,7 +33,7 @@
 #include "ardour/filesystem_paths.h"
 #include "ardour/audio_buffer.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace PBD;
@@ -44,8 +44,12 @@ 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 ()
@@ -158,7 +162,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 +199,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 +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);
 
@@ -409,8 +413,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 +514,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>
@@ -527,10 +535,14 @@ VSTPlugin::automatable () const
 
 int
 VSTPlugin::connect_and_run (BufferSet& bufs,
+		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);
@@ -565,7 +577,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 +609,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;
 }
 
@@ -679,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];
@@ -703,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));
 		}
 	}