input_button.set_text (_("Input"));
input_button.set_name ("mixer strip button");
+ input_button.set_size_request (-1, 20);
input_button_box.pack_start (input_button, true, true);
output_button.set_text (_("Output"));
output_button.set_name ("mixer strip button");
Gtkmm2ext::set_size_request_to_display_given_text (output_button, longest_label.c_str(), 4, 4);
- ARDOUR_UI::instance()->set_tip (&meter_point_button, _("Select metering point"), "");
+ ARDOUR_UI::instance()->set_tip (&meter_point_button, _("Click to select metering point"), "");
meter_point_button.set_name ("mixer strip button");
/* TRANSLATORS: this string should be longest of the strings
top_button_table.attach (*monitor_disk_button, 1, 2, 0, 1);
top_button_table.show ();
- rec_solo_table.set_homogeneous (false);
+ rec_solo_table.set_homogeneous (true);
rec_solo_table.set_row_spacings (2);
rec_solo_table.set_col_spacings (2);
rec_solo_table.attach (*solo_isolated_led, 1, 2, 0, 1);
bottom_button_table.set_spacings (2);
bottom_button_table.set_homogeneous (true);
- bottom_button_table.attach (group_button, 0, 1, 0, 1);
+// bottom_button_table.attach (group_button, 0, 1, 0, 1);
+ bottom_button_table.attach (gpm.gain_automation_state_button, 0, 1, 0, 1);
- name_button.set_name ("mixer strip name button");
+ name_button.set_name ("mixer strip button");
name_button.set_text (" "); /* non empty text, forces creation of the layout */
name_button.set_text (""); /* back to empty */
name_button.layout()->set_ellipsize (Pango::ELLIPSIZE_END);
name_button.signal_size_allocate().connect (sigc::mem_fun (*this, &MixerStrip::name_button_resized));
Gtkmm2ext::set_size_request_to_display_given_text (name_button, longest_label.c_str(), 2, 2);
+ name_button.set_size_request (-1, 20);
ARDOUR_UI::instance()->set_tip (&group_button, _("Mix group"), "");
group_button.set_name ("mixer strip button");
revert_to_default_display ();
+ if (gpm.gain_display.get_parent()) {
+ middle_button_table.remove (gpm.gain_display);
+ }
+
+ if (gpm.peak_display.get_parent()) {
+ middle_button_table.remove (gpm.peak_display);
+ }
+
if (solo_button->get_parent()) {
middle_button_table.remove (*solo_button);
}
}
gpm.reset_peak_display ();
+ gpm.gain_display.show ();
+ gpm.peak_display.show ();
width_button.show();
width_hide_box.show();
name_button.show();
_comment_button.show();
group_button.show();
+ gpm.gain_automation_state_button.show();
parameter_changed ("mixer-strip-visibility");
switch (w) {
case Wide:
+ if (!gpm.peak_display.get_parent()) {
+ middle_button_table.attach (gpm.peak_display,1,2,1,2);
+ }
+ if (gpm.gain_display.get_parent()) {
+ middle_button_table.remove (gpm.gain_display);
+ }
+ if (!gpm.gain_display.get_parent()) {
+ middle_button_table.attach (gpm.gain_display,0,1,1,2);
+ }
+
if (show_sends_button) {
show_sends_button->set_text (_("Aux\nSends"));
show_sends_button->layout()->set_alignment (Pango::ALIGN_CENTER);
}
- ((Gtk::Label*)gpm.gain_automation_style_button.get_child())->set_text (
+ gpm.gain_automation_style_button.set_text (
gpm.astyle_string(gain_automation->automation_style()));
- ((Gtk::Label*)gpm.gain_automation_state_button.get_child())->set_text (
+ gpm.gain_automation_state_button.set_text (
gpm.astate_string(gain_automation->automation_state()));
if (_route->panner()) {
break;
case Narrow:
+ if (gpm.peak_display.get_parent()) {
+ middle_button_table.remove (gpm.peak_display);
+ }
+
+ if (gpm.gain_display.get_parent()) {
+ middle_button_table.remove (gpm.gain_display);
+ }
+ if (!gpm.gain_display.get_parent()) {
+ middle_button_table.attach (gpm.gain_display,0,2,1,2);
+ }
+
if (show_sends_button) {
show_sends_button->set_text (_("Snd"));
}
- ((Gtk::Label*)gpm.gain_automation_style_button.get_child())->set_text (
+ gpm.gain_automation_style_button.set_text (
gpm.short_astyle_string(gain_automation->automation_style()));
- ((Gtk::Label*)gpm.gain_automation_state_button.get_child())->set_text (
+ gpm.gain_automation_state_button.set_text (
gpm.short_astate_string(gain_automation->automation_state()));
if (_route->panner()) {
panners.short_astate_string(_route->panner()->automation_state()));
}
- solo_isolated_led->set_text (_("i"));
- solo_safe_led->set_text (_("L"));
+ solo_isolated_led->set_text (_("iso"));
+ solo_safe_led->set_text (_("Lck"));
Gtkmm2ext::set_size_request_to_display_given_text (name_button, "long", 2, 2);
set_size_request (max (50, gpm.get_gm_width()), -1);
}
void
-MixerStrip::bundle_input_
toggled (boost::shared_ptr<ARDOUR::Bundle> c)
+MixerStrip::bundle_input_
chosen (boost::shared_ptr<ARDOUR::Bundle> c)
{
if (ignore_toggle) {
return;
ARDOUR::BundleList current = _route->input()->bundles_connected ();
if (std::find (current.begin(), current.end(), c) == current.end()) {
- _route->input()->connect_ports_to_bundle (c, this);
+ _route->input()->connect_ports_to_bundle (c, true, this);
} else {
_route->input()->disconnect_ports_from_bundle (c, this);
}
}
void
-MixerStrip::bundle_output_
toggled (boost::shared_ptr<ARDOUR::Bundle> c)
+MixerStrip::bundle_output_
chosen (boost::shared_ptr<ARDOUR::Bundle> c)
{
if (ignore_toggle) {
return;
ARDOUR::BundleList current = _route->output()->bundles_connected ();
if (std::find (current.begin(), current.end(), c) == current.end()) {
- _route->output()->connect_ports_to_bundle (c, this);
+ _route->output()->connect_ports_to_bundle (c, true, this);
} else {
_route->output()->disconnect_ports_from_bundle (c, this);
}
}
void
-MixerStrip::maybe_add_bundle_to_input_menu (boost::shared_ptr<Bundle> b, ARDOUR::BundleList const & current)
+MixerStrip::maybe_add_bundle_to_input_menu (boost::shared_ptr<Bundle> b, ARDOUR::BundleList const& /*current*/)
{
using namespace Menu_Helpers;
std::string n = b->name ();
replace_all (n, "_", " ");
- citems.push_back (CheckMenuElem (n, sigc::bind (sigc::mem_fun(*this, &MixerStrip::bundle_input_toggled), b)));
-
- if (std::find (current.begin(), current.end(), b) != current.end()) {
- ignore_toggle = true;
- dynamic_cast<CheckMenuItem *> (&citems.back())->set_active (true);
- ignore_toggle = false;
- }
+ citems.push_back (MenuElem (n, sigc::bind (sigc::mem_fun(*this, &MixerStrip::bundle_input_chosen), b)));
}
void
-MixerStrip::maybe_add_bundle_to_output_menu (boost::shared_ptr<Bundle> b, ARDOUR::BundleList const & current)
+MixerStrip::maybe_add_bundle_to_output_menu (boost::shared_ptr<Bundle> b, ARDOUR::BundleList const& /*current*/)
{
using namespace Menu_Helpers;
std::string n = b->name ();
replace_all (n, "_", " ");
- citems.push_back (CheckMenuElem (n, sigc::bind (sigc::mem_fun(*this, &MixerStrip::bundle_output_toggled), b)));
-
- if (std::find (current.begin(), current.end(), b) != current.end()) {
- ignore_toggle = true;
- dynamic_cast<CheckMenuItem *> (&citems.back())->set_active (true);
- ignore_toggle = false;
- }
+ citems.push_back (MenuElem (n, sigc::bind (sigc::mem_fun(*this, &MixerStrip::bundle_output_chosen), b)));
}
void
if (for_input) {
io_count = route->n_inputs().n_total();
- tooltip << string_compose (_("<b>INPUT</b> to %1"), route->name());
+ tooltip << string_compose (_("<b>INPUT</b> to %1"), Glib::Markup::escape_text(route->name()));
} else {
io_count = route->n_outputs().n_total();
- tooltip << string_compose (_("<b>OUTPUT</b> from %1"), route->name());
+ tooltip << string_compose (_("<b>OUTPUT</b> from %1"), Glib::Markup::escape_text(route->name()));
}
string& connection_name (*i);
if (io_connection_count == 0) {
- tooltip << endl << port->name().substr(port->name().find("/") + 1) << " -> " << connection_name;
+ tooltip << endl << Glib::Markup::escape_text(port->name().substr(port->name().find("/") + 1)) << " -> " << Glib::Markup::escape_text(connection_name);
} else {
- tooltip << ", " << connection_name;
+ tooltip << ", " << Glib::Markup::escape_text(connection_name);
}
if (connection_name.find("ardour:") == 0) {
string
MixerStrip::meter_point_string (MeterPoint mp)
{
- switch (mp) {
- case MeterInput:
- return _("in");
- break;
-
- case MeterPreFader:
- return _("pre");
- break;
-
- case MeterPostFader:
- return _("post");
- break;
-
- case MeterOutput:
- return _("out");
+ switch (_width) {
+ case Wide:
+ switch (mp) {
+ case MeterInput:
+ return _("in");
+ break;
+
+ case MeterPreFader:
+ return _("pre");
+ break;
+
+ case MeterPostFader:
+ return _("post");
+ break;
+
+ case MeterOutput:
+ return _("out");
+ break;
+
+ case MeterCustom:
+ default:
+ return _("custom");
+ break;
+ }
break;
-
- case MeterCustom:
- default:
- return _("custom");
+ case Narrow:
+ switch (mp) {
+ case MeterInput:
+ return _("in");
+ break;
+
+ case MeterPreFader:
+ return _("pr");
+ break;
+
+ case MeterPostFader:
+ return _("po");
+ break;
+
+ case MeterOutput:
+ return _("o");
+ break;
+
+ case MeterCustom:
+ default:
+ return _("c");
+ break;
+ }
break;
}
+
+ return string();
}
/** Called when the metering point has changed */
break;
}
-}
+ if (_route) {
+ meter_point_button.set_text (meter_point_string (_route->meter_point()));
+ } else {
+ meter_point_button.set_text ("");
+ }
+}
PluginSelector*
MixerStrip::plugin_selector()
return true;
}
- if (mt->input_active()) {
- if (Keyboard::modifier_state_contains (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier|Keyboard::SecondaryModifier))) {
- /* turn all other tracks using this input off */
- _session->set_exclusive_input_active (mt, false);
- } else {
- mt->set_input_active (false);
- }
+ boost::shared_ptr<RouteList> rl (new RouteList);
- } else {
- if (Keyboard::modifier_state_contains (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier|Keyboard::SecondaryModifier))) {
- /* turn all other tracks using this input on */
- _session->set_exclusive_input_active (mt, true);
- } else {
- mt->set_input_active (true);
- }
- }
+ rl->push_back (route());
+
+ _session->set_exclusive_input_active (rl, !mt->input_active(),
+ Keyboard::modifier_state_contains (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier|Keyboard::SecondaryModifier)));
return true;
}
projects / ardour.git / blobdiff