diff options
| author | Robin Gareus <robin@gareus.org> | 2017-06-23 23:40:19 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2017-06-23 23:43:01 +0200 |
| commit | d405b2dd6c5aba8adbd72a36bc7ad04629768e6b (patch) | |
| tree | a42edf6159550576b532297b28d8efbe14a9f645 /gtk2_ardour/vca_time_axis.cc | |
| parent | 2a087464377e753e42395ed39081322c73d13f03 (diff) | |
Mixbus GUI updates (VCA layout, no panners)
Diffstat (limited to 'gtk2_ardour/vca_time_axis.cc')
| -rw-r--r-- | gtk2_ardour/vca_time_axis.cc | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/gtk2_ardour/vca_time_axis.cc b/gtk2_ardour/vca_time_axis.cc index 39ce9c0aa0..f5eb1be7d7 100644 --- a/gtk2_ardour/vca_time_axis.cc +++ b/gtk2_ardour/vca_time_axis.cc @@ -78,11 +78,26 @@ VCATimeAxisView::VCATimeAxisView (PublicEditor& ed, Session* s, ArdourCanvas::Ca drop_button.set_tweaks(ArdourButton::TrackHeader); automation_button.set_tweaks(ArdourButton::TrackHeader); - controls_table.attach (mute_button, 2, 3, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0); - controls_table.attach (solo_button, 3, 4, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0); - controls_table.attach (automation_button, 2, 3, 1, 2, Gtk::SHRINK, Gtk::SHRINK, 0, 0); - controls_table.attach (drop_button, 3, 4, 1, 2, Gtk::SHRINK, Gtk::SHRINK, 0, 0); - controls_table.attach (gain_meter.get_gain_slider(), 0, 2, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 1, 0); + if (ARDOUR::Profile->get_mixbus()) { + controls_button_size_group->add_widget(mute_button); + + Gtk::Fixed *blank = manage(new Gtk::Fixed()); + controls_button_size_group->add_widget(*blank); + controls_table.attach (*blank, 0, 1, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0); + blank->show(); + + controls_table.attach (mute_button, 1, 2, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0); + controls_table.attach (solo_button, 2, 3, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0); + controls_table.attach (automation_button, 1, 2, 2, 3, Gtk::SHRINK, Gtk::SHRINK, 0, 0); + controls_table.attach (drop_button, 2, 3, 2, 3, Gtk::SHRINK, Gtk::SHRINK, 0, 0); + controls_table.attach (gain_meter.get_gain_slider(), 3, 5, 2, 3, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 1, 0); + } else { + controls_table.attach (mute_button, 2, 3, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0); + controls_table.attach (solo_button, 3, 4, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0); + controls_table.attach (automation_button, 2, 3, 1, 2, Gtk::SHRINK, Gtk::SHRINK, 0, 0); + controls_table.attach (drop_button, 3, 4, 1, 2, Gtk::SHRINK, Gtk::SHRINK, 0, 0); + controls_table.attach (gain_meter.get_gain_slider(), 0, 2, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 1, 0); + } mute_button.show (); solo_button.show (); |