X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fvst_plugin.cc;h=c9a214c0be6a69e49de6863f512dc17c949fe11a;hb=6946bdc0830c9f0971d2cd0d54b27e343c54d96a;hp=24020e835672f4c2d2de5029706082e600b887a7;hpb=472d0ad2c62f6c3e730981ffa55ae14159d87f74;p=ardour.git diff --git a/libs/ardour/vst_plugin.cc b/libs/ardour/vst_plugin.cc index 24020e8356..c9a214c0be 100644 --- a/libs/ardour/vst_plugin.cc +++ b/libs/ardour/vst_plugin.cc @@ -18,7 +18,7 @@ */ #include -#include +#include "pbd/gstdio_compat.h" #include #include @@ -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,27 @@ 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 (const VSTPlugin& other) + : Plugin (other) + , _handle (other._handle) + , _state (other._state) + , _plugin (other._plugin) + , _pi (other._pi) + , _num (other._num) + , _midi_out_buf (other._midi_out_buf) + , _transport_frame (0) + , _transport_speed (0.f) + , _parameter_defaults (other._parameter_defaults) +{ + memset (&_timeInfo, 0, sizeof(_timeInfo)); } VSTPlugin::~VSTPlugin () @@ -87,9 +106,9 @@ VSTPlugin::set_block_size (pframes_t nframes) } float -VSTPlugin::default_value (uint32_t) +VSTPlugin::default_value (uint32_t which) { - return 0; + return _parameter_defaults[which]; } float @@ -149,8 +168,12 @@ int VSTPlugin::set_chunk (gchar const * data, bool single) { gsize size = 0; + int r = 0; guchar* raw_data = g_base64_decode (data, &size); - int const r = _plugin->dispatcher (_plugin, 24 /* effSetChunk */, single ? 1 : 0, size, raw_data, 0); + { + Glib::Threads::Mutex::Lock lm (_lock); + r = _plugin->dispatcher (_plugin, 24 /* effSetChunk */, single ? 1 : 0, size, raw_data, 0); + } g_free (raw_data); return r; } @@ -158,7 +181,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 */) { @@ -195,7 +218,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()) { @@ -319,6 +342,9 @@ VSTPlugin::get_parameter_descriptor (uint32_t which, ParameterDescriptor& desc) desc.sr_dependent = false; } + desc.normal = get_parameter (which); + _parameter_defaults[which] = desc.normal; + return 0; } @@ -375,7 +401,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 +435,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 +536,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 @@ -527,10 +557,25 @@ 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); + + Glib::Threads::Mutex::Lock lm (_state_lock, Glib::Threads::TRY_LOCK); + if (!lm.locked()) { + /* by convention 'effSetChunk' should not be called while processing + * http://www.reaper.fm/sdk/vst/vst_ext.php + * + * All VSTs don't use in-place, PluginInsert::connect_and_run() + * does clear output buffers, so we can just return. + */ + return 0; + } + + _transport_frame = start; + _transport_speed = speed; ChanCount bufs_count; bufs_count.set(DataType::AUDIO, 1); @@ -549,7 +594,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; @@ -569,8 +614,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) { @@ -614,6 +659,9 @@ VSTPlugin::unique_id () const const char * VSTPlugin::name () const { + if (!_info->name.empty ()) { + return _info->name.c_str(); + } return _handle->name; } @@ -671,7 +719,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]; @@ -695,13 +743,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)); } }