MixerStrip* MixerStrip::_entered_mixer_strip;
PBD::Signal1<void,MixerStrip*> MixerStrip::CatchDeletion;
-static const uint32_t n_vca_buttons = 4;
-
MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, bool in_mixer)
: AxisView(sess)
, RouteUI (sess)
, solo_iso_table (1, 2)
, mute_solo_table (1, 2)
, bottom_button_table (1, 3)
- , vca_table (1, 4)
, meter_point_button (_("pre"))
, monitor_section_button (0)
, midi_input_enable_button (0)
, solo_iso_table (1, 2)
, mute_solo_table (1, 2)
, bottom_button_table (1, 3)
- , vca_table (1, 4)
, meter_point_button (_("pre"))
, monitor_section_button (0)
, midi_input_enable_button (0)
}
solo_iso_table.show ();
- vca_table.set_homogeneous (true);
- vca_table.set_spacings (1);
- for (uint32_t n = 0; n < n_vca_buttons; ++n) {
- ArdourButton* v = manage (new ArdourButton (ArdourButton::default_elements));
- vca_buttons.push_back (v); /* no ownership transfer, button is managed by its container */
- v->set_no_show_all (true);
- v->set_name (X_("vca assign"));
- v->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
- v->signal_button_release_event().connect (sigc::bind (sigc::mem_fun (*this, &MixerStrip::vca_button_release), n), false);
- UI::instance()->set_tip (*v, string_compose (_("VCA %1 assign"), n));
- v->set_text (_("v."));
- v->show ();
- vca_table.attach (*v, n, n+1, 0, 1);
- }
- vca_table.show ();
+ vca_button = manage (new ArdourButton (ArdourButton::default_elements));
+ vca_button->set_no_show_all (true);
+ vca_button->set_name (X_("vca assign"));
+ vca_button->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
+ vca_button->signal_button_release_event().connect (sigc::mem_fun (*this, &MixerStrip::vca_button_release), false);
+ UI::instance()->set_tip (*vca_button, _("VCA assignments"));
+ vca_button->set_text (_("-vca-"));
+ vca_button->show ();
rec_mon_table.set_homogeneous (true);
rec_mon_table.set_row_spacings (2);
global_vpacker.pack_start (solo_iso_table, Gtk::PACK_SHRINK);
global_vpacker.pack_start (mute_solo_table, Gtk::PACK_SHRINK);
global_vpacker.pack_start (gpm, Gtk::PACK_SHRINK);
- global_vpacker.pack_start (vca_table, Gtk::PACK_SHRINK);
+ global_vpacker.pack_start (*vca_button, Gtk::PACK_SHRINK);
global_vpacker.pack_start (bottom_button_table, Gtk::PACK_SHRINK);
if (!ARDOUR::Profile->get_trx()) {
global_vpacker.pack_start (output_button, Gtk::PACK_SHRINK);
_visibility.add (&solo_iso_table, X_("SoloIsoLock"), _("Solo Iso / Lock"), false);
_visibility.add (&output_button, X_("Output"), _("Output"), false);
_visibility.add (&_comment_button, X_("Comments"), _("Comments"), false);
- _visibility.add (&vca_table, X_("VCA"), _("VCA Assigns"), false);
+ _visibility.add (vca_button, X_("VCA"), _("VCA Assigns"), false);
parameter_changed (X_("mixer-element-visibility"));
UIConfiguration::instance().ParameterChanged.connect (sigc::mem_fun (*this, &MixerStrip::parameter_changed));
_route->comment_changed.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::setup_comment_button, this), gui_context());
_route->PropertyChanged.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::property_changed, this, _1), gui_context());
+ _route->gain_control()->MasterStatusChange.connect (route_connections,
+ invalidator (*this),
+ boost::bind (&MixerStrip::update_vca_display, this),
+ gui_context());
+
set_stuff_from_route ();
/* now force an update of all the various elements */
update_mute_display ();
update_solo_display ();
+ update_vca_display ();
name_changed ();
comment_changed ();
route_group_changed ();
+ update_track_number_visibility ();
connect_to_pan ();
panners.setup_pan ();
return true;
}
- if (_session->actively_recording() && _route->record_enabled())
+ if (_session->actively_recording() && is_track() && track()->rec_enable_control()->get_value())
return true;
switch (ev->button) {
list_route_operations ();
/* do not allow rename if the track is record-enabled */
- rename_menu_item->set_sensitive (!_route->record_enabled());
+ rename_menu_item->set_sensitive (!is_track() || !track()->rec_enable_control()->get_value());
route_ops_menu->popup (1, ev->time);
return true;
list_route_operations ();
/* do not allow rename if the track is record-enabled */
- rename_menu_item->set_sensitive (!_route->record_enabled());
+ rename_menu_item->set_sensitive (!is_track() || !track()->rec_enable_control()->get_value());
route_ops_menu->popup (1, ev->time);
}
list_route_operations ();
/* do not allow rename if the track is record-enabled */
- rename_menu_item->set_sensitive (!_route->record_enabled());
+ rename_menu_item->set_sensitive (!is_track() || !track()->rec_enable_control()->get_value());
route_ops_menu->popup (1, ev->time);
return true;
monitor_section_button->set_text (_("Mon"));
}
- if (_route && _route->solo_safe()) {
+ if (_route && _route->solo_safe_control()->solo_safe()) {
solo_button->set_visual_state (Gtkmm2ext::VisualState (solo_button->visual_state() | Gtkmm2ext::Insensitive));
} else {
solo_button->set_visual_state (Gtkmm2ext::VisualState (solo_button->visual_state() & ~Gtkmm2ext::Insensitive));
monitor_section_button->set_text (S_("Mon|O"));
}
- if (_route && _route->solo_safe()) {
+ if (_route && _route->solo_safe_control()->solo_safe()) {
solo_button->set_visual_state (Gtkmm2ext::VisualState (solo_button->visual_state() | Gtkmm2ext::Insensitive));
} else {
solo_button->set_visual_state (Gtkmm2ext::VisualState (solo_button->visual_state() & ~Gtkmm2ext::Insensitive));
our VisibilityGroup to reflect these changes in our widgets.
*/
_visibility.set_state (UIConfiguration::instance().get_mixer_strip_visibility ());
- }
- else if (p == "track-name-number") {
+ } else if (p == "track-name-number") {
name_changed ();
- }
- else if (p == "use-monitor-bus") {
+ } else if (p == "use-monitor-bus") {
if (monitor_section_button) {
if (mute_button->get_parent()) {
mute_button->get_parent()->remove(*mute_button);
mute_button->show();
}
}
+ } else if (p == "track-name-number") {
+ update_track_number_visibility();
}
}
}
void
-MixerStrip::vca_menu_toggle (MenuItem* m, uint32_t n)
+MixerStrip::vca_menu_toggle (CheckMenuItem* menuitem, uint32_t n)
{
if (!_route) {
return;
return;
}
- RadioMenuItem* ri = dynamic_cast<RadioMenuItem*> (m);
-
- if (!ri) {
- return;
+ if (!_selected) {
+ /* if this strip is not selected, add it before carrying out
+ changes to assignment. the user probably didn't notice
+ that they were clicking on an unselected track.
+ */
+ _mixer.select_strip (*this);
}
- if (!ri->get_active()) {
+ if (!menuitem->get_active()) {
_mixer.do_vca_unassign (vca);
- return;
+ } else {
+ _mixer.do_vca_assign (vca);
}
-
- /* Now invoke a global method to apply this all relevant strips/routes */
-
- _mixer.do_vca_assign (vca);
}
void
return;
}
- vca->add (_route);
+ _route->assign (vca);
}
void
return;
}
- if (!vca) {
- /* null VCA means drop all VCA assignments */
- }
+ _route->unassign (vca);
}
bool
-MixerStrip::vca_button_release (GdkEventButton* ev, uint32_t which)
+MixerStrip::vca_button_release (GdkEventButton* ev)
{
using namespace Gtk::Menu_Helpers;
- if (!_session || !Keyboard::is_context_menu_event (ev)) {
+ if (!_session) {
+ return false;
+ }
+
+ /* primary click only */
+
+ if (ev->button != 1) {
return false;
}
Menu* menu = new Menu;
MenuList& items = menu->items();
- RadioMenuItem::Group group;
items.push_back (MenuElem (_("Unassign"), sigc::bind (sigc::mem_fun (_mixer, &Mixer_UI::do_vca_unassign), boost::shared_ptr<VCA>())));
for (VCAList::iterator v = vcas.begin(); v != vcas.end(); ++v) {
- items.push_back (RadioMenuElem (group, (*v)->name()));
- RadioMenuItem* item = dynamic_cast<RadioMenuItem*> (&items.back());
+ items.push_back (CheckMenuElem ((*v)->name()));
+ CheckMenuItem* item = dynamic_cast<CheckMenuItem*> (&items.back());
if (_route->slaved_to (*v)) {
item->set_active (true);
}
return true;
}
+
+void
+MixerStrip::update_track_number_visibility ()
+{
+ DisplaySuspender ds;
+ bool show_label = _session->config.get_track_name_number();
+
+ if (_route && _route->is_master()) {
+ show_label = false;
+ }
+
+ if (show_label) {
+ number_label.show ();
+ // see ArdourButton::on_size_request(), we should probably use a global size-group here instead.
+ // except the width of the number label is subtracted from the name-hbox, so we
+ // need to explictly calculate it anyway until the name-label & entry become ArdourWidgets.
+ int tnw = (2 + std::max(2u, _session->track_number_decimals())) * number_label.char_pixel_width();
+ if (tnw & 1) --tnw;
+ number_label.set_size_request(tnw, -1);
+ number_label.show ();
+ //name_hbox.set_size_request(TimeAxisView::name_width_px - 2 - tnw, -1); // -2 = cellspacing
+ } else {
+ number_label.hide ();
+ }
+}
projects / ardour.git / blobdiff