Merged with trunk (painfully)

[ardour.git] / gtk2_ardour / plugin_ui.h

diff --git a/gtk2_ardour/plugin_ui.h b/gtk2_ardour/plugin_ui.h
index 61d3d415806353e12acd7d100c4edf063b4ae157..958b7995c6edb5ae97936e98687286b86f44ab4e 100644 (file)
--- a/gtk2_ardour/plugin_ui.h
+++ b/gtk2_ardour/plugin_ui.h
@@ -101,8 +101,6 @@ class PluginUI : public PlugUIBase, public Gtk::VBox
        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 ();
@@ -223,8 +217,8 @@ class VSTPluginUI : public PlugUIBase, public Gtk::VBox
        ~VSTPluginUI ();
 
        gint get_preferred_height ();
-       bool start_updating(GdkEventAny*) {}
-       bool stop_updating(GdkEventAny*) {}
+       bool start_updating(GdkEventAny*) {return false;}
+       bool stop_updating(GdkEventAny*) {return false;}
 
        int package (Gtk::Window&);
 
@@ -234,7 +228,7 @@ class VSTPluginUI : public PlugUIBase, public Gtk::VBox
        Gtk::HBox   preset_box;
        Gtk::VBox   vpacker;
        
-       gboolean configure_handler (GdkEventConfigure*, GtkSocket*);
+       gboolean configure_handler (GdkEventConfigure*, Gtk::Socket*);
        void save_plugin_setting ();
 };
 #endif