X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fvst_plugin.cc;h=ad5ecb40c60903448c3276bef271fe0d34755f7e;hb=9458fce148c862f5504d88754d5418972dd4046b;hp=333b7d893a54ec97961e2c02fc5852f7edd63b06;hpb=40c162d6096f9bb338b602fb7845234133285411;p=ardour.git diff --git a/libs/ardour/vst_plugin.cc b/libs/ardour/vst_plugin.cc index 333b7d893a..ad5ecb40c6 100644 --- a/libs/ardour/vst_plugin.cc +++ b/libs/ardour/vst_plugin.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2004 Paul Davis + Copyright (C) 2010 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,122 +17,104 @@ */ -#include -#include -#include -#include - -#include -#include // so libraptor doesn't complain -#include -#include -#include // for memmove -#include -#include +#include +#include +#include #include -#include -#include - -#include "pbd/compose.h" -#include "pbd/error.h" -#include "pbd/pathscanner.h" -#include "pbd/xml++.h" - -#include +#include "pbd/floating.h" +#include "pbd/locale_guard.h" +#include "ardour/vst_plugin.h" +#include "ardour/vestige/aeffectx.h" #include "ardour/session.h" -#include "ardour/audioengine.h" +#include "ardour/vst_types.h" #include "ardour/filesystem_paths.h" -#include "ardour/vst_plugin.h" -#include "ardour/buffer_set.h" #include "ardour/audio_buffer.h" -#include "ardour/midi_buffer.h" - -#include "pbd/stl_delete.h" #include "i18n.h" -#include using namespace std; -using namespace ARDOUR; using namespace PBD; -using std::min; -using std::max; +using namespace ARDOUR; -VSTPlugin::VSTPlugin (AudioEngine& e, Session& session, FSTHandle* h) - : Plugin (e, session) +VSTPlugin::VSTPlugin (AudioEngine& engine, Session& session, VSTHandle* handle) + : Plugin (engine, session) + , _handle (handle) + , _state (0) + , _plugin (0) { - handle = h; - - if ((_fst = fst_instantiate (handle, Session::vst_callback, this)) == 0) { - throw failed_constructor(); - } - _plugin = _fst->plugin; - _plugin->user = this; +} - /* set rate and blocksize */ +VSTPlugin::~VSTPlugin () +{ - _plugin->dispatcher (_plugin, effSetSampleRate, 0, 0, NULL, - (float) session.frame_rate()); - _plugin->dispatcher (_plugin, effSetBlockSize, 0, - session.get_block_size(), NULL, 0.0f); +} - /* set program to zero */ +void +VSTPlugin::set_plugin (AEffect* e) +{ + _plugin = e; + _plugin->user = this; - _plugin->dispatcher (_plugin, effSetProgram, 0, 0, NULL, 0.0f); + /* set rate and blocksize */ - // Plugin::setup_controls (); + _plugin->dispatcher (_plugin, effSetSampleRate, 0, 0, NULL, (float) _session.frame_rate()); + _plugin->dispatcher (_plugin, effSetBlockSize, 0, _session.get_block_size(), NULL, 0.0f); } -VSTPlugin::VSTPlugin (const VSTPlugin &other) - : Plugin (other) +void +VSTPlugin::deactivate () { - handle = other.handle; - - if ((_fst = fst_instantiate (handle, Session::vst_callback, this)) == 0) { - throw failed_constructor(); - } - _plugin = _fst->plugin; - - // Plugin::setup_controls (); + _plugin->dispatcher (_plugin, effMainsChanged, 0, 0, NULL, 0.0f); } -VSTPlugin::~VSTPlugin () +void +VSTPlugin::activate () { - deactivate (); - fst_close (_fst); + _plugin->dispatcher (_plugin, effMainsChanged, 0, 1, NULL, 0.0f); } -int +int VSTPlugin::set_block_size (pframes_t nframes) { deactivate (); _plugin->dispatcher (_plugin, effSetBlockSize, 0, nframes, NULL, 0.0f); activate (); - return 0; + return 0; } float -VSTPlugin::default_value (uint32_t port) +VSTPlugin::default_value (uint32_t) { return 0; } -void -VSTPlugin::set_parameter (uint32_t which, float val) -{ - _plugin->setParameter (_plugin, which, val); - //ParameterChanged (which, val); /* EMIT SIGNAL */ -} - float VSTPlugin::get_parameter (uint32_t which) const { return _plugin->getParameter (_plugin, which); +} + +void +VSTPlugin::set_parameter (uint32_t which, float newval) +{ + float oldval = get_parameter (which); + + if (PBD::floateq (oldval, newval, 1)) { + return; + } + + _plugin->setParameter (_plugin, which, newval); + float curval = get_parameter (which); + + if (!PBD::floateq (curval, oldval, 1)) { + /* value has changed, follow rest of the notification path */ + Plugin::set_parameter (which, newval); + } } uint32_t @@ -147,14 +129,14 @@ VSTPlugin::nth_parameter (uint32_t n, bool& ok) const * @return 0-terminated base64-encoded data; must be passed to g_free () by caller. */ gchar * -VSTPlugin::get_chunk (bool single) +VSTPlugin::get_chunk (bool single) const { guchar* data; int32_t data_size = _plugin->dispatcher (_plugin, 23 /* effGetChunk */, single ? 1 : 0, 0, &data, 0); if (data_size == 0) { return 0; } - + return g_base64_encode (data, data_size); } @@ -173,23 +155,16 @@ VSTPlugin::set_chunk (gchar const * data, bool single) return r; } -XMLNode& -VSTPlugin::get_state() +void +VSTPlugin::add_state (XMLNode* root) const { - XMLNode *root = new XMLNode (state_node_name()); - LocaleGuard lg (X_("POSIX")); - - if (_fst->current_program != -1) { - char buf[32]; - snprintf (buf, sizeof (buf), "%d", _fst->current_program); - root->add_property ("current-program", buf); - } + LocaleGuard lg (X_("C")); if (_plugin->flags & 32 /* effFlagsProgramsChunks */) { gchar* data = get_chunk (false); if (data == 0) { - return *root; + return; } /* store information */ @@ -208,47 +183,39 @@ VSTPlugin::get_state() for (int32_t n = 0; n < _plugin->numParams; ++n) { char index[64]; char val[32]; - snprintf (index, sizeof (index), "param_%d", n); + snprintf (index, sizeof (index), "param-%d", n); snprintf (val, sizeof (val), "%.12g", _plugin->getParameter (_plugin, n)); parameters->add_property (index, val); } root->add_child_nocopy (*parameters); } - - return *root; } int -VSTPlugin::set_state(const XMLNode& node, 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()) { error << _("Bad node sent to VSTPlugin::set_state") << endmsg; return 0; } - const XMLProperty* prop; - - if ((prop = node.property ("current-program")) != 0) { - _fst->current_program = atoi (prop->value().c_str()); - } - +#ifndef NO_PLUGIN_STATE XMLNode* child; - int ret = -1; if ((child = find_named_node (node, X_("chunk"))) != 0) { XMLPropertyList::const_iterator i; XMLNodeList::const_iterator n; - int ret = -1; 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); } } @@ -261,37 +228,36 @@ VSTPlugin::set_state(const XMLNode& node, int) int32_t param; float val; - sscanf ((*i)->name().c_str(), "param_%d", ¶m); + sscanf ((*i)->name().c_str(), "param-%d", ¶m); sscanf ((*i)->value().c_str(), "%f", &val); _plugin->setParameter (_plugin, param, val); } - /* program number is not knowable */ - - _fst->current_program = -1; - ret = 0; } +#endif + Plugin::set_state (node, version); return ret; } + int VSTPlugin::get_parameter_descriptor (uint32_t which, ParameterDescriptor& desc) const { VstParameterProperties prop; + memset (&prop, 0, sizeof (VstParameterProperties)); desc.min_unbound = false; desc.max_unbound = false; prop.flags = 0; if (_plugin->dispatcher (_plugin, effGetParameterProperties, which, 0, &prop, 0)) { -#ifdef VESTIGE_COMPLETE - /* 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; @@ -322,18 +288,22 @@ 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; desc.label = prop.label; -#endif } else { /* old style */ char label[64]; - label[0] = '\0'; + /* some VST plugins expect this buffer to be zero-filled */ + memset (label, 0, sizeof (label)); _plugin->dispatcher (_plugin, effGetParamName, which, 0, label, 0); @@ -353,106 +323,183 @@ VSTPlugin::get_parameter_descriptor (uint32_t which, ParameterDescriptor& desc) } bool -VSTPlugin::load_preset (const string& name) +VSTPlugin::load_preset (PresetRecord r) { - if (_plugin->flags & 32 /* effFlagsProgramsChunks */) { + bool s; - XMLTree* t = presets_tree (); - if (t == 0) { - return false; - } + if (r.user) { + s = load_user_preset (r); + } else { + s = load_plugin_preset (r); + } - XMLNode* root = t->root (); + if (s) { + Plugin::load_preset (r); + } - /* Load a user preset chunk from our XML file and send it via a circuitous route to the plugin */ - - for (XMLNodeList::const_iterator i = root->children().begin(); i != root->children().end(); ++i) { - assert ((*i)->name() == X_("ChunkPreset")); - - XMLProperty* uri = (*i)->property (X_("uri")); - XMLProperty* label = (*i)->property (X_("label")); + return s; +} - assert (uri); - assert (label); +bool +VSTPlugin::load_plugin_preset (PresetRecord r) +{ + /* This is a plugin-provided preset. + We can't dispatch directly here; too many plugins expects only one GUI thread. + */ + + /* Extract the index of this preset from the URI */ + int id; + int index; +#ifndef NDEBUG + int const p = sscanf (r.uri.c_str(), "VST:%d:%d", &id, &index); + assert (p == 2); +#else + sscanf (r.uri.c_str(), "VST:%d:%d", &id, &index); +#endif + _state->want_program = index; + return true; +} + +bool +VSTPlugin::load_user_preset (PresetRecord r) +{ + /* This is a user preset; we load it, and this code also knows about the + non-direct-dispatch thing. + */ + + boost::shared_ptr t (presets_tree ()); + if (t == 0) { + return false; + } + + XMLNode* root = t->root (); + + for (XMLNodeList::const_iterator i = root->children().begin(); i != root->children().end(); ++i) { + XMLProperty* label = (*i)->property (X_("label")); + + assert (label); + + if (label->value() != r.label) { + continue; + } + + if (_plugin->flags & 32 /* effFlagsProgramsChunks */) { + + /* Load a user preset chunk from our XML file and send it via a circuitous route to the plugin */ - if (label->value() == name) { + if (_state->wanted_chunk) { + g_free (_state->wanted_chunk); + } - if (_fst->wanted_chunk) { - g_free (_fst->wanted_chunk); + for (XMLNodeList::const_iterator j = (*i)->children().begin(); j != (*i)->children().end(); ++j) { + if ((*j)->is_content ()) { + /* we can't dispatch directly here; too many plugins expect only one GUI thread */ + gsize size = 0; + guchar* raw_data = g_base64_decode ((*j)->content().c_str(), &size); + _state->wanted_chunk = raw_data; + _state->wanted_chunk_size = size; + _state->want_chunk = 1; + return true; } - - for (XMLNodeList::const_iterator j = (*i)->children().begin(); j != (*i)->children().end(); ++j) { - if ((*j)->is_content ()) { - /* we can't dispatch directly here; too many plugins expect only one GUI thread */ - gsize size = 0; - guchar* raw_data = g_base64_decode ((*j)->content().c_str(), &size); - _fst->wanted_chunk = raw_data; - _fst->wanted_chunk_size = size; - _fst->want_chunk = 1; - return true; - } + } + + 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")); + + assert (index); + assert (value); + + set_parameter (atoi (index->value().c_str()), atof (value->value().c_str ())); } } + return true; } - - return false; } - - return true; + return false; } string VSTPlugin::do_save_preset (string name) { - if (_plugin->flags & 32 /* effFlagsProgramsChunks */) { + boost::shared_ptr t (presets_tree ()); + if (t == 0) { + return ""; + } - XMLTree* t = presets_tree (); - if (t == 0) { - return ""; - } + XMLNode* p = 0; + /* XXX: use of _presets.size() + 1 for the unique ID here is dubious at best */ + string const uri = string_compose (X_("VST:%1:%2"), unique_id (), _presets.size() + 1); - /* Add a chunk to our XML file of user presets */ + if (_plugin->flags & 32 /* effFlagsProgramsChunks */) { - XMLNode* p = new XMLNode (X_("ChunkPreset")); - /* XXX: use of _presets.size() + 1 for the unique ID here is dubious at best */ - string const uri = string_compose (X_("VST:%1:%2"), unique_id (), _presets.size() + 1); + p = new XMLNode (X_("ChunkPreset")); p->add_property (X_("uri"), uri); p->add_property (X_("label"), name); gchar* data = get_chunk (true); p->add_content (string (data)); g_free (data); - t->root()->add_child_nocopy (*p); - sys::path f = ARDOUR::user_config_directory (); - f /= "presets"; - f /= "vst"; + } else { - t->write (f.to_string ()); - delete t; - return uri; + p = new XMLNode (X_("Preset")); + p->add_property (X_("uri"), uri); + p->add_property (X_("label"), name); + + for (uint32_t i = 0; i < parameter_count(); ++i) { + if (parameter_is_input (i)) { + XMLNode* c = new XMLNode (X_("Parameter")); + c->add_property (X_("index"), string_compose ("%1", i)); + c->add_property (X_("value"), string_compose ("%1", get_parameter (i))); + p->add_child_nocopy (*c); + } + } } - return ""; + t->root()->add_child_nocopy (*p); + + std::string f = Glib::build_filename (ARDOUR::user_config_directory (), "presets"); + f = Glib::build_filename (f, presets_file ()); + + t->write (f); + return uri; } void VSTPlugin::do_remove_preset (string name) { - if (_plugin->flags & 32 /* effFlagsProgramsChunks */) { - - /* XXX: TODO */ - - error << _("no support for presets using chunks at this time") - << endmsg; + boost::shared_ptr t (presets_tree ()); + if (t == 0) { return; } + + t->root()->remove_nodes_and_delete (X_("label"), name); + + std::string f = Glib::build_filename (ARDOUR::user_config_directory (), "presets"); + f = Glib::build_filename (f, presets_file ()); + + t->write (f); } string VSTPlugin::describe_parameter (Evoral::Parameter param) { char name[64]; + memset (name, 0, sizeof (name)); + + /* some VST plugins expect this buffer to be zero-filled */ + _plugin->dispatcher (_plugin, effGetParamName, param.id(), 0, name, 0); + + if (name[0] == '\0') { + strcpy (name, _("Unknown")); + } + return name; } @@ -463,11 +510,7 @@ VSTPlugin::signal_latency () const return _user_latency; } -#ifdef VESTIGE_HEADER - return *((framecnt_t *) (((char *) &_plugin->flags) + 12)); /* initialDelay */ -#else - return _plugin->initial_delay; -#endif + return *((int32_t *) (((char *) &_plugin->flags) + 12)); /* initialDelay */ } set @@ -475,7 +518,7 @@ VSTPlugin::automatable () const { set ret; - for (uint32_t i = 0; i < parameter_count(); ++i){ + for (uint32_t i = 0; i < parameter_count(); ++i) { ret.insert (ret.end(), Evoral::Parameter(PluginAutomation, 0, i)); } @@ -487,74 +530,99 @@ VSTPlugin::connect_and_run (BufferSet& bufs, ChanMapping in_map, ChanMapping out_map, pframes_t nframes, framecnt_t offset) { - float *ins[_plugin->numInputs]; - float *outs[_plugin->numOutputs]; - int32_t i; + Plugin::connect_and_run (bufs, in_map, out_map, nframes, offset); - const uint32_t nbufs = bufs.count().n_audio(); + ChanCount bufs_count; + bufs_count.set(DataType::AUDIO, 1); + bufs_count.set(DataType::MIDI, 1); + _midi_out_buf = 0; - int in_index = 0; - for (i = 0; i < (int32_t) _plugin->numInputs; ++i) { - ins[i] = bufs.get_audio(min((uint32_t) in_index, nbufs - 1)).data() + offset; - in_index++; - } + BufferSet& silent_bufs = _session.get_silent_buffers(bufs_count); + BufferSet& scratch_bufs = _session.get_scratch_buffers(bufs_count); - int out_index = 0; - for (i = 0; i < (int32_t) _plugin->numOutputs; ++i) { - outs[i] = bufs.get_audio(min((uint32_t) out_index, nbufs - 1)).data() + offset; + /* VC++ doesn't support the C99 extension that allows + + typeName foo[variableDefiningSize]; - /* unbelievably, several VST plugins still rely on Cubase - behaviour and do not silence the buffer in processReplacing - when they have no output. - */ + Use alloca instead of dynamic array (rather than std::vector which + allocs on the heap) because this is realtime code. + */ - // memset (outs[i], 0, sizeof (Sample) * nframes); - out_index++; + float** ins = (float**)alloca(_plugin->numInputs*sizeof(float*)); + float** outs = (float**)alloca(_plugin->numOutputs*sizeof(float*)); + + int32_t i; + + uint32_t in_index = 0; + for (i = 0; i < (int32_t) _plugin->numInputs; ++i) { + uint32_t index; + bool valid = false; + index = in_map.get(DataType::AUDIO, in_index++, &valid); + ins[i] = (valid) + ? bufs.get_audio(index).data(offset) + : silent_bufs.get_audio(0).data(offset); } + uint32_t out_index = 0; + for (i = 0; i < (int32_t) _plugin->numOutputs; ++i) { + outs[i] = scratch_bufs.get_audio(i).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; - _plugin->processReplacing (_plugin, ins, outs, nframes); - + 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; } -void -VSTPlugin::deactivate () -{ - _plugin->dispatcher (_plugin, effMainsChanged, 0, 0, NULL, 0.0f); -} - -void -VSTPlugin::activate () -{ - _plugin->dispatcher (_plugin, effMainsChanged, 0, 1, NULL, 0.0f); -} - string -VSTPlugin::unique_id() const +VSTPlugin::unique_id () const { char buf[32]; -#ifdef VESTIGE_HEADER - snprintf (buf, sizeof (buf), "%d", *((int32_t*) &_plugin->unused_id)); -#else - snprintf (buf, sizeof (buf), "%d", _plugin->uniqueID); -#endif - return string (buf); + snprintf (buf, sizeof (buf), "%d", _plugin->uniqueID); + + return string (buf); } const char * VSTPlugin::name () const { - return handle->name; + if (!_info->name.empty ()) { + return _info->name.c_str(); + } + return _handle->name; } const char * @@ -566,11 +634,11 @@ VSTPlugin::maker () const const char * VSTPlugin::label () const { - return handle->name; + return _handle->name; } uint32_t -VSTPlugin::parameter_count() const +VSTPlugin::parameter_count () const { return _plugin->numParams; } @@ -582,7 +650,7 @@ VSTPlugin::has_editor () const } void -VSTPlugin::print_parameter (uint32_t param, char *buf, uint32_t len) const +VSTPlugin::print_parameter (uint32_t param, char *buf, uint32_t /*len*/) const { char *first_nonws; @@ -596,6 +664,7 @@ VSTPlugin::print_parameter (uint32_t param, char *buf, uint32_t len) const while (*first_nonws && isspace (*first_nonws)) { first_nonws++; } + if (*first_nonws == '\0') { return; } @@ -603,84 +672,48 @@ VSTPlugin::print_parameter (uint32_t param, char *buf, uint32_t len) const memmove (buf, first_nonws, strlen (buf) - (first_nonws - buf) + 1); } -PluginPtr -VSTPluginInfo::load (Session& session) -{ - try { - PluginPtr plugin; - - if (Config->get_use_vst()) { - FSTHandle* handle; - - handle = fst_load(path.c_str()); - - if ( (int)handle == -1) { - error << string_compose(_("VST: cannot load module from \"%1\""), path) << endmsg; - } else { - plugin.reset (new VSTPlugin (session.engine(), session, handle)); - } - } else { - error << _("You asked ardour to not use any VST plugins") << endmsg; - return PluginPtr ((Plugin*) 0); - } - - plugin->set_info(PluginInfoPtr(new VSTPluginInfo(*this))); - return plugin; - } - - catch (failed_constructor &err) { - return PluginPtr ((Plugin*) 0); - } -} - -vector -VSTPlugin::get_presets () +void +VSTPlugin::find_presets () { - vector p; - /* Built-in 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), ""); - + PresetRecord r (string_compose (X_("VST:%1:%2"), unique_id (), i), "", -1, false); + if (vst_version >= 2) { char buf[256]; - _plugin->dispatcher (_plugin, 29, i, 0, buf, 0); - r.label = buf; + if (_plugin->dispatcher (_plugin, 29, i, 0, buf, 0) == 1) { + r.label = buf; + } else { + r.label = string_compose (_("Preset %1"), i); + } } else { r.label = string_compose (_("Preset %1"), i); } - p.push_back (r); _presets.insert (make_pair (r.uri, r)); } /* User presets from our XML file */ - XMLTree* t = presets_tree (); + boost::shared_ptr t (presets_tree ()); if (t) { XMLNode* root = t->root (); for (XMLNodeList::const_iterator i = root->children().begin(); i != root->children().end(); ++i) { - assert ((*i)->name() == X_("ChunkPreset")); - XMLProperty* uri = (*i)->property (X_("uri")); XMLProperty* label = (*i)->property (X_("label")); assert (uri); assert (label); - PresetRecord r (uri->value(), label->value()); - p.push_back (r); + PresetRecord r (uri->value(), label->value(), -1, true); _presets.insert (make_pair (r.uri, r)); } } - delete t; - - return p; } /** @return XMLTree with our user presets; could be a new one if no existing @@ -691,21 +724,22 @@ VSTPlugin::presets_tree () const { XMLTree* t = new XMLTree; - sys::path p = ARDOUR::user_config_directory (); - p /= "presets"; + std::string p = Glib::build_filename (ARDOUR::user_config_directory (), "presets"); - if (!is_directory (p)) { - create_directory (p); + if (!Glib::file_test (p, Glib::FILE_TEST_IS_DIR)) { + if (g_mkdir_with_parents (p.c_str(), 0755) != 0) { + error << _("Unable to make VST presets directory") << endmsg; + }; } - p /= "vst"; + p = Glib::build_filename (p, presets_file ()); - if (!exists (p)) { + if (!Glib::file_test (p, Glib::FILE_TEST_EXISTS)) { t->set_root (new XMLNode (X_("VSTPresets"))); return t; } - - t->set_filename (p.to_string ()); + + t->set_filename (p); if (!t->read ()) { delete t; return 0; @@ -721,7 +755,9 @@ VSTPlugin::first_user_preset_index () const return _plugin->numPrograms; } -VSTPluginInfo::VSTPluginInfo() +string +VSTPlugin::presets_file () const { - type = ARDOUR::VST; + return string_compose ("vst-%1", unique_id ()); } +