From 8207b545d12493ae1b708c42fc7dc31dcca0ea67 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Tue, 30 Jan 2018 13:10:32 +0100 Subject: Use backend-API to reset tags, remove unused category --- gtk2_ardour/plugin_selector.cc | 12 +++--------- gtk2_ardour/plugin_selector.h | 2 -- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/gtk2_ardour/plugin_selector.cc b/gtk2_ardour/plugin_selector.cc index 93d30bb2f4..46c080a4de 100644 --- a/gtk2_ardour/plugin_selector.cc +++ b/gtk2_ardour/plugin_selector.cc @@ -120,7 +120,7 @@ PluginSelector::PluginSelector (PluginManager& mgr) added_list.set_headers_visible (true); added_list.set_reorderable (false); - for (int i = 2; i <= 7; i++) { + for (int i = 2; i <= 7; ++i) { Gtk::TreeView::Column* column = plugin_display.get_column(i); if (column) { column->set_sort_column(i); @@ -571,7 +571,6 @@ PluginSelector::refiller (const PluginInfoList& plugs, const::std::string& searc newrow[plugin_columns.name] = name; newrow[plugin_columns.type_name] = type; - newrow[plugin_columns.category] = (*i)->category; /* Creator */ string creator = (*i)->creator; @@ -831,16 +830,11 @@ PluginSelector::search_clear_button_clicked () void PluginSelector::tag_reset_button_clicked () { - /* 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); + manager.reset_tags (pi); + display_selection_changed (); _need_tag_save = true; } } diff --git a/gtk2_ardour/plugin_selector.h b/gtk2_ardour/plugin_selector.h index 10d384103e..3b90455408 100644 --- a/gtk2_ardour/plugin_selector.h +++ b/gtk2_ardour/plugin_selector.h @@ -112,14 +112,12 @@ private: add (type_name); add (audio_io); add (midi_io); - add (category); add (plugin); } Gtk::TreeModelColumn favorite; Gtk::TreeModelColumn hidden; Gtk::TreeModelColumn name; Gtk::TreeModelColumn type_name; - Gtk::TreeModelColumn category; Gtk::TreeModelColumn creator; Gtk::TreeModelColumn tags; Gtk::TreeModelColumn audio_io; -- cgit v1.2.3