From cebfec8125e4c9c1c9d2035aa5b141dec8b3603b Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Tue, 30 Jan 2018 01:32:15 +0100 Subject: Major overhaul of plugin-selector: tag-management & filter This is a squashed commit of various 'nutag' topic branch commits: * re-layout plugin-manager * remove category, add tags * combine I/O columns in list. * update filter to search name and tags --- gtk2_ardour/plugin_selector.cc | 913 ++++++++++++++++++++++++----------------- gtk2_ardour/plugin_selector.h | 79 ++-- 2 files changed, 576 insertions(+), 416 deletions(-) diff --git a/gtk2_ardour/plugin_selector.cc b/gtk2_ardour/plugin_selector.cc index d7755f2886..bef7aa62ba 100644 --- a/gtk2_ardour/plugin_selector.cc +++ b/gtk2_ardour/plugin_selector.cc @@ -34,11 +34,12 @@ #include #include "gtkmm2ext/utils.h" -#include "pbd/convert.h" + #include "widgets/tooltips.h" -#include "ardour/plugin_manager.h" -#include "ardour/plugin.h" +#include "pbd/convert.h" +#include "pbd/tokenizer.h" + #include "ardour/utils.h" #include "plugin_selector.h" @@ -52,30 +53,13 @@ using namespace Gtk; using namespace std; using namespace ArdourWidgets; -static const char* _filter_mode_strings[] = { - N_("Name contains"), - N_("Type contains"), - N_("Category contains"), - N_("Author contains"), - N_("Library contains"), - N_("Favorites only"), - N_("Hidden only"), - 0 -}; +static const uint32_t MAX_CREATOR_LEN = 24; PluginSelector::PluginSelector (PluginManager& mgr) : ArdourDialog (_("Plugin Manager"), true, false) - , filter_button (Stock::CLEAR) - , fil_hidden_button (ArdourButton::led_default_elements) - , fil_instruments_button (ArdourButton::default_elements) - , fil_analysis_button (ArdourButton::default_elements) - , fil_utils_button (ArdourButton::default_elements) + , search_clear_button (Stock::CLEAR) , manager (mgr) - , _show_hidden (false) - , _show_instruments (Gtkmm2ext::ImplicitActive) - , _show_analysers (Gtkmm2ext::Off) - , _show_utils (Gtkmm2ext::Off) - + , inhibit_refill (false) { set_name ("PluginSelectorWindow"); add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK); @@ -85,24 +69,23 @@ PluginSelector::PluginSelector (PluginManager& mgr) manager.PluginListChanged.connect (plugin_list_changed_connection, invalidator (*this), boost::bind (&PluginSelector::build_plugin_menu, this), gui_context()); manager.PluginListChanged.connect (plugin_list_changed_connection, invalidator (*this), boost::bind (&PluginSelector::refill, this), gui_context()); - build_plugin_menu (); + manager.PluginStatusesChanged.connect (plugin_list_changed_connection, invalidator (*this), boost::bind (&PluginSelector::plugin_status_changed, this, _1, _2, _3), gui_context()); + manager.PluginTagsChanged.connect(plugin_list_changed_connection, invalidator (*this), boost::bind (&PluginSelector::tags_changed, this, _1, _2, _3), gui_context()); plugin_model = Gtk::ListStore::create (plugin_columns); plugin_display.set_model (plugin_model); /* XXX translators: try to convert "Fav" into a short term - related to "favorite" and "Hid" into a short term - related to "hidden" - */ + * related to "favorite" and "Hid" into a short term + * related to "hidden" + */ plugin_display.append_column (_("Fav"), plugin_columns.favorite); plugin_display.append_column (_("Hide"), plugin_columns.hidden); - plugin_display.append_column (_("Available Plugins"), plugin_columns.name); - plugin_display.append_column (_("Type"), plugin_columns.type_name); - plugin_display.append_column (_("Category"), plugin_columns.category); + plugin_display.append_column (_("Name"), plugin_columns.name); + plugin_display.append_column (_("Tags"), plugin_columns.tags); plugin_display.append_column (_("Creator"), plugin_columns.creator); - plugin_display.append_column (_("# Audio In"),plugin_columns.audio_ins); - plugin_display.append_column (_("# Audio Out"), plugin_columns.audio_outs); - plugin_display.append_column (_("# MIDI In"),plugin_columns.midi_ins); - plugin_display.append_column (_("# MIDI Out"), plugin_columns.midi_outs); + plugin_display.append_column (_("Type"), plugin_columns.type_name); + plugin_display.append_column (_("Audio I/O"),plugin_columns.audio_io); + plugin_display.append_column (_("MIDI I/O"), plugin_columns.midi_io); plugin_display.set_headers_visible (true); plugin_display.set_headers_clickable (true); plugin_display.set_reorderable (false); @@ -113,6 +96,10 @@ PluginSelector::PluginSelector (PluginManager& mgr) // setting a sort-column prevents re-ordering via Drag/Drop plugin_model->set_sort_column (plugin_columns.name.index(), Gtk::SORT_ASCENDING); + plugin_display.set_name("PluginSelectorDisplay"); + plugin_display.signal_row_activated().connect_notify (sigc::mem_fun(*this, &PluginSelector::row_activated)); + plugin_display.get_selection()->signal_changed().connect (sigc::mem_fun(*this, &PluginSelector::display_selection_changed)); + CellRendererToggle* fav_cell = dynamic_cast(plugin_display.get_column_cell_renderer (0)); fav_cell->property_activatable() = true; fav_cell->property_radio() = true; @@ -133,9 +120,11 @@ PluginSelector::PluginSelector (PluginManager& mgr) added_list.set_headers_visible (true); added_list.set_reorderable (false); - for (int i = 0; i <=8; i++) { + for (int i = 2; i <=7; i++) { Gtk::TreeView::Column* column = plugin_display.get_column(i); - column->set_sort_column(i); + if (column) { + column->set_sort_column(i); + } } ascroller.set_border_width(10); @@ -151,104 +140,200 @@ PluginSelector::PluginSelector (PluginManager& mgr) btn_add->set_name("PluginSelectorButton"); btn_remove->set_name("PluginSelectorButton"); + /* SEARCH */ + + Gtk::Table* search_table = manage(new Gtk::Table(2, 2)); - Gtk::Table* table = manage(new Gtk::Table(7, 11)); - table->set_size_request(750, 500); + search_entry.signal_changed().connect (sigc::mem_fun (*this, &PluginSelector::search_entry_changed)); + search_clear_button.signal_clicked().connect (sigc::mem_fun (*this, &PluginSelector::search_clear_button_clicked)); - Gtk::Table* filter_table = manage(new Gtk::Table(2, 5)); + _search_name_checkbox = manage (new CheckButton (_("Name"))); + _search_name_checkbox->set_active(); - fil_hidden_button.set_name ("pluginlist hide button"); - fil_hidden_button.set_text (_("Show Hidden")); - fil_hidden_button.set_active (_show_hidden); - set_tooltip (fil_hidden_button, _("Include hidden plugins in list.")); + _search_tags_checkbox = manage (new CheckButton (_("Tags"))); + _search_tags_checkbox->set_active(); - fil_instruments_button.set_name ("pluginlist filter button"); - fil_instruments_button.set_text (_("Instruments")); - fil_instruments_button.set_active_state (_show_instruments); - set_tooltip (fil_instruments_button, _("Cycle display of instrument plugins (if any).")); + _search_ignore_checkbox = manage (new CheckButton(_("Ignore Filters when searching"))); + _search_ignore_checkbox->set_active(); + _search_ignore_checkbox->signal_toggled().connect (sigc::mem_fun (*this, &PluginSelector::set_sensitive_widgets)); - fil_analysis_button.set_name ("pluginlist filter button"); - fil_analysis_button.set_text (_("Analyzers")); - fil_analysis_button.set_active_state (_show_analysers); - set_tooltip (fil_analysis_button, _("Cycle display of analysis plugins (if any).")); + Gtk::Label* search_help_label1 = manage (new Label( + _("All search terms must be matched."), Gtk::ALIGN_LEFT)); - fil_utils_button.set_name ("pluginlist filter button"); - fil_utils_button.set_text (_("Utils")); - fil_utils_button.set_active_state (_show_utils); - set_tooltip (fil_utils_button, _("Cycle display of utility plugins (if any).")); + Gtk::Label* search_help_label2 = manage (new Label( + _("Ex: \"ess dyn\" will return \"dynamic de-esser\" but not \"de-esser\"."), Gtk::ALIGN_LEFT)); - vector filter_strings = I18N (_filter_mode_strings); - Gtkmm2ext::set_popdown_strings (filter_mode, filter_strings); - filter_mode.set_active_text (filter_strings.front()); + search_table->attach (search_entry, 0, 3, 0, 1, FILL|EXPAND, FILL); + search_table->attach (search_clear_button, 3, 4, 0, 1, FILL, FILL); + search_table->attach (*_search_name_checkbox, 0, 1, 1, 2, FILL, FILL); + search_table->attach (*_search_tags_checkbox, 1, 2, 1, 2, FILL, FILL); + search_table->attach (*_search_ignore_checkbox,2, 3, 1, 2, FILL, FILL); + search_table->attach (*search_help_label1, 0, 3, 2, 3, FILL, FILL); + search_table->attach (*search_help_label2, 0, 3, 3, 4, FILL, FILL); - fil_hidden_button.signal_button_release_event().connect (sigc::mem_fun(*this, &PluginSelector::fil_hidden_button_release), false); - fil_instruments_button.signal_button_release_event().connect (sigc::mem_fun(*this, &PluginSelector::fil_instruments_button_release), false); - fil_analysis_button.signal_button_release_event().connect (sigc::mem_fun(*this, &PluginSelector::fil_analysis_button_release), false); - fil_utils_button.signal_button_release_event().connect (sigc::mem_fun(*this, &PluginSelector::fil_utils_button_release), false); + search_table->set_border_width (4); + search_table->set_col_spacings (2); + search_table->set_row_spacings (4); - filter_entry.signal_changed().connect (sigc::mem_fun (*this, &PluginSelector::filter_entry_changed)); - filter_button.signal_clicked().connect (sigc::mem_fun (*this, &PluginSelector::filter_button_clicked)); - filter_mode.signal_changed().connect (sigc::mem_fun (*this, &PluginSelector::filter_mode_changed)); + Frame* search_frame = manage (new Frame); + search_frame->set_name ("BaseFrame"); + search_frame->set_label (_("Search")); + search_frame->add (*search_table); + search_frame->show_all (); - filter_table->attach (filter_mode, 0, 1, 0, 1, FILL, FILL); - filter_table->attach (filter_entry, 1, 4, 0, 1, FILL|EXPAND, FILL); - filter_table->attach (filter_button, 4, 5, 0, 1, FILL, FILL); + _search_name_checkbox->signal_clicked().connect (sigc::mem_fun (*this, &PluginSelector::refill)); + _search_tags_checkbox->signal_clicked().connect (sigc::mem_fun (*this, &PluginSelector::refill)); - filter_table->attach (fil_hidden_button, 1, 2, 1, 2, FILL, FILL); - filter_table->attach (fil_instruments_button, 2, 3, 1, 2, FILL, FILL); - filter_table->attach (fil_analysis_button, 3, 4, 1, 2, FILL, FILL); - filter_table->attach (fil_utils_button, 4, 5, 1, 2, FILL, FILL); + /* FILTER */ + + Gtk::Table* filter_table = manage(new Gtk::Table(1, 10)); + + Gtk::RadioButtonGroup fil_radio_group; + + _fil_effects_radio = manage (new RadioButton (fil_radio_group, _("Show Effects Only"))); + _fil_instruments_radio = manage (new RadioButton (fil_radio_group, _("Show Instruments Only"))); + _fil_utils_radio = manage (new RadioButton (fil_radio_group, _("Show Utilities Only"))); + _fil_favorites_radio = manage (new RadioButton (fil_radio_group, _("Show Favorites Only"))); + _fil_hidden_radio = manage (new RadioButton (fil_radio_group, _("Show Hidden Only"))); + _fil_all_radio = manage (new RadioButton (fil_radio_group, _("Show All"))); + +#ifndef MIXBUS + _fil_all_radio->set_active (); +#endif + + _fil_type_combo = manage (new ComboBoxText); + _fil_type_combo->append_text (_("Show All Formats")); + _fil_type_combo->append_text (X_("VST")); +#ifdef AUDIOUNIT_SUPPORT + _fil_type_combo->append_text (X_("AudioUnit")); +#endif +#ifdef LV2_SUPPORT + _fil_type_combo->append_text (X_("LV2")); +#endif + _fil_type_combo->append_text (X_("LUA")); + _fil_type_combo->append_text (X_("LADSPA")); + _fil_type_combo->set_active_text (_("Show All Formats")); + + _fil_creator_combo = manage (new ComboBoxText); + //note: _fil_creator_combo menu gets filled in build_plugin_menu + + _fil_channel_combo = manage (new ComboBoxText); + _fil_channel_combo->append_text (_("Audio I/O")); + _fil_channel_combo->append_text (_("Mono Audio I/O")); + _fil_channel_combo->append_text (_("Stereo Audio I/O")); + _fil_channel_combo->append_text (_("MIDI I/O (only)")); + _fil_channel_combo->append_text (_("Show All I/O")); +#ifdef MIXBUS + _fil_channel_combo->set_active_text (_("Audio I/O")); +#else + _fil_channel_combo->set_active_text (_("Show All I/O")); +#endif + + int p = 0; + filter_table->attach (*_fil_effects_radio, 2, 3, p, p+1, FILL, FILL); p++; + filter_table->attach (*_fil_instruments_radio, 2, 3, p, p+1, FILL, FILL); p++; + filter_table->attach (*_fil_utils_radio, 2, 3, p, p+1, FILL, FILL); p++; + filter_table->attach (*_fil_favorites_radio, 2, 3, p, p+1, FILL, FILL); p++; + filter_table->attach (*_fil_hidden_radio, 2, 3, p, p+1, FILL, FILL); p++; + filter_table->attach (*_fil_all_radio, 2, 3, p, p+1, FILL, FILL); p++; + filter_table->attach (*_fil_type_combo, 2, 3, p, p+1, FILL, FILL); p++; + filter_table->attach (*_fil_creator_combo, 2, 3, p, p+1, FILL, FILL); p++; + filter_table->attach (*_fil_channel_combo, 2, 3, p, p+1, FILL, FILL); p++; filter_table->set_border_width (4); - filter_table->set_col_spacings (2); + filter_table->set_col_spacings (4); filter_table->set_row_spacings (4); - Frame* filter_sample = manage (new Frame); - filter_sample->set_name ("BaseFrame"); - filter_sample->set_label (_("Filter")); - filter_sample->add (*filter_table); + Frame* filter_frame = manage (new Frame); + filter_frame->set_name ("BaseFrame"); + filter_frame->set_label (_("Filter")); + filter_frame->add (*filter_table); + filter_frame->show_all (); + + _fil_effects_radio->signal_clicked().connect (sigc::mem_fun (*this, &PluginSelector::refill)); + _fil_instruments_radio->signal_clicked().connect (sigc::mem_fun (*this, &PluginSelector::refill)); + _fil_utils_radio->signal_clicked().connect (sigc::mem_fun (*this, &PluginSelector::refill)); + _fil_favorites_radio->signal_clicked().connect (sigc::mem_fun (*this, &PluginSelector::refill)); + _fil_hidden_radio->signal_clicked().connect (sigc::mem_fun (*this, &PluginSelector::refill)); + + _fil_type_combo->signal_changed().connect (sigc::mem_fun (*this, &PluginSelector::refill)); + _fil_creator_combo->signal_changed().connect (sigc::mem_fun (*this, &PluginSelector::refill)); + _fil_channel_combo->signal_changed().connect (sigc::mem_fun (*this, &PluginSelector::refill)); + + /* TAG entry */ - filter_sample->show_all (); + Gtk::Table* tagging_table = manage(new Gtk::Table(1, 2)); + tagging_table->set_border_width (4); + tagging_table->set_col_spacings (4); + tagging_table->set_row_spacings (4); - HBox* side_by_side = manage (new HBox); - VBox* right_side = manage (new VBox); + tag_entry = manage (new Gtk::Entry); + tag_entry_connection = tag_entry->signal_changed().connect (sigc::mem_fun (*this, &PluginSelector::tag_entry_changed)); - table->attach (scroller, 0, 7, 0, 5); - table->attach (*filter_sample, 0, 7, 6, 7, FILL|EXPAND, FILL, 5, 5); + Gtk::Button* tag_reset_button = manage (new Button (_("Reset"))); + tag_reset_button->signal_clicked().connect (sigc::mem_fun (*this, &PluginSelector::tag_reset_button_clicked)); - right_side->pack_start (ascroller); + Gtk::Label* tagging_help_label1 = manage (new Label( + _("Enter space-separated, one-word Tags for the selected plugin."), Gtk::ALIGN_LEFT)); + + Gtk::Label* tagging_help_label2 = manage (new Label( + _("You can include dashes, colons or underscores in a Tag."), Gtk::ALIGN_LEFT)); + + Gtk::Label* tagging_help_label3 = manage (new Label( + _("Ex: \"dynamic de-esser vocal\" applies 3 Tags."), Gtk::ALIGN_LEFT)); + + p = 0; + tagging_table->attach (*tag_entry, 0, 1, p, p+1, FILL|EXPAND, FILL); + tagging_table->attach (*tag_reset_button, 1, 2, p, p+1, FILL, FILL); p++; + tagging_table->attach (*tagging_help_label1, 0, 2, p, p+1, FILL, FILL); p++; + tagging_table->attach (*tagging_help_label2, 0, 2, p, p+1, FILL, FILL); p++; + tagging_table->attach (*tagging_help_label3, 0, 2, p, p+1, FILL, FILL); p++; + + Frame* tag_frame = manage (new Frame); + tag_frame->set_name ("BaseFrame"); + tag_frame->set_label (_("Tags for Selected Plugin")); + tag_frame->add (*tagging_table); + tag_frame->show_all (); + + /* Add & remove buttons */ HBox* add_remove = manage (new HBox); add_remove->pack_start (*btn_add, true, true); add_remove->pack_start (*btn_remove, true, true); - right_side->pack_start (*add_remove, false, false); - right_side->set_size_request (200, -1); + btn_add->signal_clicked().connect(sigc::mem_fun(*this, &PluginSelector::btn_add_clicked)); + btn_remove->signal_clicked().connect(sigc::mem_fun(*this, &PluginSelector::btn_remove_clicked)); + added_list.get_selection()->signal_changed().connect (sigc::mem_fun(*this, &PluginSelector::added_list_selection_changed)); + added_list.signal_button_press_event().connect_notify (mem_fun(*this, &PluginSelector::added_row_clicked)); + + added_list.set_name("PluginSelectorList"); + + /* Top-level Layout */ - side_by_side->pack_start (*table); - side_by_side->pack_start (*right_side); + VBox* to_be_inserted_vbox = manage (new VBox); + to_be_inserted_vbox->pack_start (ascroller); + to_be_inserted_vbox->pack_start (*add_remove, false, false); + to_be_inserted_vbox->set_size_request (200, -1); + + Gtk::Table* table = manage(new Gtk::Table(3, 3)); + table->set_size_request(-1, 600); + table->attach (scroller, 0, 3, 0, 5); /* this is the main plugin list */ + table->attach (*search_frame, 0, 1, 6, 7, FILL, FILL, 5, 5); + table->attach (*tag_frame, 0, 1, 7, 8, FILL, FILL, 5, 5); + table->attach (*filter_frame, 1, 2, 6, 8, FILL, FILL, 5, 5); + table->attach (*to_be_inserted_vbox, 2, 3, 6, 8, FILL|EXPAND, FILL, 5, 5); /* to be inserted... */ add_button (Stock::CLOSE, RESPONSE_CLOSE); add_button (_("Insert Plugin(s)"), RESPONSE_APPLY); set_default_response (RESPONSE_APPLY); set_response_sensitive (RESPONSE_APPLY, false); - get_vbox()->pack_start (*side_by_side); + get_vbox()->pack_start (*table); table->set_name("PluginSelectorTable"); - plugin_display.set_name("PluginSelectorDisplay"); - //plugin_display.set_name("PluginSelectorList"); - added_list.set_name("PluginSelectorList"); - plugin_display.signal_row_activated().connect_notify (sigc::mem_fun(*this, &PluginSelector::row_activated)); - plugin_display.get_selection()->signal_changed().connect (sigc::mem_fun(*this, &PluginSelector::display_selection_changed)); plugin_display.grab_focus(); - btn_add->signal_clicked().connect(sigc::mem_fun(*this, &PluginSelector::btn_add_clicked)); - btn_remove->signal_clicked().connect(sigc::mem_fun(*this, &PluginSelector::btn_remove_clicked)); - added_list.get_selection()->signal_changed().connect (sigc::mem_fun(*this, &PluginSelector::added_list_selection_changed)); - added_list.signal_button_press_event().connect_notify (mem_fun(*this, &PluginSelector::added_row_clicked)); - - refill (); + build_plugin_menu (); } PluginSelector::~PluginSelector () @@ -269,166 +354,229 @@ PluginSelector::added_row_clicked(GdkEventButton* event) btn_remove_clicked(); } -static bool is_analyzer (const PluginInfoPtr& info) { - // Anaylsis, Analyzer are for backwards compatibility (vst cache) - return info->in_category ("Analyser") || info->in_category ("Anaylsis") || info->in_category ("Analyzer"); -} - -static bool is_util (const PluginInfoPtr& info) { - // all MIDI plugins which are not Instruments are Utils. - return info->in_category ("Utility") || info->in_category ("MIDI") || info->in_category ("Generator"); -} - bool -PluginSelector::show_this_plugin (const PluginInfoPtr& info, const std::string& filterstr) +PluginSelector::show_this_plugin (const PluginInfoPtr& info, const std::string& searchstr) { - std::string compstr; - std::string mode = filter_mode.get_active_text (); + string mode; + bool maybe_show = false; - if (mode == _("Favorites only")) { - return manager.get_status (info) == PluginManager::Favorite; + if (!searchstr.empty()) { + + std::string compstr; + + if (_search_name_checkbox->get_active()) { /* name contains */ + compstr = info->name; + transform (compstr.begin(), compstr.end(), compstr.begin(), ::toupper); + if (compstr.find (searchstr) != string::npos) { + maybe_show = true; + } + } + + if (_search_tags_checkbox->get_active()) { /* tag contains */ + compstr = manager.get_tags_as_string (info); + transform (compstr.begin(), compstr.end(), compstr.begin(), ::toupper); + if (compstr.find (searchstr) != string::npos) { + maybe_show = true; + } + } + + if (!maybe_show) { + return false; + } + + /* user asked to ignore filters */ + if (maybe_show && _search_ignore_checkbox->get_active()) { + return true; + } } - if (mode == _("Hidden only")) { - return manager.get_status (info) == PluginManager::Hidden; + if (_fil_effects_radio->get_active() && !info->is_effect()) { + return false; } - if (!_show_hidden && manager.get_status (info) == PluginManager::Hidden) { + if (_fil_instruments_radio->get_active() && !info->is_instrument()) { return false; } - if (_show_instruments == Gtkmm2ext::Off && info->is_instrument()) { + if (_fil_utils_radio->get_active() && !(info->is_utility() || info->is_analyzer())) { return false; } - if (_show_analysers == Gtkmm2ext::Off && is_analyzer (info)) { + + if (_fil_favorites_radio->get_active() && !(manager.get_status (info) == PluginManager::Favorite)) { return false; } - if (_show_utils == Gtkmm2ext::Off && is_util (info)) { + + if (_fil_hidden_radio->get_active() && !(manager.get_status (info) == PluginManager::Hidden)) { return false; } - /* NB once lilv_node_as_string() does honor translation AND - * the lv2 onthology provides localized class name, - * PluginInfo will need methods for Util & Analysis. - */ - bool exp_ok = false; - if (_show_instruments == Gtkmm2ext::ExplicitActive && info->is_instrument()) { - exp_ok = true; + if (manager.get_status (info) == PluginManager::Hidden) { + if (!_fil_hidden_radio->get_active() && !_fil_all_radio->get_active()) { + return false; + } } - if (_show_analysers == Gtkmm2ext::ExplicitActive && is_analyzer(info)) { - exp_ok = true; + + /* Filter "type" combobox */ + + if (_fil_type_combo->get_active_text() == X_("VST") && PluginManager::to_generic_vst(info->type) != LXVST) { + return false; + } + + if (_fil_type_combo->get_active_text() == X_("AudioUnit") && info->type != AudioUnit) { + return false; + } + +#ifdef LV2_SUPPORT + if (_fil_type_combo->get_active_text() == X_("LV2") && info->type != LV2) { + return false; + } +#endif + + if (_fil_type_combo->get_active_text() == X_("LUA") && info->type != Lua) { + return false; } - if (_show_utils == Gtkmm2ext::ExplicitActive && is_util (info)) { - exp_ok = true; + + if (_fil_type_combo->get_active_text() == X_("LADSPA") && info->type != LADSPA) { + return false; } - if (_show_instruments == Gtkmm2ext::ExplicitActive || _show_analysers == Gtkmm2ext::ExplicitActive || _show_utils == Gtkmm2ext::ExplicitActive) { - if (!exp_ok) { + + /* Filter "creator" combobox */ + + if (_fil_creator_combo->get_active_text() != _("Show All Creators")) { + string cmp = info->creator; + if (cmp.length() > MAX_CREATOR_LEN) { + cmp = cmp.substr (0, MAX_CREATOR_LEN); + cmp.append("..."); + } + if (_fil_creator_combo->get_active_text() != cmp) { return false; } } - if (!filterstr.empty()) { + /* Filter "I/O" combobox */ - if (mode == _("Name contains")) { - compstr = info->name; - } else if (mode == _("Category contains")) { - compstr = info->category; - } else if (mode == _("Type contains")) { - - switch (info->type) { - case LADSPA: - compstr = X_("LADSPA"); - break; - case AudioUnit: - compstr = X_("AudioUnit"); - break; - case LV2: - compstr = X_("LV2"); - break; - case Windows_VST: - compstr = X_("VST"); - break; - case LXVST: - compstr = X_("LXVST"); - break; - case MacVST: - compstr = X_("MacVST"); - break; - case Lua: - compstr = X_("Lua"); - break; - } + if (_fil_channel_combo->get_active_text() != _("Show All I/O") || info->reconfigurable_io ()) { - } else if (mode == _("Author contains")) { - compstr = info->creator; - } else if (mode == _("Library contains")) { - compstr = info->path; +#if 0 + if (info->reconfigurable_io ()) { + return true; // who knows.... ? } +#endif - if (compstr.empty()) { - return false; + if (_fil_channel_combo->get_active_text() == _("Audio I/O")) { + if ((info->n_inputs.n_audio() == 0 || info->n_outputs.n_audio() == 0)) { + return false; + } } - transform (compstr.begin(), compstr.end(), compstr.begin(), ::toupper); + if (_fil_channel_combo->get_active_text() == _("Mono Audio I/O")) { + if (info->n_inputs.n_audio() != 1 || info->n_outputs.n_audio() != 1) { + return false; + } + } - if (compstr.find (filterstr) != string::npos) { - return true; - } else { - return false; + if (_fil_channel_combo->get_active_text() == _("Stereo Audio I/O")) { + if (info->n_inputs.n_audio() != 2 || info->n_outputs.n_audio() != 2) { + return false; + } } + + if (_fil_channel_combo->get_active_text() == _("MIDI I/O (only)")) { + if ((info->n_inputs.n_audio() != 0 || info->n_outputs.n_audio() == 0)) { + return false; + } + } + } return true; } void -PluginSelector::setup_filter_string (string& filterstr) +PluginSelector::setup_search_string (string& searchstr) +{ + searchstr = search_entry.get_text (); + transform (searchstr.begin(), searchstr.end(), searchstr.begin(), ::toupper); +} + +void +PluginSelector::set_sensitive_widgets () { - filterstr = filter_entry.get_text (); - transform (filterstr.begin(), filterstr.end(), filterstr.begin(), ::toupper); + if (_search_ignore_checkbox->get_active() && (search_entry.get_text() != "")) { + _fil_effects_radio->set_sensitive(false); + _fil_instruments_radio->set_sensitive(false); + _fil_utils_radio->set_sensitive(false); + _fil_favorites_radio->set_sensitive(false); + _fil_hidden_radio->set_sensitive(false); + _fil_all_radio->set_sensitive(false); + _fil_type_combo->set_sensitive(false); + _fil_creator_combo->set_sensitive(false); + _fil_channel_combo->set_sensitive(false); + } else { + _fil_effects_radio->set_sensitive(true); + _fil_instruments_radio->set_sensitive(true); + _fil_utils_radio->set_sensitive(true); + _fil_favorites_radio->set_sensitive(true); + _fil_hidden_radio->set_sensitive(true); + _fil_all_radio->set_sensitive(true); + _fil_type_combo->set_sensitive(true); + _fil_creator_combo->set_sensitive(true); + _fil_channel_combo->set_sensitive(true); + } } void PluginSelector::refill () { - std::string filterstr; + if (inhibit_refill) { + return; + } + + std::string searchstr; in_row_change = true; plugin_model->clear (); - setup_filter_string (filterstr); + setup_search_string (searchstr); - ladspa_refiller (filterstr); - lv2_refiller (filterstr); - vst_refiller (filterstr); - lxvst_refiller (filterstr); - mac_vst_refiller (filterstr); - au_refiller (filterstr); - lua_refiller (filterstr); + ladspa_refiller (searchstr); + lv2_refiller (searchstr); + vst_refiller (searchstr); + lxvst_refiller (searchstr); + mac_vst_refiller (searchstr); + au_refiller (searchstr); + lua_refiller (searchstr); in_row_change = false; } void -PluginSelector::refiller (const PluginInfoList& plugs, const::std::string& filterstr, const char* type) +PluginSelector::refiller (const PluginInfoList& plugs, const::std::string& searchstr, const char* type) { char buf[16]; for (PluginInfoList::const_iterator i = plugs.begin(); i != plugs.end(); ++i) { - if (show_this_plugin (*i, filterstr)) { + if (show_this_plugin (*i, searchstr)) { TreeModel::Row newrow = *(plugin_model->append()); newrow[plugin_columns.favorite] = (manager.get_status (*i) == PluginManager::Favorite); newrow[plugin_columns.hidden] = (manager.get_status (*i) == PluginManager::Hidden); - newrow[plugin_columns.name] = (*i)->name; + + string name = (*i)->name; + if (name.length() > 48) { + name = name.substr (0, 48); + name.append("..."); + } + newrow[plugin_columns.name] = name; + newrow[plugin_columns.type_name] = type; newrow[plugin_columns.category] = (*i)->category; + /* Creator */ string creator = (*i)->creator; string::size_type pos = 0; - if ((*i)->type == ARDOUR::LADSPA) { /* stupid LADSPA creator strings */ #ifdef PLATFORM_WINDOWS @@ -447,23 +595,28 @@ PluginSelector::refiller (const PluginInfoList& plugs, const::std::string& filte creator = creator.substr (0, pos); } + if (creator.length() > MAX_CREATOR_LEN) { + creator = creator.substr (0, MAX_CREATOR_LEN); + creator.append("..."); + } newrow[plugin_columns.creator] = creator; + /* Tags */ + string tags = manager.get_tags_as_string(*i); + if (tags.length() > 32) { + tags = tags.substr (0, 32); + tags.append("..."); + } + newrow[plugin_columns.tags] = tags; + if ((*i)->reconfigurable_io ()) { - newrow[plugin_columns.audio_ins] = _("variable"); - newrow[plugin_columns.midi_ins] = _("variable"); - newrow[plugin_columns.audio_outs] = _("variable"); - newrow[plugin_columns.midi_outs] = _("variable"); + newrow[plugin_columns.audio_io] = "* / *"; + newrow[plugin_columns.midi_io] = "* / *"; } else { - snprintf (buf, sizeof(buf), "%d", (*i)->n_inputs.n_audio()); - newrow[plugin_columns.audio_ins] = buf; - snprintf (buf, sizeof(buf), "%d", (*i)->n_inputs.n_midi()); - newrow[plugin_columns.midi_ins] = buf; - - snprintf (buf, sizeof(buf), "%d", (*i)->n_outputs.n_audio()); - newrow[plugin_columns.audio_outs] = buf; - snprintf (buf, sizeof(buf), "%d", (*i)->n_outputs.n_midi()); - newrow[plugin_columns.midi_outs] = buf; + snprintf (buf, sizeof(buf), "%d / %d", (*i)->n_inputs.n_audio(), (*i)->n_outputs.n_audio()); + newrow[plugin_columns.audio_io] = buf; + snprintf (buf, sizeof(buf), "%d / %d", (*i)->n_inputs.n_audio(), (*i)->n_outputs.n_audio()); + newrow[plugin_columns.midi_io] = buf; } newrow[plugin_columns.plugin] = *i; @@ -472,70 +625,70 @@ PluginSelector::refiller (const PluginInfoList& plugs, const::std::string& filte } void -PluginSelector::ladspa_refiller (const std::string& filterstr) +PluginSelector::ladspa_refiller (const std::string& searchstr) { - refiller (manager.ladspa_plugin_info(), filterstr, "LADSPA"); + refiller (manager.ladspa_plugin_info(), searchstr, "LADSPA"); } void -PluginSelector::lua_refiller (const std::string& filterstr) +PluginSelector::lua_refiller (const std::string& searchstr) { - refiller (manager.lua_plugin_info(), filterstr, "Lua"); + refiller (manager.lua_plugin_info(), searchstr, "Lua"); } void -PluginSelector::lv2_refiller (const std::string& filterstr) +PluginSelector::lv2_refiller (const std::string& searchstr) { #ifdef LV2_SUPPORT - refiller (manager.lv2_plugin_info(), filterstr, "LV2"); + refiller (manager.lv2_plugin_info(), searchstr, "LV2"); #endif } void #ifdef WINDOWS_VST_SUPPORT -PluginSelector::vst_refiller (const std::string& filterstr) +PluginSelector::vst_refiller (const std::string& searchstr) #else PluginSelector::vst_refiller (const std::string&) #endif { #ifdef WINDOWS_VST_SUPPORT - refiller (manager.windows_vst_plugin_info(), filterstr, "VST"); + refiller (manager.windows_vst_plugin_info(), searchstr, "VST"); #endif } void #ifdef LXVST_SUPPORT -PluginSelector::lxvst_refiller (const std::string& filterstr) +PluginSelector::lxvst_refiller (const std::string& searchstr) #else PluginSelector::lxvst_refiller (const std::string&) #endif { #ifdef LXVST_SUPPORT - refiller (manager.lxvst_plugin_info(), filterstr, "LXVST"); + refiller (manager.lxvst_plugin_info(), searchstr, "LXVST"); #endif } void #ifdef MACVST_SUPPORT -PluginSelector::mac_vst_refiller (const std::string& filterstr) +PluginSelector::mac_vst_refiller (const std::string& searchstr) #else PluginSelector::mac_vst_refiller (const std::string&) #endif { #ifdef MACVST_SUPPORT - refiller (manager.mac_vst_plugin_info(), filterstr, "MacVST"); + refiller (manager.mac_vst_plugin_info(), searchstr, "MacVST"); #endif } void #ifdef AUDIOUNIT_SUPPORT -PluginSelector::au_refiller (const std::string& filterstr) +PluginSelector::au_refiller (const std::string& searchstr) #else PluginSelector::au_refiller (const std::string&) #endif { #ifdef AUDIOUNIT_SUPPORT - refiller (manager.au_plugin_info(), filterstr, "AU"); + refiller (manager.au_plugin_info(), searchstr, "AU"); #endif } @@ -583,11 +736,24 @@ PluginSelector::btn_remove_clicked() void PluginSelector::display_selection_changed() { + tag_entry_connection.block (); if (plugin_display.get_selection()->count_selected_rows() != 0) { + + /* a plugin row is selected; allow the user to edit the "tags" on it. */ + TreeModel::Row row = *(plugin_display.get_selection()->get_selected()); + string tags = manager.get_tags_as_string (row[plugin_columns.plugin]); + tag_entry->set_text (tags); + + tag_entry->set_sensitive (true); btn_add->set_sensitive (true); + } else { + tag_entry->set_text (""); + + tag_entry->set_sensitive (false); btn_add->set_sensitive (false); } + tag_entry_connection.unblock (); } void @@ -642,50 +808,116 @@ PluginSelector::run () amodel->clear(); interested_object = 0; + if (_need_tag_save) { + manager.save_tags(); + } + + if (_need_status_save) { + manager.save_statuses(); + } + + if (_need_menu_rebuild) { + build_plugin_menu(); + } + return (int) r; } void -PluginSelector::filter_button_clicked () +PluginSelector::search_clear_button_clicked () +{ + search_entry.set_text (""); +} + +void +PluginSelector::tag_reset_button_clicked () { - filter_entry.set_text (""); + /* XXX: this should probably be a backend function + * -> remove "category" from GUI and code-dup to set + * factory tags in PluginManager */ + if (plugin_display.get_selection()->count_selected_rows() != 0) { + TreeModel::Row row = *(plugin_display.get_selection()->get_selected()); + std::string str = row[plugin_columns.category]; + std::transform (str.begin(), str.end(), str.begin(), ::tolower); + + ARDOUR::PluginInfoPtr pi = row[plugin_columns.plugin]; + manager.set_tags (pi->type, pi->unique_id, str, true, true); + _need_tag_save = true; + } } void -PluginSelector::filter_entry_changed () +PluginSelector::search_entry_changed () { + set_sensitive_widgets(); refill (); } void -PluginSelector::filter_mode_changed () +PluginSelector::tag_entry_changed () { - std::string mode = filter_mode.get_active_text (); - - if (mode == _("Favorites only") || mode == _("Hidden only")) { - filter_entry.set_sensitive (false); - filter_button.set_sensitive (false); - fil_hidden_button.set_sensitive (false); - fil_instruments_button.set_sensitive (false); - fil_analysis_button.set_sensitive (false); - fil_utils_button.set_sensitive (false); - } else { - filter_entry.set_sensitive (true); - filter_button.set_sensitive (true); - fil_hidden_button.set_sensitive (true); - fil_instruments_button.set_sensitive (true); - fil_analysis_button.set_sensitive (true); - fil_utils_button.set_sensitive (true); + if (plugin_display.get_selection()->count_selected_rows() != 0) { + TreeModel::Row row = *(plugin_display.get_selection()->get_selected()); + + ARDOUR::PluginInfoPtr pi = row[plugin_columns.plugin]; + manager.set_tags (pi->type, pi->unique_id, tag_entry->get_text(), false); + + _need_tag_save = true; } +} - refill (); +void +PluginSelector::tags_changed (PluginType t, std::string unique_id, std::string tags) +{ + if (plugin_display.get_selection()->count_selected_rows() != 0) { + TreeModel::Row row = *(plugin_display.get_selection()->get_selected()); + if (tags.length() > 32) { + tags = tags.substr (0, 32); + tags.append ("..."); + } + row[plugin_columns.tags] = tags; + } + + /* A plugin's tags change while the user is entering them. + * defer a rebuilding of the "tag" menu until the dialog is closed. + */ + _need_menu_rebuild = true; +} + +void +PluginSelector::plugin_status_changed (PluginType t, std::string uid, PluginManager::PluginStatusType stat) +{ + Gtk::TreeModel::iterator i; + for (i = plugin_model->children().begin(); i != plugin_model->children().end(); ++i) { + PluginInfoPtr pp = (*i)[plugin_columns.plugin]; + if ((pp->type == t) && (pp->unique_id == uid)) { + (*i)[plugin_columns.favorite] = (stat == PluginManager::Favorite) ? true : false; + (*i)[plugin_columns.hidden] = (stat == PluginManager::Hidden) ? true : false; + + /* if plug was hidden, remove it from the view */ + if (stat==PluginManager::Hidden) { + plugin_model->erase(i); + } + + /* plugin menu must be re-built to accommodate Hidden and Favorite plugins */ + build_plugin_menu(); + + return; + } + } } void PluginSelector::on_show () { ArdourDialog::on_show (); - filter_entry.grab_focus (); + search_entry.grab_focus (); + + refill (); + + _need_tag_save = false; + _need_status_save = false; + _need_menu_rebuild = false; } struct PluginMenuCompareByCreator { @@ -724,24 +956,6 @@ struct PluginMenuCompareByName { } }; -struct PluginMenuCompareByCategory { - bool operator() (PluginInfoPtr a, PluginInfoPtr b) const { - int cmp; - - cmp = cmp_nocase_utf8 (a->category, b->category); - - if (cmp < 0) { - return true; - } else if (cmp == 0) { - /* same category ... compare names */ - if (cmp_nocase_utf8 (a->name, b->name) < 0) { - return true; - } - } - return false; - } -}; - /** @return Plugin menu. The caller should not delete it */ Gtk::Menu* PluginSelector::plugin_menu() @@ -791,15 +1005,15 @@ PluginSelector::build_plugin_menu () Menu* by_creator = create_by_creator_menu(all_plugs); items.push_back (MenuElem (_("By Creator"), *manage (by_creator))); - Menu* by_category = create_by_category_menu(all_plugs); - items.push_back (MenuElem (_("By Category"), *manage (by_category))); + Menu* by_tags = create_by_tags_menu(all_plugs); + items.push_back (MenuElem (_("By Tags"), *manage (by_tags))); } string GetPluginTypeStr(PluginInfoPtr info) { string type; - + switch (info->type) { case LADSPA: type = X_(" (LADSPA)"); @@ -819,7 +1033,7 @@ GetPluginTypeStr(PluginInfoPtr info) type = X_(" (Lua)"); break; } - + return type; } @@ -848,6 +1062,12 @@ PluginSelector::create_favs_menu (PluginInfoList& all_plugs) Gtk::Menu* PluginSelector::create_by_creator_menu (ARDOUR::PluginInfoList& all_plugs) { + inhibit_refill = true; + _fil_creator_combo->clear(); + _fil_creator_combo->append_text (_("Show All Creators")); + _fil_creator_combo->set_active_text (_("Show All Creators")); + inhibit_refill = false; + using namespace Menu_Helpers; typedef std::map SubmenuMap; @@ -878,19 +1098,29 @@ PluginSelector::create_by_creator_menu (ARDOUR::PluginInfoList& all_plugs) pos = creator.length (); } - // If there were too few characters to create a - // meaningful name, mark this creator as 'Unknown' + /* If there were too few characters to create a + * meaningful name, mark this creator as 'Unknown' + */ if (creator.length() < 2 || pos < 3) { creator = "Unknown"; } else{ creator = creator.substr (0, pos); } + /* trim the creator length so we don't make a giant pulldown menu */ + if (creator.length() > MAX_CREATOR_LEN) { + creator = creator.substr (0, MAX_CREATOR_LEN); + creator.append("..."); + } + SubmenuMap::iterator x; Gtk::Menu* submenu; if ((x = creator_submenu_map.find (creator)) != creator_submenu_map.end()) { submenu = x->second; } else { + + _fil_creator_combo->append_text(creator); + submenu = new Gtk::Menu; by_creator_items.push_back (MenuElem (creator, *manage (submenu))); creator_submenu_map.insert (pair (creator, submenu)); @@ -901,46 +1131,53 @@ PluginSelector::create_by_creator_menu (ARDOUR::PluginInfoList& all_plugs) elem.get_child()->set_use_underline (false); submenu->items().push_back (elem); } + return by_creator; } Gtk::Menu* -PluginSelector::create_by_category_menu (ARDOUR::PluginInfoList& all_plugs) +PluginSelector::create_by_tags_menu (ARDOUR::PluginInfoList& all_plugs) { using namespace Menu_Helpers; typedef std::map SubmenuMap; - SubmenuMap category_submenu_map; - - Menu* by_category = new Menu(); - by_category->set_name("ArdourContextMenu"); + SubmenuMap tags_submenu_map; + + Menu* by_tags = new Menu(); + by_tags->set_name("ArdourContextMenu"); + MenuList& by_tags_items = by_tags->items(); + + std::vector all_tags = manager.get_all_tags(false); + for (vector::iterator t = all_tags.begin(); t != all_tags.end(); ++t) { + Gtk::Menu *submenu = new Gtk::Menu; + by_tags_items.push_back (MenuElem (*t, *manage (submenu))); + tags_submenu_map.insert (pair (*t, submenu)); + submenu->set_name("ArdourContextMenu"); + } - MenuList& by_category_items = by_category->items(); - PluginMenuCompareByCategory cmp_by_category; - all_plugs.sort (cmp_by_category); + PluginMenuCompareByName cmp_by_name; + all_plugs.sort (cmp_by_name); for (PluginInfoList::const_iterator i = all_plugs.begin(); i != all_plugs.end(); ++i) { if (manager.get_status (*i) == PluginManager::Hidden) continue; - string category = (*i)->category; - - SubmenuMap::iterator x; - Gtk::Menu* submenu; - if ((x = category_submenu_map.find (category)) != category_submenu_map.end()) { - submenu = x->second; - } else { - submenu = new Gtk::Menu; - by_category_items.push_back (MenuElem (category, *manage (submenu))); - category_submenu_map.insert (pair (category, submenu)); - submenu->set_name("ArdourContextMenu"); + /* for each tag in the plugins tag list, add it to that submenu */ + vector tokens = manager.get_tags(*i); + for (vector::iterator t = tokens.begin(); t != tokens.end(); ++t) { + SubmenuMap::iterator x; + Gtk::Menu* submenu; + if ((x = tags_submenu_map.find (*t)) != tags_submenu_map.end()) { + submenu = x->second; + } else { + } + string typ = GetPluginTypeStr(*i); + MenuElem elem ((*i)->name + typ, (sigc::bind (sigc::mem_fun (*this, &PluginSelector::plugin_chosen_from_menu), *i))); + elem.get_child()->set_use_underline (false); + submenu->items().push_back (elem); } - string typ = GetPluginTypeStr(*i); - MenuElem elem ((*i)->name + typ, (sigc::bind (sigc::mem_fun (*this, &PluginSelector::plugin_chosen_from_menu), *i))); - elem.get_child()->set_use_underline (false); - submenu->items().push_back (elem); } - return by_category; + return by_tags; } void @@ -976,8 +1213,6 @@ PluginSelector::favorite_changed (const std::string& path) /* change state */ - (*iter)[plugin_columns.favorite] = favorite; - (*iter)[plugin_columns.hidden] = false; PluginManager::PluginStatusType status = (favorite ? PluginManager::Favorite : PluginManager::Normal); /* save new statuses list */ @@ -986,9 +1221,7 @@ PluginSelector::favorite_changed (const std::string& path) manager.set_status (pi->type, pi->unique_id, status); - manager.save_statuses (); - - build_plugin_menu (); + _need_status_save = true; } in_row_change = false; } @@ -1012,8 +1245,6 @@ PluginSelector::hidden_changed (const std::string& path) /* change state */ - (*iter)[plugin_columns.favorite] = false; - (*iter)[plugin_columns.hidden] = hidden; PluginManager::PluginStatusType status = (hidden ? PluginManager::Hidden : PluginManager::Normal); /* save new statuses list */ @@ -1022,103 +1253,11 @@ PluginSelector::hidden_changed (const std::string& path) manager.set_status (pi->type, pi->unique_id, status); - manager.save_statuses (); - - build_plugin_menu (); + _need_status_save = true; } in_row_change = false; } -bool -PluginSelector::fil_hidden_button_release (GdkEventButton*) -{ - _show_hidden = (fil_hidden_button.active_state() == 0); - fil_hidden_button.set_active (_show_hidden); - refill (); - return false; -} - -static Gtkmm2ext::ActiveState next_state (Gtkmm2ext::ActiveState s){ - switch (s) { - case Gtkmm2ext::Off: - return Gtkmm2ext::ImplicitActive; - break; - case Gtkmm2ext::ImplicitActive: - return Gtkmm2ext::ExplicitActive; - break; - case Gtkmm2ext::ExplicitActive: - return Gtkmm2ext::Off; - break; - default: assert(0); break; // not reached - } - /* impossible, but keep some compiles happy */ - fatal << string_compose (_("programming error: %1"), - X_("Illegal Active State.")) - << endmsg; - abort(); /*NOTREACHED*/ - return Gtkmm2ext::Off; -} - -static Gtkmm2ext::ActiveState prev_state (Gtkmm2ext::ActiveState s){ - switch (s) { - case Gtkmm2ext::Off: - return Gtkmm2ext::ExplicitActive; - break; - case Gtkmm2ext::ImplicitActive: - return Gtkmm2ext::Off; - break; - case Gtkmm2ext::ExplicitActive: - return Gtkmm2ext::ImplicitActive; - break; - default: assert(0); break; // not reached - } - /* impossible, but keep some compiles happy */ - fatal << string_compose (_("programming error: %1"), - X_("Illegal Active State.")) - << endmsg; - abort(); /*NOTREACHED*/ - return Gtkmm2ext::Off; -} - -bool -PluginSelector::fil_instruments_button_release (GdkEventButton* ev) -{ - if (ev->button == 3) { - _show_instruments = prev_state (fil_instruments_button.active_state()); - } else { - _show_instruments = next_state (fil_instruments_button.active_state()); - } - fil_instruments_button.set_active_state (_show_instruments); - refill (); - return false; -} - -bool -PluginSelector::fil_analysis_button_release (GdkEventButton* ev) -{ - if (ev->button == 3) { - _show_analysers = prev_state (fil_analysis_button.active_state()); - } else { - _show_analysers = next_state (fil_analysis_button.active_state()); - } - fil_analysis_button.set_active_state (_show_analysers); - refill (); - return false; -} - -bool -PluginSelector::fil_utils_button_release (GdkEventButton* ev) -{ - if (ev->button == 3) { - _show_utils = prev_state (fil_utils_button.active_state()); - } else { - _show_utils = next_state (fil_utils_button.active_state()); - } - fil_utils_button.set_active_state (_show_utils); - refill (); - return false; -} - void PluginSelector::show_manager () { diff --git a/gtk2_ardour/plugin_selector.h b/gtk2_ardour/plugin_selector.h index e4fb89d570..10d384103e 100644 --- a/gtk2_ardour/plugin_selector.h +++ b/gtk2_ardour/plugin_selector.h @@ -21,6 +21,7 @@ #define __ardour_plugin_selector_h__ #include +#include #include #include #include @@ -32,6 +33,7 @@ #include "gtkmm2ext/dndtreeview.h" #include "ardour/plugin.h" +#include "ardour/plugin_manager.h" #include "ardour/session_handle.h" #include "widgets/ardour_button.h" @@ -60,36 +62,57 @@ public: void show_manager (); private: + + //search + Gtk::CheckButton *_search_name_checkbox; + Gtk::CheckButton *_search_tags_checkbox; + Gtk::CheckButton *_search_ignore_checkbox; + + //radio-button filters + Gtk::RadioButton *_fil_effects_radio; + Gtk::RadioButton *_fil_instruments_radio; + Gtk::RadioButton *_fil_utils_radio; + Gtk::RadioButton *_fil_favorites_radio; + Gtk::RadioButton *_fil_hidden_radio; + Gtk::RadioButton *_fil_all_radio; + + //combobox filters + Gtk::ComboBoxText *_fil_type_combo; + Gtk::ComboBoxText *_fil_creator_combo; + Gtk::ComboBoxText *_fil_channel_combo; + PluginInterestedObject* interested_object; Gtk::ScrolledWindow scroller; // Available plugins Gtk::ScrolledWindow ascroller; // Added plugins - Gtk::ComboBoxText filter_mode; - Gtk::Entry filter_entry; - Gtk::Button filter_button; + Gtk::Entry search_entry; + Gtk::Button search_clear_button; + + Gtk::Entry *tag_entry; + void tag_reset_button_clicked (); + + void set_sensitive_widgets(); - ArdourWidgets::ArdourButton fil_hidden_button; - ArdourWidgets::ArdourButton fil_instruments_button; - ArdourWidgets::ArdourButton fil_analysis_button; - ArdourWidgets::ArdourButton fil_utils_button; + void search_clear_button_clicked (); + void search_entry_changed (); - void filter_button_clicked (); - void filter_entry_changed (); - void filter_mode_changed (); + void tag_entry_changed (); + sigc::connection tag_entry_connection; + + void tags_changed ( ARDOUR::PluginType t, std::string unique_id, std::string tag); struct PluginColumns : public Gtk::TreeModel::ColumnRecord { PluginColumns () { add (favorite); add (hidden); add (name); + add (tags); + add (creator); add (type_name); + add (audio_io); + add (midi_io); add (category); - add (creator); - add (audio_ins); - add (audio_outs); - add (midi_ins); - add (midi_outs); add (plugin); } Gtk::TreeModelColumn favorite; @@ -98,10 +121,9 @@ private: Gtk::TreeModelColumn type_name; Gtk::TreeModelColumn category; Gtk::TreeModelColumn creator; - Gtk::TreeModelColumn audio_ins; - Gtk::TreeModelColumn audio_outs; - Gtk::TreeModelColumn midi_ins; - Gtk::TreeModelColumn midi_outs; + Gtk::TreeModelColumn tags; + Gtk::TreeModelColumn audio_io; + Gtk::TreeModelColumn midi_io; Gtk::TreeModelColumn plugin; }; PluginColumns plugin_columns; @@ -144,12 +166,8 @@ private: void btn_apply_clicked(); ARDOUR::PluginPtr load_plugin (ARDOUR::PluginInfoPtr); bool show_this_plugin (const ARDOUR::PluginInfoPtr&, const std::string&); - void setup_filter_string (std::string&); - bool fil_hidden_button_release (GdkEventButton*); - bool fil_instruments_button_release (GdkEventButton*); - bool fil_analysis_button_release (GdkEventButton*); - bool fil_utils_button_release (GdkEventButton*); + void setup_search_string (std::string&); void favorite_changed (const std::string& path); void hidden_changed (const std::string& path); @@ -157,16 +175,19 @@ private: void plugin_chosen_from_menu (const ARDOUR::PluginInfoPtr&); + void plugin_status_changed ( ARDOUR::PluginType t, std::string unique_id, ARDOUR::PluginManager::PluginStatusType s ); + Gtk::Menu* create_favs_menu (ARDOUR::PluginInfoList&); Gtk::Menu* create_by_creator_menu (ARDOUR::PluginInfoList&); - Gtk::Menu* create_by_category_menu (ARDOUR::PluginInfoList&); + Gtk::Menu* create_by_tags_menu (ARDOUR::PluginInfoList&); void build_plugin_menu (); PBD::ScopedConnectionList plugin_list_changed_connection; - bool _show_hidden; - Gtkmm2ext::ActiveState _show_instruments; - Gtkmm2ext::ActiveState _show_analysers; - Gtkmm2ext::ActiveState _show_utils; + bool _need_tag_save; + bool _need_status_save; + bool _need_menu_rebuild; + + bool inhibit_refill; }; #endif // __ardour_plugin_selector_h__ -- cgit v1.2.3