Mixbus GUI updates (VCA layout, no panners)
This commit is contained in:
parent
2a08746437
commit
d405b2dd6c
@ -575,7 +575,7 @@ RouteTimeAxisView::build_automation_action_menu (bool for_selection)
|
|||||||
_main_automation_menu_map[Evoral::Parameter(MuteAutomation)] = mute_automation_item;
|
_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)));
|
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 = dynamic_cast<Gtk::CheckMenuItem*> (&items.back ());
|
||||||
pan_automation_item->set_active (single_track_selected &&
|
pan_automation_item->set_active (single_track_selected &&
|
||||||
|
@ -78,11 +78,26 @@ VCATimeAxisView::VCATimeAxisView (PublicEditor& ed, Session* s, ArdourCanvas::Ca
|
|||||||
drop_button.set_tweaks(ArdourButton::TrackHeader);
|
drop_button.set_tweaks(ArdourButton::TrackHeader);
|
||||||
automation_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);
|
if (ARDOUR::Profile->get_mixbus()) {
|
||||||
controls_table.attach (solo_button, 3, 4, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
|
controls_button_size_group->add_widget(mute_button);
|
||||||
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);
|
Gtk::Fixed *blank = manage(new Gtk::Fixed());
|
||||||
controls_table.attach (gain_meter.get_gain_slider(), 0, 2, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 1, 0);
|
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 ();
|
mute_button.show ();
|
||||||
solo_button.show ();
|
solo_button.show ();
|
||||||
|
Loading…
Reference in New Issue
Block a user