, processor_box (sess, boost::bind (&MixerStrip::plugin_selector, this), mx.selection(), this, in_mixer)
, gpm (sess, 250)
, panners (sess)
- , _mono_button (_("Mono"))
- , button_table (4, 2)
+ , button_table (3, 1)
, solo_led_table (2, 2)
, middle_button_table (1, 2)
, bottom_button_table (1, 2)
, meter_point_label (_("pre"))
- , comment_button (_("Comments"))
{
init ();
, processor_box (sess, sigc::mem_fun(*this, &MixerStrip::plugin_selector), mx.selection(), this, in_mixer)
, gpm (sess, 250)
, panners (sess)
- , _mono_button (_("Mono"))
- , button_table (3, 2)
+ , button_table (3, 1)
, middle_button_table (1, 2)
, bottom_button_table (1, 2)
, meter_point_label (_("pre"))
- , comment_button (_("Comments"))
{
init ();
set_route (rt);
solo_safe_led->signal_button_release_event().connect (sigc::mem_fun (*this, &RouteUI::solo_safe_button_release));
UI::instance()->set_tip (solo_safe_led, _("Lock Solo Status"), "");
- Label* iso_label = manage (new Label (_("iso")));
- Label* safe_label = manage (new Label (_("lock")));
+ _iso_label = manage (new Label (_("iso")));
+ _safe_label = manage (new Label (_("lock")));
- iso_label->set_name (X_("SoloLEDLabel"));
- safe_label->set_name (X_("SoloLEDLabel"));
+ _iso_label->set_name (X_("SoloLEDLabel"));
+ _safe_label->set_name (X_("SoloLEDLabel"));
- iso_label->show ();
- safe_label->show ();
+ _iso_label->show ();
+ _safe_label->show ();
solo_led_table.set_spacings (0);
solo_led_table.set_border_width (1);
- solo_led_table.attach (*iso_label, 0, 1, 0, 1, Gtk::FILL, Gtk::FILL);
+ solo_led_table.attach (*_iso_label, 0, 1, 0, 1, Gtk::FILL, Gtk::FILL);
solo_led_table.attach (*solo_isolated_led, 1, 2, 0, 1, Gtk::FILL, Gtk::FILL);
- solo_led_table.attach (*safe_label, 0, 1, 1, 2, Gtk::FILL, Gtk::FILL);
+ solo_led_table.attach (*_safe_label, 0, 1, 1, 2, Gtk::FILL, Gtk::FILL);
solo_led_table.attach (*solo_safe_led, 1, 2, 1, 2, Gtk::FILL, Gtk::FILL);
solo_led_table.show ();
- solo_led_box.pack_end (solo_led_table, false, false);
- solo_led_box.show ();
+ below_panner_box.set_border_width (2);
+ below_panner_box.set_spacing (2);
+ below_panner_box.pack_end (solo_led_table, false, false);
+ below_panner_box.show ();
button_table.set_homogeneous (true);
button_table.set_spacings (0);
- button_table.attach (name_button, 0, 2, 0, 1);
- button_table.attach (input_button, 0, 2, 1, 2);
- button_table.attach (_invert_button_box, 0, 2, 3, 4);
+ button_table.attach (name_button, 0, 1, 0, 1);
+ button_table.attach (input_button, 0, 1, 1, 2);
+ button_table.attach (_invert_button_box, 0, 1, 2, 3);
middle_button_table.set_homogeneous (true);
middle_button_table.set_spacings (0);
Gtkmm2ext::set_size_request_to_display_given_text (group_button, "Group", 2, 2);
group_label.set_name ("MixerGroupButtonLabel");
- comment_button.set_name ("MixerCommentButton");
- comment_button.signal_clicked().connect (sigc::mem_fun(*this, &MixerStrip::comment_button_clicked));
-
- _mono_button.set_name ("MixerMonoButton");
- _mono_button.signal_clicked().connect (sigc::mem_fun (*this, &MixerStrip::mono_button_clicked));
-
global_vpacker.set_border_width (0);
global_vpacker.set_spacing (0);
global_vpacker.pack_start (button_table,Gtk::PACK_SHRINK);
global_vpacker.pack_start (processor_box, true, true);
global_vpacker.pack_start (panners, Gtk::PACK_SHRINK);
- global_vpacker.pack_start (solo_led_box,Gtk::PACK_SHRINK);
+ global_vpacker.pack_start (below_panner_box, Gtk::PACK_SHRINK);
global_vpacker.pack_start (middle_button_table,Gtk::PACK_SHRINK);
global_vpacker.pack_start (gain_meter_alignment,Gtk::PACK_SHRINK);
global_vpacker.pack_start (bottom_button_table,Gtk::PACK_SHRINK);
- global_vpacker.pack_start (_mono_button, Gtk::PACK_SHRINK);
global_vpacker.pack_start (output_button, Gtk::PACK_SHRINK);
- global_vpacker.pack_start (comment_button, Gtk::PACK_SHRINK);
global_frame.add (global_vpacker);
global_frame.set_shadow_type (Gtk::SHADOW_IN);
MixerStrip::set_route (boost::shared_ptr<Route> rt)
{
if (rec_enable_button->get_parent()) {
- button_table.remove (*rec_enable_button);
+ below_panner_box.remove (*rec_enable_button);
}
if (show_sends_button->get_parent()) {
- button_table.remove (*show_sends_button);
+ below_panner_box.remove (*show_sends_button);
}
processor_box.set_route (rt);
if (route()->is_master()) {
solo_button->hide ();
- solo_led_box.hide ();
+ below_panner_box.hide ();
} else {
solo_button->show ();
- solo_led_box.show ();
+ below_panner_box.show ();
}
if (_mixer_owned && (route()->is_master() || route()->is_monitor())) {
}
if (has_audio_outputs ()) {
- _mono_button.show ();
panners.show_all ();
} else {
- _mono_button.hide ();
panners.hide_all ();
}
if (is_track ()) {
- button_table.attach (*rec_enable_button, 0, 2, 2, 3);
+ below_panner_box.pack_start (*rec_enable_button);
rec_enable_button->set_sensitive (_session->writable());
rec_enable_button->show();
/* non-master bus */
if (!_route->is_master()) {
- button_table.attach (*show_sends_button, 0, 2, 2, 3);
+ below_panner_box.pack_start (*show_sends_button);
show_sends_button->show();
}
}
delete route_ops_menu;
route_ops_menu = 0;
- ARDOUR_UI::instance()->set_tip (comment_button, _route->comment().empty() ?
- _("Click to Add/Edit Comments"):
- _route->comment());
-
_route->meter_change.connect (route_connections, invalidator (*this), bind (&MixerStrip::meter_changed, this), gui_context());
_route->route_group_changed.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::route_group_changed, this), gui_context());
output_label.show();
name_label.show();
name_button.show();
- comment_button.show();
group_button.show();
group_label.show();
((Gtk::Label*)show_sends_button->get_child())->set_text (_("Sends"));
}
- if (_route->comment() == "") {
- comment_button.unset_bg (STATE_NORMAL);
- ((Gtk::Label*)comment_button.get_child())->set_text (_("Comments"));
- } else {
- comment_button.modify_bg (STATE_NORMAL, color());
- ((Gtk::Label*)comment_button.get_child())->set_text (_("*Comments*"));
- }
-
((Gtk::Label*)gpm.gain_automation_style_button.get_child())->set_text (
gpm.astyle_string(gain_automation->automation_style()));
((Gtk::Label*)gpm.gain_automation_state_button.get_child())->set_text (
panners.astate_string(_route->panner()->automation_state()));
}
+ _iso_label->show ();
+ _safe_label->show ();
+
Gtkmm2ext::set_size_request_to_display_given_text (name_button, "long", 2, 2);
set_size_request (-1, -1);
break;
((Gtk::Label*)show_sends_button->get_child())->set_text (_("Snd"));
}
- if (_route->comment() == "") {
- comment_button.unset_bg (STATE_NORMAL);
- ((Gtk::Label*)comment_button.get_child())->set_text (_("Cmt"));
- } else {
- comment_button.modify_bg (STATE_NORMAL, color());
- ((Gtk::Label*)comment_button.get_child())->set_text (_("*Cmt*"));
- }
-
((Gtk::Label*)gpm.gain_automation_style_button.get_child())->set_text (
gpm.short_astyle_string(gain_automation->automation_style()));
((Gtk::Label*)gpm.gain_automation_state_button.get_child())->set_text (
panners.short_astate_string(_route->panner()->automation_state()));
}
+ _iso_label->hide ();
+ _safe_label->hide ();
+
Gtkmm2ext::set_size_request_to_display_given_text (name_button, longest_label.c_str(), 2, 2);
set_size_request (max (50, gpm.get_gm_width()), -1);
break;
}
void
-MixerStrip::comment_editor_done_editing()
+MixerStrip::comment_editor_done_editing ()
{
- string str = comment_area->get_buffer()->get_text();
- if (_route->comment() != str) {
- _route->set_comment (str, this);
-
- switch (_width) {
-
- case Wide:
- if (! str.empty()) {
- comment_button.modify_bg (STATE_NORMAL, color());
- ((Gtk::Label*)comment_button.get_child())->set_text (_("*Comments*"));
- } else {
- comment_button.unset_bg (STATE_NORMAL);
- ((Gtk::Label*)comment_button.get_child())->set_text (_("Comments"));
- }
- break;
-
- case Narrow:
- if (! str.empty()) {
- comment_button.modify_bg (STATE_NORMAL, color());
- ((Gtk::Label*)comment_button.get_child())->set_text (_("*Cmt*"));
- } else {
- comment_button.unset_bg (STATE_NORMAL);
- ((Gtk::Label*)comment_button.get_child())->set_text (_("Cmt"));
- }
- break;
- }
-
- ARDOUR_UI::instance()->set_tip (comment_button,
- str.empty() ? _("Click to Add/Edit Comments") : str);
+ ignore_toggle = true;
+ _comment_menu_item->set_active (false);
+ ignore_toggle = false;
+
+ string const str = comment_area->get_buffer()->get_text();
+ if (str == _route->comment ()) {
+ return;
}
-
+
+ _route->set_comment (str, this);
}
void
-MixerStrip::comment_button_clicked ()
+MixerStrip::toggle_comment ()
{
+ if (ignore_toggle) {
+ return;
+ }
+
if (comment_window == 0) {
setup_comment_editor ();
}
- int x, y, cw_width, cw_height;
-
- if (comment_window->is_visible()) {
+ if (comment_window->is_visible ()) {
comment_window->hide ();
return;
}
- comment_window->get_size (cw_width, cw_height);
- comment_window->get_position(x, y);
- comment_window->move(x, y - (cw_height / 2) - 45);
- /*
- half the dialog height minus the comments button height
- with some window decoration fudge thrown in.
- */
-
comment_window->show();
comment_window->present();
}
MenuList& items = route_ops_menu->items();
+ items.push_back (CheckMenuElem (_("Comments..."), sigc::mem_fun (*this, &MixerStrip::toggle_comment)));
+ _comment_menu_item = dynamic_cast<CheckMenuItem*> (&items.back ());
items.push_back (MenuElem (_("Save As Template..."), sigc::mem_fun(*this, &RouteUI::save_as_template)));
items.push_back (MenuElem (_("Rename..."), sigc::mem_fun(*this, &RouteUI::route_rename)));
rename_menu_item = &items.back();
mute_button->set_sensitive (true);
solo_button->set_sensitive (true);
rec_enable_button->set_sensitive (true);
- _mono_button.set_sensitive (true);
- comment_button.set_sensitive (true);
solo_isolated_led->set_sensitive (true);
solo_safe_led->set_sensitive (true);
}
mute_button->set_sensitive (false);
solo_button->set_sensitive (false);
rec_enable_button->set_sensitive (false);
- _mono_button.set_sensitive (false);
- comment_button.set_sensitive (false);
solo_isolated_led->set_sensitive (false);
solo_safe_led->set_sensitive (false);
return false;
}
-void
-MixerStrip::mono_button_clicked ()
-{
- panners.set_mono (_mono_button.get_active ());
-}
-
PluginSelector*
MixerStrip::plugin_selector()
{
return _mixer.plugin_selector();
}
+
+void
+MixerStrip::hide_things ()
+{
+ processor_box.hide_things ();
+}
projects / ardour.git / blobdiff