diff options
author | David Robillard <d@drobilla.net> | 2008-01-10 21:20:59 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2008-01-10 21:20:59 +0000 |
commit | bb457bb960c5bd7ed538f9d31477293415739f68 (patch) | |
tree | 84324a63b87c03589cd165b9e474296eaebb4772 /gtk2_ardour/plugin_selector.h | |
parent | 73dd9d37e7d715e0d78c0e51569968f9494dac7f (diff) |
Merge libs/ardour and gtk2_ardour with 2.0-ongoing R2837.
git-svn-id: svn://localhost/ardour2/trunk@2883 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/plugin_selector.h')
-rw-r--r-- | gtk2_ardour/plugin_selector.h | 90 |
1 files changed, 21 insertions, 69 deletions
diff --git a/gtk2_ardour/plugin_selector.h b/gtk2_ardour/plugin_selector.h index 5994e7b3ef..ac300638d7 100644 --- a/gtk2_ardour/plugin_selector.h +++ b/gtk2_ardour/plugin_selector.h @@ -44,10 +44,7 @@ class PluginSelector : public ArdourDialog private: ARDOUR::Session* session; - Gtk::Notebook notebook; - Gtk::ScrolledWindow lscroller; // ladspa - Gtk::ScrolledWindow vscroller; // vst - Gtk::ScrolledWindow auscroller; // AudioUnit + Gtk::ScrolledWindow scroller; // Available plugins Gtk::ScrolledWindow ascroller; // Added plugins Gtk::ComboBoxText filter_mode; @@ -58,27 +55,27 @@ class PluginSelector : public ArdourDialog void filter_entry_changed (); void filter_mode_changed (); - ARDOUR::PluginType current_selection; - - // page 1 - struct LadspaColumns : public Gtk::TreeModel::ColumnRecord { - LadspaColumns () { + struct PluginColumns : public Gtk::TreeModel::ColumnRecord { + PluginColumns () { add (name); - add (type); + add (type_name); + add (category); + add (creator); add (ins); add (outs); add (plugin); } - Gtk::TreeModelColumn<std::string> name; - Gtk::TreeModelColumn<std::string> type; + Gtk::TreeModelColumn<std::string> name; + Gtk::TreeModelColumn<std::string> type_name; + Gtk::TreeModelColumn<std::string> category; + Gtk::TreeModelColumn<std::string> creator; Gtk::TreeModelColumn<std::string> ins; Gtk::TreeModelColumn<std::string> outs; - Gtk::TreeModelColumn<ARDOUR::PluginInfoPtr> plugin; + Gtk::TreeModelColumn<ARDOUR::PluginInfoPtr> plugin; }; - LadspaColumns lcols; - Glib::RefPtr<Gtk::ListStore> lmodel; - Glib::RefPtr<Gtk::TreeSelection> lselection; - Gtk::TreeView ladspa_display; + PluginColumns plugin_columns; + Glib::RefPtr<Gtk::ListStore> plugin_model; + Gtk::TreeView plugin_display; Gtk::Button* btn_add; Gtk::Button* btn_remove; @@ -92,72 +89,27 @@ class PluginSelector : public ArdourDialog }; AddedColumns acols; Glib::RefPtr<Gtk::ListStore> amodel; - Glib::RefPtr<Gtk::TreeSelection> aselection; Gtk::TreeView added_list; -#ifdef VST_SUPPORT - // page 2 - struct VstColumns : public Gtk::TreeModel::ColumnRecord { - VstColumns () { - add (name); - add (ins); - add (outs); - add (plugin); - } - Gtk::TreeModelColumn<std::string> name; - Gtk::TreeModelColumn<std::string> ins; - Gtk::TreeModelColumn<std::string> outs; - Gtk::TreeModelColumn<ARDOUR::PluginInfoPtr> plugin; - }; - VstColumns vcols; - Glib::RefPtr<Gtk::ListStore> vmodel; - Glib::RefPtr<Gtk::TreeSelection> vselection; - Gtk::TreeView vst_display; - void vst_refiller (); - void vst_display_selection_changed(); -#endif // VST_SUPPORT - -#ifdef HAVE_AUDIOUNIT - // page 3 - struct AUColumns : public Gtk::TreeModel::ColumnRecord { - AUColumns () { - add (name); - add (ins); - add (outs); - add (plugin); - } - Gtk::TreeModelColumn<std::string> name; - Gtk::TreeModelColumn<std::string> ins; - Gtk::TreeModelColumn<std::string> outs; - Gtk::TreeModelColumn<ARDOUR::PluginInfoPtr> plugin; - }; - AUColumns aucols; - Glib::RefPtr<Gtk::ListStore> aumodel; - Glib::RefPtr<Gtk::TreeSelection> auselection; - Gtk::TreeView au_display; - void au_refiller (); - void au_display_selection_changed(); -#endif //HAVE_AUDIOUNIT + void refill (); + void refiller (const ARDOUR::PluginInfoList& plugs, const::std::string& filterstr, const char* type); + void ladspa_refiller (const std::string&); + void vst_refiller (const std::string&); + void au_refiller (const std::string&); ARDOUR::PluginManager *manager; - static void _ladspa_refiller (void *); - - void ladspa_refiller (); void row_clicked(GdkEventButton *); void btn_add_clicked(); void btn_remove_clicked(); void btn_update_clicked(); void added_list_selection_changed(); - void ladspa_display_selection_changed(); + void display_selection_changed(); void btn_apply_clicked(); void use_plugin (ARDOUR::PluginInfoPtr); void cleanup (); - void refill (); - bool show_this_plugin (ARDOUR::PluginInfoPtr&, const std::string&); + bool show_this_plugin (const ARDOUR::PluginInfoPtr&, const std::string&); void setup_filter_string (std::string&); - - void set_correct_focus(); }; #endif // __ardour_plugin_selector_h__ |