X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=inline;f=gtk2_ardour%2Finstrument_selector.cc;h=a5edfd8bffe34a32b242605ece7a8f4fc12ab721;hb=79731a716deae9a90be646695480f06f92c268f5;hp=5dfa0918971db6e63dbbed2368e76aa58693e662;hpb=10ad55fcf59c6a89ed42c9a78024e184e153d81e;p=ardour.git

diff --git a/gtk2_ardour/instrument_selector.cc b/gtk2_ardour/instrument_selector.cc
index 5dfa091897..a5edfd8bff 100644
--- a/gtk2_ardour/instrument_selector.cc
+++ b/gtk2_ardour/instrument_selector.cc
@@ -16,25 +16,76 @@
   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#include "pbd/convert.h"
+#include "pbd/enumwriter.h"
 #include "ardour/plugin_manager.h"
-
+#include "gtkmm2ext/gui_thread.h"
 #include "instrument_selector.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace Gtk;
 using namespace ARDOUR;
 
 InstrumentSelector::InstrumentSelector()
 	: _reasonable_synth_id(0)
+	, _gmsynth_id(UINT32_MAX)
+{
+	refill ();
+
+	PluginManager::instance ().PluginListChanged.connect (_update_connection, invalidator (*this), boost::bind (&InstrumentSelector::refill, this), gui_context());
+}
+
+void
+InstrumentSelector::refill()
 {
+	TreeModel::iterator iter = get_active();
+	std::string selected;
+	if (iter) {
+		const TreeModel::Row& row = (*iter);
+		selected = row[_instrument_list_columns.name];
+	}
+
+	unset_model ();
+	clear ();
 	build_instrument_list();
 	set_model(_instrument_list);
 	pack_start(_instrument_list_columns.name);
-	set_active(_reasonable_synth_id);
+	if (selected.empty ()) {
+		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;
+		for (i = rows.begin(); i != rows.end(); ++i) {
+			std::string cn = (*i)[_instrument_list_columns.name];
+			if (cn == selected) {
+				set_active(*i);
+				break;
+			}
+		}
+	}
 	set_button_sensitivity(Gtk::SENSITIVITY_AUTO);
 }
 
+static bool
+pluginsort (const PluginInfoPtr& a, const PluginInfoPtr& b)
+{
+	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()
 {
@@ -42,12 +93,16 @@ InstrumentSelector::build_instrument_list()
 
 	PluginInfoList all_plugs;
 	all_plugs.insert(all_plugs.end(), manager.ladspa_plugin_info().begin(), manager.ladspa_plugin_info().end());
+	all_plugs.insert(all_plugs.end(), manager.lua_plugin_info().begin(), manager.lua_plugin_info().end());
 #ifdef WINDOWS_VST_SUPPORT
 	all_plugs.insert(all_plugs.end(), manager.windows_vst_plugin_info().begin(), manager.windows_vst_plugin_info().end());
 #endif
 #ifdef LXVST_SUPPORT
 	all_plugs.insert(all_plugs.end(), manager.lxvst_plugin_info().begin(), manager.lxvst_plugin_info().end());
 #endif
+#ifdef MACVST_SUPPORT
+	all_plugs.insert(all_plugs.end(), manager.mac_vst_plugin_info().begin(), manager.mac_vst_plugin_info().end());
+#endif
 #ifdef AUDIOUNIT_SUPPORT
 	all_plugs.insert(all_plugs.end(), manager.au_plugin_info().begin(), manager.au_plugin_info().end());
 #endif
@@ -55,6 +110,9 @@ 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);
 
 	TreeModel::Row row = *(_instrument_list->append());
@@ -62,20 +120,43 @@ InstrumentSelector::build_instrument_list()
 	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++;
 	}
 }