Suffix plugin type in instrument-list to avoid ambiguities
This commit is contained in:
parent
1d60986283
commit
da480d5540
@ -17,6 +17,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "pbd/convert.h"
|
#include "pbd/convert.h"
|
||||||
|
#include "pbd/enumwriter.h"
|
||||||
#include "ardour/plugin_manager.h"
|
#include "ardour/plugin_manager.h"
|
||||||
#include "gtkmm2ext/gui_thread.h"
|
#include "gtkmm2ext/gui_thread.h"
|
||||||
#include "instrument_selector.h"
|
#include "instrument_selector.h"
|
||||||
@ -71,6 +72,15 @@ pluginsort (const PluginInfoPtr& a, const PluginInfoPtr& b)
|
|||||||
return PBD::downcase(a->name) < PBD::downcase(b->name);
|
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
|
void
|
||||||
InstrumentSelector::build_instrument_list()
|
InstrumentSelector::build_instrument_list()
|
||||||
{
|
{
|
||||||
@ -95,6 +105,7 @@ InstrumentSelector::build_instrument_list()
|
|||||||
all_plugs.insert(all_plugs.end(), manager.lv2_plugin_info().begin(), manager.lv2_plugin_info().end());
|
all_plugs.insert(all_plugs.end(), manager.lv2_plugin_info().begin(), manager.lv2_plugin_info().end());
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
all_plugs.remove_if (invalid_instrument);
|
||||||
all_plugs.sort (pluginsort);
|
all_plugs.sort (pluginsort);
|
||||||
|
|
||||||
_instrument_list = ListStore::create(_instrument_list_columns);
|
_instrument_list = ListStore::create(_instrument_list_columns);
|
||||||
@ -104,21 +115,41 @@ InstrumentSelector::build_instrument_list()
|
|||||||
row[_instrument_list_columns.name] = _("-none-");
|
row[_instrument_list_columns.name] = _("-none-");
|
||||||
|
|
||||||
uint32_t n = 1;
|
uint32_t n = 1;
|
||||||
for (PluginInfoList::const_iterator i = all_plugs.begin(); i != all_plugs.end(); ++i) {
|
std::string prev;
|
||||||
if (manager.get_status(*i) == PluginManager::Hidden) {
|
for (PluginInfoList::const_iterator i = all_plugs.begin(); i != all_plugs.end();) {
|
||||||
continue;
|
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->append());
|
||||||
row[_instrument_list_columns.name] = (*i)->name;
|
if (suffix_type) {
|
||||||
row[_instrument_list_columns.info_ptr] = *i;
|
std::string pt;
|
||||||
if ((*i)->unique_id == "https://community.ardour.org/node/7596") {
|
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);
|
||||||
|
}
|
||||||
|
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;
|
_reasonable_synth_id = n;
|
||||||
}
|
}
|
||||||
|
prev = p->name;
|
||||||
n++;
|
n++;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
PluginInfoPtr
|
PluginInfoPtr
|
||||||
|
Loading…
Reference in New Issue
Block a user