projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Marginal cleanup.
[ardour.git]
/
libs
/
ardour
/
plugin_manager.cc
diff --git
a/libs/ardour/plugin_manager.cc
b/libs/ardour/plugin_manager.cc
index 88dc4c13a7d9db82e27365fe7299ec1d03e2d7cb..a666e7b53ecab8372578342ba18aca1fe62097f3 100644
(file)
--- a/
libs/ardour/plugin_manager.cc
+++ b/
libs/ardour/plugin_manager.cc
@@
-30,15
+30,15
@@
#include <cstdlib>
#include <fstream>
#include <cstdlib>
#include <fstream>
-#ifdef VST_SUPPORT
-#include
<fst.h>
+#ifdef
WINDOWS_
VST_SUPPORT
+#include
"fst.h"
#include "pbd/basename.h"
#include <cstring>
#include "pbd/basename.h"
#include <cstring>
-#endif // VST_SUPPORT
+#endif //
WINDOWS_
VST_SUPPORT
#ifdef LXVST_SUPPORT
#ifdef LXVST_SUPPORT
-#include
<ardour/vstfx.h>
-#include
<pbd/basename.h>
+#include
"ardour/linux_vst_support.h"
+#include
"pbd/basename.h"
#include <cstring>
#endif //LXVST_SUPPORT
#include <cstring>
#endif //LXVST_SUPPORT
@@
-53,14
+53,14
@@
#include "ardour/ladspa_plugin.h"
#include "ardour/plugin.h"
#include "ardour/plugin_manager.h"
#include "ardour/ladspa_plugin.h"
#include "ardour/plugin.h"
#include "ardour/plugin_manager.h"
-#include "ardour/
sess
ion.h"
+#include "ardour/
rc_configurat
ion.h"
#ifdef LV2_SUPPORT
#include "ardour/lv2_plugin.h"
#endif
#ifdef LV2_SUPPORT
#include "ardour/lv2_plugin.h"
#endif
-#ifdef VST_SUPPORT
-#include "ardour/vst_plugin.h"
+#ifdef
WINDOWS_
VST_SUPPORT
+#include "ardour/
windows_
vst_plugin.h"
#endif
#ifdef LXVST_SUPPORT
#endif
#ifdef LXVST_SUPPORT
@@
-81,10
+81,19
@@
using namespace ARDOUR;
using namespace PBD;
using namespace std;
using namespace PBD;
using namespace std;
-PluginManager* PluginManager::_manager = 0;
+PluginManager* PluginManager::_instance = 0;
+
+PluginManager&
+PluginManager::instance()
+{
+ if (!_instance) {
+ _instance = new PluginManager;
+ }
+ return *_instance;
+}
PluginManager::PluginManager ()
PluginManager::PluginManager ()
- : _vst_plugin_info(0)
+ : _
windows_
vst_plugin_info(0)
, _lxvst_plugin_info(0)
, _ladspa_plugin_info(0)
, _lv2_plugin_info(0)
, _lxvst_plugin_info(0)
, _ladspa_plugin_info(0)
, _lv2_plugin_info(0)
@@
-105,11
+114,11
@@
PluginManager::PluginManager ()
add_lrdf_data(lrdf_path);
add_ladspa_presets();
add_lrdf_data(lrdf_path);
add_ladspa_presets();
-#ifdef VST_SUPPORT
- if (Config->get_use_
vst
()) {
- add_
vst_presets
();
+#ifdef
WINDOWS_
VST_SUPPORT
+ if (Config->get_use_
windows_vst
()) {
+ add_
windows_vst_presets
();
}
}
-#endif /* VST_SUPPORT */
+#endif /*
WINDOWS_
VST_SUPPORT */
#ifdef LXVST_SUPPORT
if (Config->get_use_lxvst()) {
#ifdef LXVST_SUPPORT
if (Config->get_use_lxvst()) {
@@
-122,9
+131,9
@@
PluginManager::PluginManager ()
}
if ((s = getenv ("VST_PATH"))) {
}
if ((s = getenv ("VST_PATH"))) {
- vst_path = s;
+
windows_
vst_path = s;
} else if ((s = getenv ("VST_PLUGINS"))) {
} else if ((s = getenv ("VST_PLUGINS"))) {
- vst_path = s;
+
windows_
vst_path = s;
}
if ((s = getenv ("LXVST_PATH"))) {
}
if ((s = getenv ("LXVST_PATH"))) {
@@
-133,8
+142,8
@@
PluginManager::PluginManager ()
lxvst_path = s;
}
lxvst_path = s;
}
- if (_
manager
== 0) {
- _
manager
= this;
+ if (_
instance
== 0) {
+ _
instance
= this;
}
/* the plugin manager is constructed too early to use Profile */
}
/* the plugin manager is constructed too early to use Profile */
@@
-167,11
+176,11
@@
PluginManager::refresh ()
#ifdef LV2_SUPPORT
lv2_refresh ();
#endif
#ifdef LV2_SUPPORT
lv2_refresh ();
#endif
-#ifdef VST_SUPPORT
- if (Config->get_use_vst()) {
- vst_refresh ();
+#ifdef
WINDOWS_
VST_SUPPORT
+ if (Config->get_use_
windows_
vst()) {
+
windows_
vst_refresh ();
}
}
-#endif // VST_SUPPORT
+#endif //
WINDOWS_
VST_SUPPORT
#ifdef LXVST_SUPPORT
if(Config->get_use_lxvst()) {
#ifdef LXVST_SUPPORT
if(Config->get_use_lxvst()) {
@@
-263,7
+272,7
@@
PluginManager::ladspa_discover_from_path (string /*path*/)
vector<string *>::iterator x;
int ret = 0;
vector<string *>::iterator x;
int ret = 0;
- plugin_objects = scanner (ladspa_path, ladspa_filter, 0,
tru
e, true);
+ plugin_objects = scanner (ladspa_path, ladspa_filter, 0,
fals
e, true);
if (plugin_objects) {
for (x = plugin_objects->begin(); x != plugin_objects->end (); ++x) {
if (plugin_objects) {
for (x = plugin_objects->begin(); x != plugin_objects->end (); ++x) {
@@
-291,9
+300,9
@@
PluginManager::add_ladspa_presets()
}
void
}
void
-PluginManager::add_vst_presets()
+PluginManager::add_
windows_
vst_presets()
{
{
- add_presets ("vst");
+ add_presets ("
windows-
vst");
}
void
}
void
@@
-316,7
+325,7
@@
PluginManager::add_presets(string domain)
}
string path = string_compose("%1/.%2/rdf", envvar, domain);
}
string path = string_compose("%1/.%2/rdf", envvar, domain);
- presets = scanner (path, rdf_filter, 0,
tru
e, true);
+ presets = scanner (path, rdf_filter, 0,
fals
e, true);
if (presets) {
for (x = presets->begin(); x != presets->end (); ++x) {
if (presets) {
for (x = presets->begin(); x != presets->end (); ++x) {
@@
-337,7
+346,7
@@
PluginManager::add_lrdf_data (const string &path)
vector<string *>* rdf_files;
vector<string *>::iterator x;
vector<string *>* rdf_files;
vector<string *>::iterator x;
- rdf_files = scanner (path, rdf_filter, 0,
tru
e, true);
+ rdf_files = scanner (path, rdf_filter, 0,
fals
e, true);
if (rdf_files) {
for (x = rdf_files->begin(); x != rdf_files->end (); ++x) {
if (rdf_files) {
for (x = rdf_files->begin(); x != rdf_files->end (); ++x) {
@@
-517,35
+526,36
@@
PluginManager::au_refresh ()
#endif
#endif
-#ifdef VST_SUPPORT
+#ifdef
WINDOWS_
VST_SUPPORT
void
void
-PluginManager::vst_refresh ()
+PluginManager::
windows_
vst_refresh ()
{
{
- if (_vst_plugin_info)
- _vst_plugin_info->clear ();
- else
- _vst_plugin_info = new ARDOUR::PluginInfoList();
+ if (_windows_vst_plugin_info) {
+ _windows_vst_plugin_info->clear ();
+ } else {
+ _windows_vst_plugin_info = new ARDOUR::PluginInfoList();
+ }
- if (vst_path.length() == 0) {
- vst_path = "/usr/local/lib/vst:/usr/lib/vst";
+ if (
windows_
vst_path.length() == 0) {
+
windows_
vst_path = "/usr/local/lib/vst:/usr/lib/vst";
}
}
-
vst_discover_from_path (
vst_path);
+
windows_vst_discover_from_path (windows_
vst_path);
}
int
}
int
-PluginManager::add_vst_directory (string path)
+PluginManager::add_
windows_
vst_directory (string path)
{
{
- if (vst_discover_from_path (path) == 0) {
- vst_path += ':';
- vst_path += path;
+ if (
windows_
vst_discover_from_path (path) == 0) {
+
windows_
vst_path += ':';
+
windows_
vst_path += path;
return 0;
}
return -1;
}
return 0;
}
return -1;
}
-static bool vst_filter (const string& str, void *arg)
+static bool
windows_
vst_filter (const string& str, void *arg)
{
/* Not a dotfile, has a prefix before a period, suffix is "dll" */
{
/* Not a dotfile, has a prefix before a period, suffix is "dll" */
@@
-553,20
+563,20
@@
static bool vst_filter (const string& str, void *arg)
}
int
}
int
-PluginManager::vst_discover_from_path (string path)
+PluginManager::
windows_
vst_discover_from_path (string path)
{
PathScanner scanner;
vector<string *> *plugin_objects;
vector<string *>::iterator x;
int ret = 0;
{
PathScanner scanner;
vector<string *> *plugin_objects;
vector<string *>::iterator x;
int ret = 0;
-
info << "detecting VST plugins along " << path << endmsg
;
+
DEBUG_TRACE (DEBUG::PluginManager, string_compose ("detecting Windows VST plugins along %1\n", path))
;
- plugin_objects = scanner (
vst_path, vst_filter, 0, tru
e, true);
+ plugin_objects = scanner (
windows_vst_path, windows_vst_filter, 0, fals
e, true);
if (plugin_objects) {
for (x = plugin_objects->begin(); x != plugin_objects->end (); ++x) {
if (plugin_objects) {
for (x = plugin_objects->begin(); x != plugin_objects->end (); ++x) {
- vst_discover (**x);
+
windows_
vst_discover (**x);
}
}
}
}
@@
-575,13
+585,13
@@
PluginManager::vst_discover_from_path (string path)
}
int
}
int
-PluginManager::vst_discover (string path)
+PluginManager::
windows_
vst_discover (string path)
{
{
-
F
STInfo* finfo;
+
V
STInfo* finfo;
char buf[32];
if ((finfo = fst_get_info (const_cast<char *> (path.c_str()))) == 0) {
char buf[32];
if ((finfo = fst_get_info (const_cast<char *> (path.c_str()))) == 0) {
- warning << "Cannot get VST information from " << path << endmsg;
+ warning << "Cannot get
Windows
VST information from " << path << endmsg;
return -1;
}
return -1;
}
@@
-591,7
+601,7
@@
PluginManager::vst_discover (string path)
<< endl;
}
<< endl;
}
- PluginInfoPtr info
(new
VSTPluginInfo);
+ PluginInfoPtr info
(new Windows
VSTPluginInfo);
/* what a joke freeware VST is */
/* what a joke freeware VST is */
@@
-611,15
+621,15
@@
PluginManager::vst_discover (string path)
info->n_inputs.set_audio (finfo->numInputs);
info->n_outputs.set_audio (finfo->numOutputs);
info->n_inputs.set_midi (finfo->wantMidi ? 1 : 0);
info->n_inputs.set_audio (finfo->numInputs);
info->n_outputs.set_audio (finfo->numOutputs);
info->n_inputs.set_midi (finfo->wantMidi ? 1 : 0);
- info->type = ARDOUR::VST;
+ info->type = ARDOUR::
Windows_
VST;
- _vst_plugin_info->push_back (info);
+ _
windows_
vst_plugin_info->push_back (info);
fst_free_info (finfo);
return 0;
}
fst_free_info (finfo);
return 0;
}
-#endif // VST_SUPPORT
+#endif //
WINDOWS_
VST_SUPPORT
#ifdef LXVST_SUPPORT
#ifdef LXVST_SUPPORT
@@
-665,9
+675,9
@@
PluginManager::lxvst_discover_from_path (string path)
vector<string *>::iterator x;
int ret = 0;
vector<string *>::iterator x;
int ret = 0;
-
info << "Discovering linuxVST plugins along " << path << endmsg
;
+
DEBUG_TRACE (DEBUG::PluginManager, string_compose ("Discovering linuxVST plugins along %1\n", path))
;
- plugin_objects = scanner (lxvst_path, lxvst_filter, 0,
tru
e, true);
+ plugin_objects = scanner (lxvst_path, lxvst_filter, 0,
fals
e, true);
if (plugin_objects) {
for (x = plugin_objects->begin(); x != plugin_objects->end (); ++x) {
if (plugin_objects) {
for (x = plugin_objects->begin(); x != plugin_objects->end (); ++x) {
@@
-675,8
+685,6
@@
PluginManager::lxvst_discover_from_path (string path)
}
}
}
}
- info << "Done linuxVST discover" << endmsg;
-
vector_delete (plugin_objects);
return ret;
}
vector_delete (plugin_objects);
return ret;
}
@@
-684,11
+692,10
@@
PluginManager::lxvst_discover_from_path (string path)
int
PluginManager::lxvst_discover (string path)
{
int
PluginManager::lxvst_discover (string path)
{
- VST
FX
Info* finfo;
+ VSTInfo* finfo;
char buf[32];
if ((finfo = vstfx_get_info (const_cast<char *> (path.c_str()))) == 0) {
char buf[32];
if ((finfo = vstfx_get_info (const_cast<char *> (path.c_str()))) == 0) {
- warning << "Cannot get linuxVST information from " << path << endmsg;
return -1;
}
return -1;
}
@@
-728,6
+735,7
@@
PluginManager::lxvst_discover (string path)
if (!_lxvst_plugin_info->empty()) {
for (PluginInfoList::iterator i =_lxvst_plugin_info->begin(); i != _lxvst_plugin_info->end(); ++i) {
if ((info->type == (*i)->type)&&(info->unique_id == (*i)->unique_id)) {
if (!_lxvst_plugin_info->empty()) {
for (PluginInfoList::iterator i =_lxvst_plugin_info->begin(); i != _lxvst_plugin_info->end(); ++i) {
if ((info->type == (*i)->type)&&(info->unique_id == (*i)->unique_id)) {
+ warning << "Ignoring duplicate Linux VST plugin " << info->name << "\n";
vstfx_free_info(finfo);
return 0;
}
vstfx_free_info(finfo);
return 0;
}
@@
-779,8
+787,8
@@
PluginManager::save_statuses ()
case LV2:
ofs << "LV2";
break;
case LV2:
ofs << "LV2";
break;
- case VST:
- ofs << "VST";
+ case
Windows_
VST:
+ ofs << "
Windows-
VST";
break;
case LXVST:
ofs << "LXVST";
break;
case LXVST:
ofs << "LXVST";
@@
-867,8
+875,8
@@
PluginManager::load_statuses ()
type = AudioUnit;
} else if (stype == "LV2") {
type = LV2;
type = AudioUnit;
} else if (stype == "LV2") {
type = LV2;
- } else if (stype == "VST") {
- type = VST;
+ } else if (stype == "
Windows-
VST") {
+ type =
Windows_
VST;
} else if (stype == "LXVST") {
type = LXVST;
} else {
} else if (stype == "LXVST") {
type = LXVST;
} else {
@@
-899,12
+907,13
@@
PluginManager::set_status (PluginType t, string id, PluginStatusType status)
}
ARDOUR::PluginInfoList&
}
ARDOUR::PluginInfoList&
-PluginManager::vst_plugin_info ()
+PluginManager::
windows_
vst_plugin_info ()
{
{
-#ifdef VST_SUPPORT
- if (!_vst_plugin_info)
- vst_refresh();
- return *_vst_plugin_info;
+#ifdef WINDOWS_VST_SUPPORT
+ if (!_windows_vst_plugin_info) {
+ windows_vst_refresh ();
+ }
+ return *_windows_vst_plugin_info;
#else
return _empty_plugin_info;
#endif
#else
return _empty_plugin_info;
#endif