PBD::Signal1<void,MixerStrip*> MixerStrip::CatchDeletion;
-static const int _button_vpad = 4;
-
MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, bool in_mixer)
: AxisView(sess)
, RouteUI (sess)
void
MixerStrip::init ()
{
- int button_table_row = 0;
-
_entered_mixer_strip= 0;
group_menu = 0;
route_ops_menu = 0;
t += string_compose (_("\n%1-%2-click to toggle the width of all strips."), Keyboard::primary_modifier_name(), Keyboard::tertiary_modifier_name ());
}
- width_button.set_image (::get_icon("strip_width"));
+ width_button.set_elements ((ArdourButton::Element)(ArdourButton::Edge|ArdourButton::Body|ArdourButton::VectorIcon));
+ width_button.set_icon (ArdourButton::StripWidth);
ARDOUR_UI::instance()->set_tip (width_button, t);
- hide_button.set_image(::get_icon("hide"));
+ hide_button.set_elements ((ArdourButton::Element)(ArdourButton::Edge|ArdourButton::Body|ArdourButton::VectorIcon));
+ hide_button.set_icon (ArdourButton::CloseCross);
ARDOUR_UI::instance()->set_tip (&hide_button, _("Hide this mixer strip"));
input_button_box.set_spacing(2);
hide_button.set_events (hide_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK));
- monitor_input_button->set_diameter (3);
- monitor_disk_button->set_diameter (3);
-
- solo_isolated_led = manage (new ArdourButton (ArdourButton::led_default_elements));
- solo_isolated_led->show ();
- solo_isolated_led->set_diameter (3);
- solo_isolated_led->set_no_show_all (true);
- solo_isolated_led->set_name (X_("solo isolate"));
- solo_isolated_led->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
- solo_isolated_led->signal_button_release_event().connect (sigc::mem_fun (*this, &RouteUI::solo_isolate_button_release));
+ solo_isolated_led = manage (new ArdourButton (ArdourButton::led_default_elements));
+ solo_isolated_led->show ();
+ solo_isolated_led->set_no_show_all (true);
+ solo_isolated_led->set_name (X_("solo isolate"));
+ solo_isolated_led->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
+ solo_isolated_led->signal_button_release_event().connect (sigc::mem_fun (*this, &RouteUI::solo_isolate_button_release), false);
UI::instance()->set_tip (solo_isolated_led, _("Isolate Solo"), "");
- solo_safe_led = manage (new ArdourButton (ArdourButton::led_default_elements));
- solo_safe_led->show ();
- solo_safe_led->set_diameter (3);
- solo_safe_led->set_no_show_all (true);
- solo_safe_led->set_name (X_("solo safe"));
- solo_safe_led->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
- solo_safe_led->signal_button_release_event().connect (sigc::mem_fun (*this, &RouteUI::solo_safe_button_release));
+ solo_safe_led = manage (new ArdourButton (ArdourButton::led_default_elements));
+ solo_safe_led->show ();
+ solo_safe_led->set_no_show_all (true);
+ solo_safe_led->set_name (X_("solo safe"));
+ solo_safe_led->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
+ solo_safe_led->signal_button_release_event().connect (sigc::mem_fun (*this, &RouteUI::solo_safe_button_release), false);
UI::instance()->set_tip (solo_safe_led, _("Lock Solo Status"), "");
- solo_safe_led->set_text (_("Lock"));
+ solo_safe_led->set_text (S_("SoloLock|Lock"));
solo_isolated_led->set_text (_("Iso"));
solo_iso_table.set_homogeneous (true);
bottom_button_table.attach (gpm.gain_automation_state_button, 0, 1, 0, 1);
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.set_text_ellipsize (Pango::ELLIPSIZE_END);
name_button.signal_size_allocate().connect (sigc::mem_fun (*this, &MixerStrip::name_button_resized));
ARDOUR_UI::instance()->set_tip (&group_button, _("Mix group"), "");
width_hide_box.pack_end (hide_button, false, true);
number_label.set_text ("-");
+ number_label.set_elements((ArdourButton::Element)(ArdourButton::Edge|ArdourButton::Body|ArdourButton::Text|ArdourButton::Inactive));
number_label.set_no_show_all ();
number_label.set_name ("tracknumber label");
number_label.set_fixed_colors (0x80808080, 0x80808080);
number_label.set_alignment (.5, .5);
+ number_label.set_fallthrough_to_parent (true);
global_vpacker.set_spacing (2);
if (!ARDOUR::Profile->get_trx()) {
_session->engine().Running.connect (*this, invalidator (*this), boost::bind (&MixerStrip::engine_running, this), gui_context());
input_button.signal_button_press_event().connect (sigc::mem_fun(*this, &MixerStrip::input_press), false);
- output_button.signal_button_press_event().connect (sigc::mem_fun(*this, &MixerStrip::output_press), false);
+ input_button.signal_button_release_event().connect (sigc::mem_fun(*this, &MixerStrip::input_release), false);
+ input_button.signal_size_allocate().connect (sigc::mem_fun (*this, &MixerStrip::input_button_resized));
+
+ input_button.set_text_ellipsize (Pango::ELLIPSIZE_MIDDLE);
+ output_button.set_text_ellipsize (Pango::ELLIPSIZE_MIDDLE);
- /* ditto for this button and busses */
+ output_button.signal_button_press_event().connect (sigc::mem_fun(*this, &MixerStrip::output_press), false);
+ output_button.signal_button_release_event().connect (sigc::mem_fun(*this, &MixerStrip::output_release), false);
+ output_button.signal_size_allocate().connect (sigc::mem_fun (*this, &MixerStrip::output_button_resized));
number_label.signal_button_press_event().connect (sigc::mem_fun(*this, &MixerStrip::number_button_button_press), false);
+
name_button.signal_button_press_event().connect (sigc::mem_fun(*this, &MixerStrip::name_button_button_press), false);
+ name_button.signal_button_release_event().connect (sigc::mem_fun(*this, &MixerStrip::name_button_button_release), false);
+
group_button.signal_button_press_event().connect (sigc::mem_fun(*this, &MixerStrip::select_route_group), false);
_width = (Width) -1;
_visibility.add (&_comment_button, X_("Comments"), _("Comments"), false);
parameter_changed (X_("mixer-element-visibility"));
-
+ ARDOUR_UI::config()->ParameterChanged.connect (sigc::mem_fun (*this, &MixerStrip::parameter_changed));
Config->ParameterChanged.connect (_config_connection, MISSING_INVALIDATOR, boost::bind (&MixerStrip::parameter_changed, this, _1), gui_context());
_session->config.ParameterChanged.connect (_config_connection, MISSING_INVALIDATOR, boost::bind (&MixerStrip::parameter_changed, this, _1), gui_context());
}
bool
-MixerStrip::mixer_strip_enter_event (GdkEventCrossing *ev)
+MixerStrip::mixer_strip_enter_event (GdkEventCrossing* /*ev*/)
{
_entered_mixer_strip = this;
*/
processor_box.set_route (rt);
- /* map the current state */
-
- mute_changed (0);
- update_solo_display ();
-
revert_to_default_display ();
/* unpack these from the parent and stuff them into our own
gpm.set_type (rt->meter_type());
mute_solo_table.attach (gpm.gain_display,0,1,1,2, EXPAND|FILL, EXPAND);
- mute_solo_table.attach (gpm.peak_display,1,2,1,2);
+ mute_solo_table.attach (gpm.peak_display,1,2,1,2, EXPAND|FILL, EXPAND);
if (solo_button->get_parent()) {
mute_solo_table.remove (*solo_button);
solo_button->hide ();
mute_button->show ();
rec_mon_table.hide ();
+ if (solo_iso_table.get_parent()) {
+ solo_iso_table.get_parent()->remove(solo_iso_table);
+ }
} else {
bottom_button_table.attach (group_button, 1, 2, 0, 1);
mute_solo_table.attach (*mute_button, 0, 1, 0, 1);
if (midi_input_enable_button == 0) {
midi_input_enable_button = manage (new ArdourButton);
midi_input_enable_button->set_name ("midi input button");
- midi_input_enable_button->set_image (::get_icon (X_("midi_socket_small")));
+ midi_input_enable_button->set_elements ((ArdourButton::Element)(ArdourButton::Edge|ArdourButton::Body|ArdourButton::VectorIcon));
+ midi_input_enable_button->set_icon (ArdourButton::DinMidi);
midi_input_enable_button->signal_button_press_event().connect (sigc::mem_fun (*this, &MixerStrip::input_active_button_press), false);
midi_input_enable_button->signal_button_release_event().connect (sigc::mem_fun (*this, &MixerStrip::input_active_button_release), false);
ARDOUR_UI::instance()->set_tip (midi_input_enable_button, _("Enable/Disable MIDI input"));
/* now force an update of all the various elements */
- mute_changed (0);
+ update_mute_display ();
update_solo_display ();
name_changed ();
comment_changed (0);
set_button_names ();
+ const double scale = std::max(1.0, ARDOUR_UI::config()->get_font_scale() / 102400.);
+
switch (w) {
case Wide:
if (show_sends_button) {
- show_sends_button->set_text (_("Aux\nSends"));
- show_sends_button->layout()->set_alignment (Pango::ALIGN_CENTER);
+ show_sends_button->set_text (_("Aux"));
}
gpm.gain_automation_style_button.set_text (
}
- set_size_request (max (110, gpm.get_gm_width()+5), -1);
+ set_size_request (max (110 * scale, gpm.get_gm_width() + 5 * scale), -1);
break;
case Narrow:
panners.short_astate_string(_route->panner()->automation_state()));
}
- set_size_request (max (60, gpm.get_gm_width() + 10), -1);
+ set_size_request (max (60 * scale, gpm.get_gm_width() + 10 * scale), -1);
break;
}
}
};
+gint
+MixerStrip::output_release (GdkEventButton *ev)
+{
+ switch (ev->button) {
+ case 3:
+ edit_output_configuration ();
+ break;
+ }
+
+ return false;
+}
+
gint
MixerStrip::output_press (GdkEventButton *ev)
{
MenuList& citems = output_menu.items();
switch (ev->button) {
- case 1:
- edit_output_configuration ();
- break;
-
case 3:
+ return false; //wait for the mouse-up to pop the dialog
+
+ case 1:
{
output_menu.set_name ("ArdourContextMenu");
citems.clear ();
citems.push_back (MenuElem (_("Disconnect"), sigc::mem_fun (*(static_cast<RouteUI*>(this)), &RouteUI::disconnect_output)));
- for (DataType::iterator i = DataType::begin(); i != DataType::end(); ++i) {
- citems.push_back (
- MenuElem (
- string_compose ("Add %1 port", (*i).to_i18n_string()),
- sigc::bind (sigc::mem_fun (*this, &MixerStrip::add_output_port), *i)
- )
- );
- }
-
citems.push_back (SeparatorElem());
uint32_t const n_with_separator = citems.size ();
citems.pop_back ();
}
+ citems.push_back (SeparatorElem());
+
+ for (DataType::iterator i = DataType::begin(); i != DataType::end(); ++i) {
+ citems.push_back (
+ MenuElem (
+ string_compose (_("Add %1 port"), (*i).to_i18n_string()),
+ sigc::bind (sigc::mem_fun (*this, &MixerStrip::add_output_port), *i)
+ )
+ );
+ }
+
+ citems.push_back (SeparatorElem());
+ citems.push_back (MenuElem (_("Routing Grid"), sigc::mem_fun (*(static_cast<RouteUI*>(this)), &RouteUI::edit_output_configuration)));
+
output_menu.popup (1, ev->time);
break;
}
return TRUE;
}
+gint
+MixerStrip::input_release (GdkEventButton *ev)
+{
+ switch (ev->button) {
+
+ case 3:
+ edit_input_configuration ();
+ break;
+ default:
+ break;
+
+ }
+
+ return false;
+}
+
+
gint
MixerStrip::input_press (GdkEventButton *ev)
{
switch (ev->button) {
- case 1:
- edit_input_configuration ();
- break;
-
case 3:
+ return false; //don't handle the mouse-down here. wait for mouse-up to pop the menu
+
+ case 1:
{
citems.push_back (MenuElem (_("Disconnect"), sigc::mem_fun (*(static_cast<RouteUI*>(this)), &RouteUI::disconnect_input)));
- for (DataType::iterator i = DataType::begin(); i != DataType::end(); ++i) {
- citems.push_back (
- MenuElem (
- string_compose ("Add %1 port", (*i).to_i18n_string()),
- sigc::bind (sigc::mem_fun (*this, &MixerStrip::add_input_port), *i)
- )
- );
- }
-
citems.push_back (SeparatorElem());
uint32_t const n_with_separator = citems.size ();
citems.pop_back ();
}
+ citems.push_back (SeparatorElem());
+ for (DataType::iterator i = DataType::begin(); i != DataType::end(); ++i) {
+ citems.push_back (
+ MenuElem (
+ string_compose (_("Add %1 port"), (*i).to_i18n_string()),
+ sigc::bind (sigc::mem_fun (*this, &MixerStrip::add_input_port), *i)
+ )
+ );
+ }
+
+ citems.push_back (SeparatorElem());
+ citems.push_back (MenuElem (_("Routing Grid"), sigc::mem_fun (*(static_cast<RouteUI*>(this)), &RouteUI::edit_input_configuration)));
+
input_menu.popup (1, ev->time);
+
break;
}
default:
uint32_t other_connection_count = 0;
ostringstream label;
- string label_string;
bool have_label = false;
bool each_io_has_one_connection = true;
ostringstream tooltip;
char * tooltip_cstr;
+
+ //to avoid confusion, the button caption should only show connections that match the datatype of the track
+ DataType dt = DataType::AUDIO;
+ if ( boost::dynamic_pointer_cast<MidiTrack>(route) != 0 )
+ dt = DataType::MIDI;
if (for_input) {
io_count = route->n_inputs().n_total();
} else {
port = route->output()->nth (io_index);
}
+
+ //ignore any port connections that don't match our DataType
+ if (port->type() != dt)
+ continue;
port_connections.clear ();
port->get_connections(port_connections);
if (!port_connections.empty()) {
for (vector<string>::iterator i = port_connections.begin(); i != port_connections.end(); ++i) {
+ string pn = "";
string& connection_name (*i);
+ if (connection_name.find("system:") == 0) {
+ pn = AudioEngine::instance()->get_pretty_name_by_name (connection_name);
+ }
+
if (io_connection_count == 0) {
- tooltip << endl << Glib::Markup::escape_text(port->name().substr(port->name().find("/") + 1)) << " -> " << Glib::Markup::escape_text(connection_name);
+ tooltip << endl << Glib::Markup::escape_text(port->name().substr(port->name().find("/") + 1))
+ << " -> "
+ << Glib::Markup::escape_text( pn.empty() ? connection_name : pn );
} else {
- tooltip << ", " << Glib::Markup::escape_text(connection_name);
+ tooltip << ", "
+ << Glib::Markup::escape_text( pn.empty() ? connection_name : pn );
}
if (connection_name.find("ardour:") == 0) {
if (connection_name.find(ardour_track_name) == 0) {
++ardour_connection_count;
}
+ } else if (!pn.empty()) {
+ if (system_ports.empty()) {
+ system_ports += pn;
+ } else {
+ system_ports += "/" + pn;
+ }
+ if (connection_name.find("system:") == 0) {
+ ++system_connection_count;
+ }
+ } else if (connection_name.find("system:midi_") == 0) {
+ if (for_input) {
+ // "system:midi_capture_123" -> "123"
+ system_port = "M " + connection_name.substr(20);
+ } else {
+ // "system:midi_playback_123" -> "123"
+ system_port = "M " + connection_name.substr(21);
+ }
+
+ if (system_ports.empty()) {
+ system_ports += system_port;
+ } else {
+ system_ports += "/" + system_port;
+ }
+
+ ++system_connection_count;
+
} else if (connection_name.find("system:") == 0) {
if (for_input) {
// "system:capture_123" -> "123"
}
}
- switch (width) {
- case Wide:
- label_string = label.str().substr(0, 7);
- break;
- case Narrow:
- label_string = label.str().substr(0, 3);
- break;
- }
-
if (for_input) {
- input_button.set_text (label_string);
+ input_button.set_text (label.str());
} else {
- output_button.set_text (label_string);
+ output_button.set_text (label.str());
}
}
}
items.push_back (SeparatorElem());
- items.push_back (MenuElem (_("Remove"), sigc::bind (sigc::mem_fun(*this, &RouteUI::remove_this_route), false)));
+
+ if (_route) {
+ /* note that this relies on selection being shared across editor and
+ mixer (or global to the backend, in the future), which is the only
+ sane thing for users anyway.
+ */
+
+ RouteTimeAxisView* rtav = PublicEditor::instance().get_route_view_by_route_id (_route->id());
+ if (rtav) {
+ Selection& selection (PublicEditor::instance().get_selection());
+ if (!selection.selected (rtav)) {
+ selection.set (rtav);
+ }
+
+ items.push_front (MenuElem (_("Remove"), sigc::mem_fun(PublicEditor::instance(), &PublicEditor::remove_tracks)));
+ }
+ }
}
gboolean
MixerStrip::name_button_button_press (GdkEventButton* ev)
{
- /* show menu for either button 1 or 3, so as not to confuse people
- and also not hide stuff from them.
- */
+ if (ev->button == 3) {
+ list_route_operations ();
- if (ev->button == 3 || ev->button == 1) {
+ /* do not allow rename if the track is record-enabled */
+ rename_menu_item->set_sensitive (!_route->record_enabled());
+ route_ops_menu->popup (1, ev->time);
+
+ return true;
+ }
+
+ return false;
+}
+
+gboolean
+MixerStrip::name_button_button_release (GdkEventButton* ev)
+{
+ if (ev->button == 1) {
list_route_operations ();
/* do not allow rename if the track is record-enabled */
/* do not allow rename if the track is record-enabled */
rename_menu_item->set_sensitive (!_route->record_enabled());
route_ops_menu->popup (1, ev->time);
+
+ return true;
}
return false;
MixerStrip::name_changed ()
{
switch (_width) {
- case Wide:
- if (_session->config.get_track_name_number()) {
- const int64_t track_number = _route->track_number ();
- if (track_number == 0) {
- number_label.set_text ("-");
- } else {
- number_label.set_text (PBD::to_string (abs(_route->track_number ()), std::dec));
- }
- } else {
- number_label.set_text ("");
- }
- name_button.set_text (_route->name());
- break;
- case Narrow:
- if (_session->config.get_track_name_number()) {
- name_button.set_markup(track_number_to_string (_route->track_number (), " ",
- PBD::short_version (_route->name (), 5)));
- } else {
+ case Wide:
+ name_button.set_text (_route->name());
+ break;
+ case Narrow:
name_button.set_text (PBD::short_version (_route->name(), 5));
- }
- break;
+ break;
}
ARDOUR_UI::instance()->set_tip (name_button, _route->name());
+
+ if (_session->config.get_track_name_number()) {
+ const int64_t track_number = _route->track_number ();
+ if (track_number == 0) {
+ number_label.set_text ("-");
+ } else {
+ number_label.set_text (PBD::to_string (abs(_route->track_number ()), std::dec));
+ }
+ } else {
+ number_label.set_text ("");
+ }
+}
+
+void
+MixerStrip::input_button_resized (Gtk::Allocation& alloc)
+{
+ input_button.set_layout_ellipsize_width (alloc.get_width() * PANGO_SCALE);
+}
+
+void
+MixerStrip::output_button_resized (Gtk::Allocation& alloc)
+{
+ output_button.set_layout_ellipsize_width (alloc.get_width() * PANGO_SCALE);
}
void
MixerStrip::name_button_resized (Gtk::Allocation& alloc)
{
- name_button.layout()->set_width (alloc.get_width() * PANGO_SCALE);
+ name_button.set_layout_ellipsize_width (alloc.get_width() * PANGO_SCALE);
}
bool
case Narrow:
switch (mp) {
case MeterInput:
- return _("In");
+ return S_("Meter|In");
break;
case MeterPreFader:
- return _("Pr");
+ return S_("Meter|Pr");
break;
case MeterPostFader:
- return _("Po");
+ return S_("Meter|Po");
break;
case MeterOutput:
- return _("O");
+ return S_("Meter|O");
break;
case MeterCustom:
default:
- return _("C");
+ return S_("Meter|C");
break;
}
break;
{
switch (_width) {
case Wide:
- rec_enable_button->set_text (_("Rec"));
mute_button->set_text (_("Mute"));
monitor_input_button->set_text (_("In"));
monitor_disk_button->set_text (_("Disk"));
}
}
solo_isolated_led->set_text (_("Iso"));
- solo_safe_led->set_text (_("Lock"));
+ solo_safe_led->set_text (S_("SoloLock|Lock"));
break;
default:
- rec_enable_button->set_text (_("R"));
- mute_button->set_text (_("M"));
- monitor_input_button->set_text (_("I"));
- monitor_disk_button->set_text (_("D"));
+ mute_button->set_text (S_("Mute|M"));
+ monitor_input_button->set_text (S_("MonitorInput|I"));
+ monitor_disk_button->set_text (S_("MonitorDisk|D"));
if (_route && _route->solo_safe()) {
solo_button->set_visual_state (Gtkmm2ext::VisualState (solo_button->visual_state() | Gtkmm2ext::Insensitive));
solo_button->set_visual_state (Gtkmm2ext::VisualState (solo_button->visual_state() & ~Gtkmm2ext::Insensitive));
}
if (!Config->get_solo_control_is_listen_control()) {
- solo_button->set_text (_("S"));
+ solo_button->set_text (S_("Solo|S"));
} else {
switch (Config->get_listen_position()) {
case AfterFaderListen:
- solo_button->set_text (_("A"));
+ solo_button->set_text (S_("AfterFader|A"));
break;
case PreFaderListen:
- solo_button->set_text (_("P"));
+ solo_button->set_text (S_("Prefader|P"));
break;
}
}
- solo_isolated_led->set_text (_("I"));
- solo_safe_led->set_text (_("L"));
+ solo_isolated_led->set_text (S_("SoloIso|I"));
+ solo_safe_led->set_text (S_("SoloLock|L"));
break;
}
/* The user has made changes to the mixer strip visibility, so get
our VisibilityGroup to reflect these changes in our widgets.
*/
- _visibility.set_state (Config->get_mixer_strip_visibility ());
+ _visibility.set_state (ARDOUR_UI::config()->get_mixer_strip_visibility ());
}
else if (p == "track-name-number") {
name_changed ();
add_level_meter_item_point (items, group, _("Output"), MeterOutput);
add_level_meter_item_point (items, group, _("Custom"), MeterCustom);
+ if (gpm.meter_channels().n_audio() == 0) {
+ m->popup (ev->button, ev->time);
+ _suspend_menu_callbacks = false;
+ return;
+ }
+
RadioMenuItem::Group tgroup;
items.push_back (SeparatorElem());
projects / ardour.git / blobdiff