Mixbus GUI updates (VCA layout, no panners)

diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc
index b60f35e8b7b14839b6207da3ffebf71d3244d758..79d8431581f5083e16279f1a91ab301bb322fba4 100644 (file)
--- a/gtk2_ardour/route_time_axis.cc
+++ b/gtk2_ardour/route_time_axis.cc
@@ -575,7 +575,7 @@ RouteTimeAxisView::build_automation_action_menu (bool for_selection)
                _main_automation_menu_map[Evoral::Parameter(MuteAutomation)] = mute_automation_item;
        }
 
-       if (!pan_tracks.empty()) {
+       if (!pan_tracks.empty() && !ARDOUR::Profile->get_mixbus()) {
                items.push_back (CheckMenuElem (_("Pan"), sigc::mem_fun (*this, &RouteTimeAxisView::update_pan_track_visibility)));
                pan_automation_item = dynamic_cast<Gtk::CheckMenuItem*> (&items.back ());
                pan_automation_item->set_active (single_track_selected &&

diff --git a/gtk2_ardour/vca_time_axis.cc b/gtk2_ardour/vca_time_axis.cc
index 39ce9c0aa0c345fb40c66b5b77285939ce1cf14c..f5eb1be7d7620df195c882e87da21d448b8fbfac 100644 (file)
--- 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 ();