fix track controls height allocation to be font sensitive; fix core dump related...

[ardour.git] / gtk2_ardour / plugin_ui.h

diff --git a/gtk2_ardour/plugin_ui.h b/gtk2_ardour/plugin_ui.h
index 0046147c96c97c28ac03d28db8295780fa42df30..162c26a4f5483d36818a795cc87e88cb5c90fd29 100644 (file)
--- a/gtk2_ardour/plugin_ui.h
+++ b/gtk2_ardour/plugin_ui.h
@@ -64,15 +64,15 @@ namespace Gtkmm2ext {
        class PixmapButton;
 }
 
-class PlugUIBase : public sigc::trackable
+class PlugUIBase : public virtual sigc::trackable
 {
   public:
        PlugUIBase (ARDOUR::PluginInsert&);
        virtual ~PlugUIBase() {}
 
        virtual gint get_preferred_height () = 0;
-       virtual void start_updating() = 0;
-       virtual void stop_updating() = 0;
+       virtual bool start_updating(GdkEventAny*) = 0;
+       virtual bool stop_updating(GdkEventAny*) = 0;
 
   protected:
        ARDOUR::PluginInsert& insert;
@@ -81,7 +81,7 @@ class PlugUIBase : public sigc::trackable
        Gtk::Button save_button;
        Gtk::ToggleButton bypass_button;
 
-       gint setting_selected(GdkEventAny* ignored);
+       void setting_selected();
        void save_plugin_setting (void);
        void bypass_toggled();
 };
@@ -94,15 +94,13 @@ class PluginUI : public PlugUIBase, public Gtk::VBox
        
        gint get_preferred_height () { return prefheight; }
 
-       void start_updating();
-       void stop_updating();
+       bool start_updating(GdkEventAny*);
+       bool stop_updating(GdkEventAny*);
 
   private:
        ARDOUR::AudioEngine &engine;
        Gtk::HBox settings_box;
        Gtk::HBox hpacker;
-       Gtk::VBox info_vbox;
-       Gtk::EventBox name_ebox;
        
        Gtk::Table button_table;
        Gtk::Table output_table;
@@ -111,13 +109,8 @@ class PluginUI : public PlugUIBase, public Gtk::VBox
        Gtk::Adjustment hAdjustment;
        Gtk::Adjustment vAdjustment;
        Gtk::Viewport scroller_view;
-       Gtk::Label nameinfo_label;
-       Gtk::Label paraminfo_label;
-       Gtk::Label makerinfo_label;
        Gtk::Menu* automation_menu;
 
-       bool setting_name_status;
-
        gint prefheight;
        bool is_scrollable;
 
@@ -142,8 +135,8 @@ class PluginUI : public PlugUIBase, public Gtk::VBox
        
        static const int32_t initial_button_rows = 6;
        static const int32_t initial_button_cols = 1;
-       static const int32_t initial_output_rows = 8;
-       static const int32_t initial_output_cols = 1;
+       static const int32_t initial_output_rows = 1;
+       static const int32_t initial_output_cols = 4;
 
        struct ControlUI : public Gtk::HBox {
 
@@ -168,7 +161,8 @@ class PluginUI : public PlugUIBase, public Gtk::VBox
            Gtk::EventBox *display;
            Gtk::Label*    display_label;
 
-           Gtk::VBox  *    vbox;
+               Gtk::HBox  *    hbox;
+               Gtk::VBox  *    vbox;
            MeterInfo  *    meterinfo;
 
            ControlUI ();
@@ -186,8 +180,7 @@ class PluginUI : public PlugUIBase, public Gtk::VBox
        void parameter_changed (uint32_t, float, ControlUI* cui);
        void update_control_display (ControlUI* cui);
        void control_port_toggled (ControlUI* cui);
-       bool control_combo_changed (GdkEventAny* ignored, ControlUI* cui);
-       gint entry_focus_event (GdkEventFocus* ev);
+       void control_combo_changed (ControlUI* cui);
 
        void redirect_active_changed (ARDOUR::Redirect*, void*);
 
@@ -224,8 +217,8 @@ class VSTPluginUI : public PlugUIBase, public Gtk::VBox
        ~VSTPluginUI ();
 
        gint get_preferred_height ();
-       void start_updating() {}
-       void stop_updating() {}
+       bool start_updating(GdkEventAny*) {}
+       bool stop_updating(GdkEventAny*) {}
 
        int package (Gtk::Window&);