projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
first step to separate generic-gui layout
[ardour.git]
/
gtk2_ardour
/
plugin_ui.h
diff --git
a/gtk2_ardour/plugin_ui.h
b/gtk2_ardour/plugin_ui.h
index d2e5e21cca15f918d86fd0337ffbc7b9fc292f7d..207f7db984bae2f96fb2746b93fdb7fd9450353b 100644
(file)
--- a/
gtk2_ardour/plugin_ui.h
+++ b/
gtk2_ardour/plugin_ui.h
@@
-194,17
+194,8
@@
class GenericPluginUI : public PlugUIBase, public Gtk::VBox
private:
Gtk::VBox main_contents;
private:
Gtk::VBox main_contents;
-
Gtk::HBox settings_box;
Gtk::HBox hpacker;
Gtk::HBox settings_box;
Gtk::HBox hpacker;
-
- Gtk::Table button_table;
- Gtk::Table output_table;
-
- Gtk::ScrolledWindow scroller;
- Gtk::Adjustment hAdjustment;
- Gtk::Adjustment vAdjustment;
- Gtk::Viewport scroller_view;
Gtk::Menu* automation_menu;
gint prefheight;
Gtk::Menu* automation_menu;
gint prefheight;
@@
-229,11
+220,6
@@
class GenericPluginUI : public PlugUIBase, public Gtk::VBox
}
};
}
};
- static const int32_t initial_button_rows = 12;
- static const int32_t initial_button_cols = 1;
- static const int32_t initial_output_rows = 1;
- static const int32_t initial_output_cols = 4;
-
/* FIXME: Unify with AutomationController */
struct ControlUI : public Gtk::HBox {
/* FIXME: Unify with AutomationController */
struct ControlUI : public Gtk::HBox {
@@
-246,10
+232,10
@@
class GenericPluginUI : public PlugUIBase, public Gtk::VBox
Gtk::ComboBoxText* combo;
boost::shared_ptr<ARDOUR::ScalePoints> scale_points;
Gtk::ComboBoxText* combo;
boost::shared_ptr<ARDOUR::ScalePoints> scale_points;
- Gtk::ToggleButton* button;
boost::shared_ptr<AutomationController> controller;
Gtkmm2ext::ClickBox* clickbox;
Gtk::Label label;
boost::shared_ptr<AutomationController> controller;
Gtkmm2ext::ClickBox* clickbox;
Gtk::Label label;
+ bool button;
bool update_pending;
char ignore_change;
Gtk::Button automate_button;
bool update_pending;
char ignore_change;
Gtk::Button automate_button;
@@
-275,6
+261,8
@@
class GenericPluginUI : public PlugUIBase, public Gtk::VBox
void output_update();
void build ();
void output_update();
void build ();
+ void layout (const std::vector<ControlUI *>& control_uis);
+
ControlUI* build_control_ui (const Evoral::Parameter& param,
const ARDOUR::ParameterDescriptor& desc,
boost::shared_ptr<ARDOUR::AutomationControl> mcontrol,
ControlUI* build_control_ui (const Evoral::Parameter& param,
const ARDOUR::ParameterDescriptor& desc,
boost::shared_ptr<ARDOUR::AutomationControl> mcontrol,
@@
-282,9
+270,7
@@
class GenericPluginUI : public PlugUIBase, public Gtk::VBox
bool is_input);
void ui_parameter_changed (ControlUI* cui);
bool is_input);
void ui_parameter_changed (ControlUI* cui);
- void toggle_parameter_changed (ControlUI* cui);
void update_control_display (ControlUI* cui);
void update_control_display (ControlUI* cui);
- void control_port_toggled (ControlUI* cui);
void control_combo_changed (ControlUI* cui);
void astate_clicked (ControlUI*);
void control_combo_changed (ControlUI* cui);
void astate_clicked (ControlUI*);