*/
#include "pbd/convert.h"
+#include "pbd/enumwriter.h"
#include "ardour/plugin_manager.h"
#include "gtkmm2ext/gui_thread.h"
#include "instrument_selector.h"
InstrumentSelector::InstrumentSelector()
: _reasonable_synth_id(0)
+ , _gmsynth_id(UINT32_MAX)
{
refill ();
set_model(_instrument_list);
pack_start(_instrument_list_columns.name);
if (selected.empty ()) {
- set_active(_reasonable_synth_id);
+ if (_gmsynth_id != UINT32_MAX) {
+ set_active(_gmsynth_id);
+ } else {
+ set_active(_reasonable_synth_id);
+ }
} else {
TreeModel::Children rows = _instrument_list->children();
TreeModel::Children::iterator i;
return PBD::downcase(a->name) < PBD::downcase(b->name);
}
+static bool
+invalid_instrument (PluginInfoPtr p) {
+ const PluginManager& manager = PluginManager::instance();
+ if (manager.get_status(p) == PluginManager::Hidden) {
+ return true;
+ }
+ return !p->is_instrument();
+}
+
void
InstrumentSelector::build_instrument_list()
{
all_plugs.insert(all_plugs.end(), manager.lv2_plugin_info().begin(), manager.lv2_plugin_info().end());
#endif
+ all_plugs.remove_if (invalid_instrument);
all_plugs.sort (pluginsort);
_instrument_list = ListStore::create(_instrument_list_columns);
row[_instrument_list_columns.name] = _("-none-");
uint32_t n = 1;
- for (PluginInfoList::const_iterator i = all_plugs.begin(); i != all_plugs.end(); ++i) {
- if (manager.get_status(*i) == PluginManager::Hidden) {
- continue;
+ std::string prev;
+ for (PluginInfoList::const_iterator i = all_plugs.begin(); i != all_plugs.end();) {
+ PluginInfoPtr p = *i;
+ ++i;
+ bool suffix_type = prev == p->name;
+ if (!suffix_type && i != all_plugs.end() && (*i)->name == p->name) {
+ suffix_type = true;
}
- if ((*i)->is_instrument()) {
- row = *(_instrument_list->append());
- row[_instrument_list_columns.name] = (*i)->name;
- row[_instrument_list_columns.info_ptr] = *i;
- if ((*i)->unique_id == "https://community.ardour.org/node/7596") {
- _reasonable_synth_id = n;
+ row = *(_instrument_list->append());
+ if (suffix_type) {
+ std::string pt;
+ switch (p->type) {
+ case AudioUnit:
+ pt = "AU";
+ break;
+ case Windows_VST:
+ case LXVST:
+ case MacVST:
+ pt = "VST";
+ break;
+ default:
+ pt = enum_2_string (p->type);
}
- n++;
+ row[_instrument_list_columns.name] = p->name + " (" + pt + ")";
+ } else {
+ row[_instrument_list_columns.name] = p->name;
+ }
+ row[_instrument_list_columns.info_ptr] = p;
+ if (p->unique_id == "https://community.ardour.org/node/7596") {
+ _reasonable_synth_id = n;
+ }
+ if (p->unique_id == "http://gareus.org/oss/lv2/gmsynth") {
+ _reasonable_synth_id = n;
}
+ prev = p->name;
+ n++;
}
}