#include <gtkmm2ext/slider_controller.h>
#include <gtkmm2ext/bindable_button.h>
+#include "ardour/amp.h"
#include "ardour/audio_track.h"
#include "ardour/audioengine.h"
#include "ardour/internal_send.h"
#include "ardour/types.h"
#include "ardour/user_bundle.h"
-#include "ardour_ui.h"
#include "ardour_window.h"
#include "mixer_strip.h"
#include "mixer_ui.h"
#include "gui_thread.h"
#include "route_group_menu.h"
#include "meter_patterns.h"
+#include "tooltips.h"
+#include "ui_config.h"
#include "i18n.h"
, gpm (sess, 250)
, panners (sess)
, button_size_group (Gtk::SizeGroup::create (Gtk::SIZE_GROUP_HORIZONTAL))
- , button_table (3, 1)
, rec_mon_table (2, 2)
, solo_iso_table (1, 2)
, mute_solo_table (1, 2)
, meter_point_button (_("pre"))
, midi_input_enable_button (0)
, _comment_button (_("Comments"))
+ , trim_control (ArdourKnob::default_elements, ArdourKnob::Flags (ArdourKnob::Detent | ArdourKnob::ArcToZero))
, _visibility (X_("mixer-element-visibility"))
{
init ();
, gpm (sess, 250)
, panners (sess)
, button_size_group (Gtk::SizeGroup::create (Gtk::SIZE_GROUP_HORIZONTAL))
- , button_table (3, 1)
, rec_mon_table (2, 2)
, solo_iso_table (1, 2)
, mute_solo_table (1, 2)
, meter_point_button (_("pre"))
, midi_input_enable_button (0)
, _comment_button (_("Comments"))
+ , trim_control (ArdourKnob::default_elements, ArdourKnob::Flags (ArdourKnob::Detent | ArdourKnob::ArcToZero))
, _visibility (X_("mixer-element-visibility"))
{
init ();
void
MixerStrip::init ()
{
- int button_table_row = 0;
-
_entered_mixer_strip= 0;
- input_selector = 0;
- output_selector = 0;
group_menu = 0;
route_ops_menu = 0;
ignore_comment_edit = false;
ignore_toggle = false;
- comment_window = 0;
comment_area = 0;
_width_owner = 0;
spacer = 0;
if (_mixer_owned) {
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"));
- ARDOUR_UI::instance()->set_tip (width_button, t);
- hide_button.set_image(::get_icon("hide"));
- ARDOUR_UI::instance()->set_tip (&hide_button, _("Hide this mixer strip"));
+ width_button.set_icon (ArdourIcon::StripWidth);
+ set_tooltip (width_button, t);
+
+ hide_button.set_icon (ArdourIcon::CloseCross);
+ set_tooltip (&hide_button, _("Hide this mixer strip"));
+
+ input_button_box.set_spacing(2);
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, _("Click to select metering point"), "");
+ set_tooltip (&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
- used to describe meter points. In english, it's "input".
- */
- set_size_request_to_display_given_text (meter_point_button, _("tupni"), 5, 5);
-
bottom_button_table.attach (meter_point_button, 2, 3, 0, 1);
meter_point_button.signal_button_press_event().connect (sigc::mem_fun (gpm, &GainMeter::meter_press), false);
meter_point_button.signal_button_release_event().connect (sigc::mem_fun (gpm, &GainMeter::meter_release), false);
-
- 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);
+ hide_button.set_events (hide_button.get_events() & ~(Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK));
- 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_isolated_led->set_text (_("iso"));
+ solo_safe_led->set_text (S_("SoloLock|Lock"));
+ solo_isolated_led->set_text (_("Iso"));
solo_iso_table.set_homogeneous (true);
solo_iso_table.set_spacings (2);
rec_mon_table.set_homogeneous (true);
rec_mon_table.set_row_spacings (2);
rec_mon_table.set_col_spacings (2);
- if (!ARDOUR::Profile->get_trx()) {
+ if (ARDOUR::Profile->get_mixbus()) {
+ rec_mon_table.resize (1, 3);
+ rec_mon_table.attach (*monitor_input_button, 1, 2, 0, 1);
+ rec_mon_table.attach (*monitor_disk_button, 2, 3, 0, 1);
+ } else if (!ARDOUR::Profile->get_trx()) {
rec_mon_table.attach (*monitor_input_button, 1, 2, 0, 1);
rec_mon_table.attach (*monitor_disk_button, 1, 2, 1, 2);
}
rec_mon_table.show ();
- button_table.set_homogeneous (false);
- button_table.set_spacings (2);
-
if (solo_isolated_led) {
button_size_group->add_widget (*solo_isolated_led);
}
if (solo_safe_led) {
button_size_group->add_widget (*solo_safe_led);
}
- if (rec_enable_button) {
- button_size_group->add_widget (*rec_enable_button);
- }
- if (monitor_disk_button) {
- button_size_group->add_widget (*monitor_disk_button);
- }
- if (monitor_input_button) {
- button_size_group->add_widget (*monitor_input_button);
- }
- if (!ARDOUR::Profile->get_trx()) {
- button_table.attach (name_button, 0, 1, button_table_row, button_table_row+1);
- button_table_row++;
- button_table.attach (input_button_box, 0, 2, button_table_row, button_table_row+1);
- button_table_row++;
- button_table.attach (_invert_button_box, 0, 2, button_table_row, button_table_row+1);
- button_table_row++;
+ if (!ARDOUR::Profile->get_mixbus()) {
+ if (rec_enable_button) {
+ button_size_group->add_widget (*rec_enable_button);
+ }
+ if (monitor_disk_button) {
+ button_size_group->add_widget (*monitor_disk_button);
+ }
+ if (monitor_input_button) {
+ button_size_group->add_widget (*monitor_input_button);
+ }
}
mute_solo_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));
- 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"), "");
+ set_tooltip (&group_button, _("Mix group"));
group_button.set_name ("mixer strip button");
- Gtkmm2ext::set_size_request_to_display_given_text (group_button, "Grp", 2, 2);
_comment_button.set_name (X_("mixer strip button"));
- _comment_button.signal_clicked.connect (sigc::mem_fun (*this, &MixerStrip::toggle_comment_editor));
-
- global_vpacker.set_border_width (0);
+ _comment_button.signal_clicked.connect (sigc::mem_fun (*this, &RouteUI::toggle_comment_editor));
+
+ // TODO implement ArdourKnob::on_size_request properly
+#define PX_SCALE(px) std::max((float)px, rintf((float)px * UIConfiguration::instance().get_ui_scale()))
+ trim_control.set_size_request (PX_SCALE(19), PX_SCALE(19));
+#undef PX_SCALE
+ trim_control.set_tooltip_prefix (_("Trim: "));
+ trim_control.set_name ("trim knob");
+ trim_control.set_no_show_all (true);
+ input_button_box.pack_start (trim_control, false, false);
+
+ global_vpacker.set_border_width (1);
global_vpacker.set_spacing (0);
width_button.set_name ("mixer strip button");
hide_button.set_name ("mixer strip button");
- top_event_box.set_name ("mixer strip button");
width_button.signal_button_press_event().connect (sigc::mem_fun(*this, &MixerStrip::width_button_pressed), false);
hide_button.signal_clicked.connect (sigc::mem_fun(*this, &MixerStrip::hide_clicked));
+// width_hide_box.set_border_width (1);
+ width_hide_box.set_spacing (2);
width_hide_box.pack_start (width_button, false, true);
- width_hide_box.pack_start (top_event_box, true, true);
+ width_hide_box.pack_start (number_label, true, true);
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_elements (ArdourButton::Element(ArdourButton::Body | ArdourButton::Text));
number_label.set_alignment (.5, .5);
- top_event_box.add (number_label);
-
- whvbox.pack_start (width_hide_box, true, true);
+ number_label.set_fallthrough_to_parent (true);
global_vpacker.set_spacing (2);
if (!ARDOUR::Profile->get_trx()) {
- global_vpacker.pack_start (whvbox, Gtk::PACK_SHRINK);
- global_vpacker.pack_start (button_table, Gtk::PACK_SHRINK);
+ global_vpacker.pack_start (width_hide_box, Gtk::PACK_SHRINK);
+ global_vpacker.pack_start (name_button, Gtk::PACK_SHRINK);
+ global_vpacker.pack_start (input_button_box, Gtk::PACK_SHRINK);
+ global_vpacker.pack_start (_invert_button_box, Gtk::PACK_SHRINK);
global_vpacker.pack_start (processor_box, true, true);
}
global_vpacker.pack_start (panners, Gtk::PACK_SHRINK);
_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);
+ 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);
+
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));
- /* ditto for this button and busses */
+ number_label.signal_button_press_event().connect (sigc::mem_fun(*this, &MixerStrip::number_button_button_press), false);
- number_label.signal_button_press_event().connect (sigc::mem_fun(*this, &MixerStrip::name_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;
must be the same as those used in RCOptionEditor so that the configuration changes
are recognised when they occur.
*/
- _visibility.add (&input_button, X_("Input"), _("Input"), false);
+ _visibility.add (&input_button_box, X_("Input"), _("Input"), false);
_visibility.add (&_invert_button_box, X_("PhaseInvert"), _("Phase Invert"), false);
_visibility.add (&rec_mon_table, X_("RecMon"), _("Record & Monitor"), false);
_visibility.add (&solo_iso_table, X_("SoloIsoLock"), _("Solo Iso / Lock"), false);
_visibility.add (&_comment_button, X_("Comments"), _("Comments"), false);
parameter_changed (X_("mixer-element-visibility"));
-
+ UIConfiguration::instance().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());
if (this ==_entered_mixer_strip)
_entered_mixer_strip = NULL;
-
- delete input_selector;
- delete output_selector;
- delete comment_window;
}
bool
-MixerStrip::mixer_strip_enter_event (GdkEventCrossing *ev)
+MixerStrip::mixer_strip_enter_event (GdkEventCrossing* /*ev*/)
{
_entered_mixer_strip = this;
-
+
//although we are triggering on the "enter", to the user it will appear that it is happenin on the "leave"
//because the mixerstrip control is a parent that encompasses the strip
- ARDOUR_UI::instance()->the_mixer()->deselect_all_strip_processors();
+ deselect_all_processors();
return false;
}
if ( !(ev->detail == GDK_NOTIFY_INFERIOR) ) {
_entered_mixer_strip= 0;
- //clear keyboard focus in the gain display. this is cheesy but fixes a longstanding bug.
+ //clear keyboard focus in the gain display. this is cheesy but fixes a longstanding "bug" where the user starts typing in the gain entry, and leaves it active, thereby prohibiting other keybindings from working
gpm.gain_display.set_sensitive(false);
+ gpm.show_gain();
gpm.gain_display.set_sensitive(true);
//if we leave this mixer strip we need to clear out any selections
//processor_box.processor_display.select_none(); //but this doesn't work, because it gets triggered when (for example) you open the menu or start a drag
}
-
+
return false;
}
if (group_button.get_parent()) {
bottom_button_table.remove (group_button);
}
-
+
RouteUI::set_route (rt);
/* ProcessorBox needs access to _route so that it can read
*/
processor_box.set_route (rt);
- /* map the current state */
-
- mute_changed (0);
- update_solo_display ();
-
- delete input_selector;
- input_selector = 0;
-
- delete output_selector;
- output_selector = 0;
-
revert_to_default_display ();
/* unpack these from the parent and stuff them into our own
table
*/
-
+
if (gpm.peak_display.get_parent()) {
gpm.peak_display.get_parent()->remove (gpm.peak_display);
}
}
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);
monitor_disk_button->hide ();
}
+ if (route()->trim() && route()->trim()->active()) {
+ trim_control.show ();
+ trim_control.set_controllable (route()->trim()->gain_control());
+ } else {
+ trim_control.hide ();
+ boost::shared_ptr<Controllable> none;
+ trim_control.set_controllable (none);
+ }
+
if (is_midi_track()) {
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 (ArdourIcon::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"));
+ set_tooltip (midi_input_enable_button, _("Enable/Disable MIDI input"));
} else {
input_button_box.remove (*midi_input_enable_button);
}
if (is_track ()) {
- rec_mon_table.attach (*rec_enable_button, 0, 1, 0, 2);
+ rec_mon_table.attach (*rec_enable_button, 0, 1, 0, ARDOUR::Profile->get_mixbus() ? 1 : 2);
rec_enable_button->set_sensitive (_session->writable());
rec_enable_button->show();
- if (ARDOUR::Profile->get_trx()) {
+ if (ARDOUR::Profile->get_mixbus()) {
+ rec_mon_table.attach (*monitor_input_button, 1, 2, 0, 1);
+ rec_mon_table.attach (*monitor_disk_button, 2, 3, 0, 1);
+ } else if (ARDOUR::Profile->get_trx()) {
rec_mon_table.attach (*monitor_input_button, 1, 2, 0, 2);
} else {
rec_mon_table.attach (*monitor_input_button, 1, 2, 0, 1);
route_ops_menu = 0;
_route->meter_change.connect (route_connections, invalidator (*this), bind (&MixerStrip::meter_changed, this), gui_context());
- _route->input()->changed.connect (*this, invalidator (*this), boost::bind (&MixerStrip::update_output_display, this), gui_context());
+ _route->input()->changed.connect (*this, invalidator (*this), boost::bind (&MixerStrip::update_input_display, this), gui_context());
_route->output()->changed.connect (*this, invalidator (*this), boost::bind (&MixerStrip::update_output_display, this), gui_context());
_route->route_group_changed.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::route_group_changed, this), gui_context());
audio_track()->DiskstreamChanged.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::diskstream_changed, this), gui_context());
}
- _route->comment_changed.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::comment_changed, this, _1), gui_context());
+ _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());
set_stuff_from_route ();
/* now force an update of all the various elements */
- mute_changed (0);
+ update_mute_display ();
update_solo_display ();
name_changed ();
comment_changed (0);
gpm.gain_display.show ();
gpm.peak_display.show ();
- top_event_box.show();
width_button.show();
width_hide_box.show();
- whvbox.show ();
global_frame.show();
global_vpacker.show();
- button_table.show();
mute_solo_table.show();
bottom_button_table.show();
gpm.show_all ();
set_button_names ();
+ const float scale = std::max(1.f, UIConfiguration::instance().get_ui_scale());
+
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 (
panners.astate_string(_route->panner()->automation_state()));
}
-
- Gtkmm2ext::set_size_request_to_display_given_text (name_button, longest_label.c_str(), 2, 2);
- set_size_request (-1, -1);
+ {
+ // panners expect an even number of horiz. pixels
+ int width = rintf (max (110.f * scale, gpm.get_gm_width() + 10.f * scale)) + 1;
+ width &= ~1;
+ set_size_request (width, -1);
+ }
break;
case Narrow:
panners.short_astate_string(_route->panner()->automation_state()));
}
- Gtkmm2ext::set_size_request_to_display_given_text (name_button, "long", 2, 2);
- set_size_request (max (50, gpm.get_gm_width()), -1);
+ {
+ // panners expect an even number of horiz. pixels
+ int width = rintf (max (60.f * scale, gpm.get_gm_width() + 10.f * scale)) + 1;
+ width &= ~1;
+ set_size_request (width, -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;
}
-void
-MixerStrip::edit_output_configuration ()
+gint
+MixerStrip::input_release (GdkEventButton *ev)
{
- if (output_selector == 0) {
-
- boost::shared_ptr<Send> send;
- boost::shared_ptr<IO> output;
-
- if ((send = boost::dynamic_pointer_cast<Send>(_current_delivery)) != 0) {
- if (!boost::dynamic_pointer_cast<InternalSend>(send)) {
- output = send->output();
- } else {
- output = _route->output ();
- }
- } else {
- output = _route->output ();
- }
+ switch (ev->button) {
- output_selector = new IOSelectorWindow (_session, output);
- }
+ case 3:
+ edit_input_configuration ();
+ break;
+ default:
+ break;
- if (output_selector->is_visible()) {
- output_selector->get_toplevel()->get_window()->raise();
- } else {
- output_selector->present ();
}
- output_selector->set_keep_above (true);
+ return false;
}
-void
-MixerStrip::edit_input_configuration ()
-{
- if (input_selector == 0) {
- input_selector = new IOSelectorWindow (_session, _route->input());
- }
-
- if (input_selector->is_visible()) {
- input_selector->get_toplevel()->get_window()->raise();
- } else {
- input_selector->present ();
- }
-
- input_selector->set_keep_above (true);
-}
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 ();
-
+
input_menu_bundles.clear ();
ARDOUR::BundleList current = _route->input()->bundles_connected ();
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 ardour_connection_count = 0;
uint32_t system_connection_count = 0;
uint32_t other_connection_count = 0;
+ uint32_t typed_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;
+ // avoid further confusion with Midi-tracks that have a synth.
+ // Audio-ports may be connected, but button says "Disconnected"
+ tooltip << _("MIDI ");
+ }
+
if (for_input) {
io_count = route->n_inputs().n_total();
- tooltip << string_compose (_("<b>INPUT</b> to %1"), Glib::Markup::escape_text(route->name()));
+ tooltip << string_compose (_("<b>INPUT</b> to %1"), Glib::Markup::escape_text(route->name()).c_str());
} else {
io_count = route->n_outputs().n_total();
- tooltip << string_compose (_("<b>OUTPUT</b> from %1"), Glib::Markup::escape_text(route->name()));
+ tooltip << string_compose (_("<b>OUTPUT</b> from %1"), Glib::Markup::escape_text(route->name()).c_str());
}
port_connections.clear ();
port->get_connections(port_connections);
+
+ //ignore any port connections that don't match our DataType
+ if (port->type() != dt) {
+ if (!port_connections.empty()) {
+ ++typed_connection_count;
+ }
+ continue;
+ }
+
io_connection_count = 0;
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)).c_str()
+ << " -> "
+ << Glib::Markup::escape_text( pn.empty() ? connection_name : pn ).c_str();
} else {
- tooltip << ", " << Glib::Markup::escape_text(connection_name);
+ tooltip << ", "
+ << Glib::Markup::escape_text( pn.empty() ? connection_name : pn ).c_str();
}
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"
strcpy(tooltip_cstr, tooltip.str().c_str());
if (for_input) {
- ARDOUR_UI::instance()->set_tip (&input_button, tooltip_cstr, "");
+ set_tooltip (&input_button, tooltip_cstr);
} else {
- ARDOUR_UI::instance()->set_tip (&output_button, tooltip_cstr, "");
+ set_tooltip (&output_button, tooltip_cstr);
}
if (each_io_has_one_connection) {
// Odd configuration
label << "*" << total_connection_count << "*";
}
+ if (typed_connection_count > 0) {
+ label << "\u2295"; // circled plus
+ }
}
- 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());
}
}
break;
}
- ARDOUR_UI::instance()->set_tip (
+ set_tooltip (
_comment_button, _route->comment().empty() ? _("Click to Add/Edit Comments") : _route->comment()
);
-}
-void
-MixerStrip::comment_editor_done_editing ()
-{
- string const str = comment_area->get_buffer()->get_text();
- if (str == _route->comment ()) {
- return;
- }
-
- _route->set_comment (str, this);
- setup_comment_button ();
-}
-
-void
-MixerStrip::toggle_comment_editor ()
-{
- if (ignore_toggle) {
- return;
- }
-
- if (comment_window && comment_window->is_visible ()) {
- comment_window->hide ();
- } else {
- open_comment_editor ();
- }
-}
-
-void
-MixerStrip::open_comment_editor ()
-{
- if (comment_window == 0) {
- setup_comment_editor ();
- }
-
- string title;
- title = _route->name();
- title += _(": comment editor");
-
- comment_window->set_title (title);
- comment_window->present();
-}
-
-void
-MixerStrip::setup_comment_editor ()
-{
- comment_window = new ArdourWindow (""); // title will be reset to show route
- comment_window->set_skip_taskbar_hint (true);
- comment_window->signal_hide().connect (sigc::mem_fun(*this, &MixerStrip::comment_editor_done_editing));
- comment_window->set_default_size (400, 200);
-
- comment_area = manage (new TextView());
- comment_area->set_name ("MixerTrackCommentArea");
- comment_area->set_wrap_mode (WRAP_WORD);
- comment_area->set_editable (true);
- comment_area->get_buffer()->set_text (_route->comment());
- comment_area->show ();
-
- comment_window->add (*comment_area);
-}
-
-void
-MixerStrip::comment_changed (void *src)
-{
- ENSURE_GUI_THREAD (*this, &MixerStrip::comment_changed, src)
-
- if (src != this) {
- ignore_comment_edit = true;
- if (comment_area) {
- comment_area->get_buffer()->set_text (_route->comment());
- }
- ignore_comment_edit = false;
- }
}
bool
MixerStrip::route_color_changed ()
{
name_button.modify_bg (STATE_NORMAL, color());
- top_event_box.modify_bg (STATE_NORMAL, color());
number_label.set_fixed_colors (gdk_color_to_rgba (color()), gdk_color_to_rgba (color()));
reset_strip_style ();
}
MenuList& items = route_ops_menu->items();
- items.push_back (MenuElem (_("Comments..."), sigc::mem_fun (*this, &MixerStrip::open_comment_editor)));
+ items.push_back (MenuElem (_("Color..."), sigc::mem_fun (*this, &RouteUI::choose_color)));
+
+ items.push_back (MenuElem (_("Comments..."), sigc::mem_fun (*this, &RouteUI::open_comment_editor)));
+
+ items.push_back (MenuElem (_("Inputs..."), sigc::mem_fun (*this, &RouteUI::edit_input_configuration)));
+
+ items.push_back (MenuElem (_("Outputs..."), sigc::mem_fun (*this, &RouteUI::edit_output_configuration)));
+
+ items.push_back (SeparatorElem());
+
if (!_route->is_master()) {
items.push_back (MenuElem (_("Save As Template..."), sigc::mem_fun(*this, &RouteUI::save_as_template)));
}
items.push_back (MenuElem (_("Remote Control ID..."), sigc::mem_fun (*this, &RouteUI::open_remote_control_id_dialog)));
}
- 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 (SeparatorElem());
+ 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 ();
+
+ /* 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 ();
- 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 false;
+}
+
+gboolean
+MixerStrip::number_button_button_press (GdkEventButton* ev)
+{
+ if ( ev->button == 3 ) {
list_route_operations ();
/* 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;
global_frame.set_name ("MixerStripFrame");
}
global_frame.queue_draw ();
-
+
// if (!yn)
// processor_box.deselect_all_processors();
}
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 ("-");
- number_label.hide();
- } else {
- number_label.set_text (PBD::to_string (abs(_route->track_number ()), std::dec));
- number_label.show();
- }
- } else {
- number_label.hide();
- }
- name_button.set_text (_route->name());
- break;
- case Narrow:
- number_label.hide();
- 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;
+ }
+
+ set_tooltip (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));
}
- break;
+ } else {
+ number_label.set_text ("");
}
+}
- ARDOUR_UI::instance()->set_tip (name_button, _route->name());
+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
if (ev->button != 1) {
return false;
}
-
+
if (Keyboard::modifier_state_contains (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier | Keyboard::TertiaryModifier)) && _mixer_owned) {
switch (_width) {
case Wide:
case Wide:
switch (mp) {
case MeterInput:
- return _("in");
+ return _("In");
break;
-
+
case MeterPreFader:
- return _("pre");
+ return _("Pre");
break;
-
+
case MeterPostFader:
- return _("post");
+ return _("Post");
break;
-
+
case MeterOutput:
- return _("out");
+ return _("Out");
break;
-
+
case MeterCustom:
default:
- return _("custom");
+ return _("Custom");
break;
}
break;
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"));
break;
}
}
- solo_isolated_led->set_text (_("iso"));
- solo_safe_led->set_text (_("lock"));
+ solo_isolated_led->set_text (_("Iso"));
+ 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 (UIConfiguration::instance().get_mixer_strip_visibility ());
}
else if (p == "track-name-number") {
name_changed ();
if (_route && _route->is_master ()) {
return boost::optional<bool> (false);
}
-
+
return boost::optional<bool> ();
}
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());
add_level_meter_item_type (items, tgroup, ArdourMeter::meter_type_string(MeterPeak), MeterPeak);
+ add_level_meter_item_type (items, tgroup, ArdourMeter::meter_type_string(MeterPeak0dB), MeterPeak0dB);
add_level_meter_item_type (items, tgroup, ArdourMeter::meter_type_string(MeterKrms), MeterKrms);
add_level_meter_item_type (items, tgroup, ArdourMeter::meter_type_string(MeterIEC1DIN), MeterIEC1DIN);
add_level_meter_item_type (items, tgroup, ArdourMeter::meter_type_string(MeterIEC1NOR), MeterIEC1NOR);
RadioMenuItem::Group& group, string const & name, MeterPoint point)
{
using namespace Menu_Helpers;
-
+
items.push_back (RadioMenuElem (group, name, sigc::bind (sigc::mem_fun (*this, &MixerStrip::set_meter_point), point)));
RadioMenuItem* i = dynamic_cast<RadioMenuItem *> (&items.back ());
i->set_active (_route->meter_point() == point);
RadioMenuItem::Group& group, string const & name, MeterType type)
{
using namespace Menu_Helpers;
-
+
items.push_back (RadioMenuElem (group, name, sigc::bind (sigc::mem_fun (*this, &MixerStrip::set_meter_type), type)));
RadioMenuItem* i = dynamic_cast<RadioMenuItem *> (&items.back ());
i->set_active (_route->meter_type() == type);
projects / ardour.git / blobdiff