Merged with trunk R708

[ardour.git] / gtk2_ardour / plugin_selector.h

diff --git a/gtk2_ardour/plugin_selector.h b/gtk2_ardour/plugin_selector.h
index 77eefd2c028e94c49ea5f9302ae0731688d3e0df..220de74871f501b9669d1effc6ae092f23d2bcef 100644 (file)
--- a/gtk2_ardour/plugin_selector.h
+++ b/gtk2_ardour/plugin_selector.h
@@ -31,11 +31,11 @@ namespace ARDOUR {
        class Plugin;
 }
 
-class PluginSelector : public Gtk::Dialog
+class PluginSelector : public ArdourDialog
 {
   public:
        PluginSelector (ARDOUR::PluginManager *);
-       sigc::signal<void,ARDOUR::Plugin *> PluginCreated;
+       sigc::signal<void,boost::shared_ptr<ARDOUR::Plugin> > PluginCreated;
 
        int run (); // XXX should we try not to overload the non-virtual Gtk::Dialog::run() ?
 
@@ -44,9 +44,11 @@ class PluginSelector : public Gtk::Dialog
   private:
        ARDOUR::Session* session;
        Gtk::Notebook notebook;
+       Gtk::ScrolledWindow lscroller;
+       Gtk::ScrolledWindow vscroller;
+       Gtk::ScrolledWindow ascroller;
 
        // page 1
-       //Gtkmm2ext::Selector ladspa_display;
        struct LadspaColumns : public Gtk::TreeModel::ColumnRecord {
                LadspaColumns () {
                        add (name);
@@ -65,6 +67,8 @@ class PluginSelector : public Gtk::Dialog
        Glib::RefPtr<Gtk::ListStore> lmodel;
        Glib::RefPtr<Gtk::TreeSelection> lselection;
        Gtk::TreeView ladspa_display;
+       Gtk::Button* btn_add;
+       Gtk::Button* btn_remove;
 
        struct AddedColumns : public Gtk::TreeModel::ColumnRecord {
                AddedColumns () {
@@ -93,14 +97,14 @@ class PluginSelector : public Gtk::Dialog
                Gtk::TreeModelColumn<std::string> outs;
            Gtk::TreeModelColumn<ARDOUR::PluginInfo *> plugin;
        };
-       LadspaColumns vcols;
+       VstColumns vcols;
        Glib::RefPtr<Gtk::ListStore> vmodel;
        Glib::RefPtr<Gtk::TreeSelection> vselection;
        Gtk::TreeView vst_display;
        static void _vst_refiller (void *);
        void vst_refiller ();
+       void vst_display_selection_changed();
 #endif 
-       //Gtkmm2ext::Selector o_selector;
 
        ARDOUR::PluginInfo* i_selected_plug;
 
@@ -112,13 +116,14 @@ class PluginSelector : public Gtk::Dialog
        list<ARDOUR::PluginInfo*> added_plugins;
 
        static void _input_refiller (void *);
-       //static void _output_refiller (void *);
-
+       
        void input_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 btn_apply_clicked();
        void use_plugin (ARDOUR::PluginInfo*);
        void cleanup ();