, parent_canvas (canvas)
, no_redraw (false)
, button_table (3, 3)
- , route_group_button (_("g"))
- , playlist_button (_("p"))
- , automation_button (_("a"))
+ , route_group_button (_("G"))
+ , playlist_button (_("P"))
+ , automation_button (_("A"))
, automation_action_menu (0)
, plugins_submenu_item (0)
, route_group_menu (0)
, playlist_action_menu (0)
, mode_menu (0)
, color_mode_menu (0)
- , gm (sess, true, 125, 18)
+ , gm (sess, true, 75, 20)
, _ignore_set_layer_display (false)
{
- number_label.set_corner_radius(2);
- number_label.set_name("tracknumber label");
+ number_label.set_name("route button");
+ number_label.set_elements((ArdourButton::Element)(ArdourButton::Edge|ArdourButton::Body|ArdourButton::Text|ArdourButton::Inactive));
number_label.set_alignment(.5, .5);
+ number_label.set_fallthrough_to_parent (true);
sess->config.ParameterChanged.connect (*this, invalidator (*this), boost::bind (&RouteTimeAxisView::parameter_changed, this, _1), gui_context());
}
}
mute_changed (0);
- update_solo_display ();
+ update_solo_display ();
timestretch_rect = 0;
no_redraw = false;
switch (track()->mode()) {
case ARDOUR::Normal:
case ARDOUR::NonLayered:
- rec_enable_button->set_image (::get_icon (X_("record_normal_red")));
+ rec_enable_button->set_image (Glib::RefPtr<Gdk::Pixbuf>());
+ rec_enable_button->set_markup ("<span color=\"#f46f6f\">\u25CF</span>");
break;
case ARDOUR::Destructive:
+ rec_enable_button->set_text (string());
rec_enable_button->set_image (::get_icon (X_("record_tape_red")));
break;
}
- controls_table.attach (*rec_enable_button, 5, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
+ if (ARDOUR::Profile->get_mixbus()) {
+ controls_table.attach (*rec_enable_button, 0, 1, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
+ } else {
+ controls_table.attach (*rec_enable_button, 2, 3, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
+ }
+ controls_button_size_group->add_widget(*rec_enable_button);
if (is_midi_track()) {
ARDOUR_UI::instance()->set_tip(*rec_enable_button, _("Record (Right-click for Step Edit)"));
} else {
gm.set_fader_name ("AudioBusFader");
+ Gtk::Fixed *blank = manage(new Gtk::Fixed());
+ controls_button_size_group->add_widget(*blank);
+ if (ARDOUR::Profile->get_mixbus() ) {
+ controls_table.attach (*blank, 0, 1, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
+ } else {
+ controls_table.attach (*blank, 2, 3, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
+ }
+ blank->show();
}
- Gtk::VBox *mtrbox = manage(new Gtk::VBox());
- mtrbox->pack_start(gm.get_level_meter(), false, false, 2);
- controls_hbox.pack_start(*mtrbox, false, false, 4);
- mtrbox->show();
+ top_hbox.pack_end(gm.get_level_meter(), false, false, 4);
+
+ if (!ARDOUR::Profile->get_mixbus()) {
+ controls_meters_size_group->add_widget (gm.get_level_meter());
+ }
_route->meter_change.connect (*this, invalidator (*this), bind (&RouteTimeAxisView::meter_changed, this), gui_context());
_route->input()->changed.connect (*this, invalidator (*this), boost::bind (&RouteTimeAxisView::io_changed, this, _1, _2), gui_context());
_route->output()->changed.connect (*this, invalidator (*this), boost::bind (&RouteTimeAxisView::io_changed, this, _1, _2), gui_context());
_route->track_number_changed.connect (*this, invalidator (*this), boost::bind (&RouteTimeAxisView::label_view, this), gui_context());
- controls_table.attach (*mute_button, 6, 7, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
-
- if (!_route->is_master()) {
- controls_table.attach (*solo_button, 7, 8, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
- }
+ if (ARDOUR::Profile->get_mixbus()) {
+ controls_table.attach (*mute_button, 1, 2, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
+ } else {
+ controls_table.attach (*mute_button, 3, 4, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
+ }
+ controls_button_size_group->add_widget(*mute_button);
- if (!ARDOUR::Profile->get_trx()) {
- controls_table.attach (route_group_button, 7, 8, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
- controls_table.attach (gm.get_gain_slider(), 0, 5, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::AttachOptions (0), 3, 0);
+ if (!_route->is_master()) {
+ if (ARDOUR::Profile->get_mixbus()) {
+ controls_table.attach (*solo_button, 2, 3, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
+ } else {
+ controls_table.attach (*solo_button, 4, 5, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
+ }
+ controls_button_size_group->add_widget(*solo_button);
+ } else {
+ Gtk::Fixed *blank = manage(new Gtk::Fixed());
+ controls_button_size_group->add_widget(*blank);
+ if (ARDOUR::Profile->get_mixbus()) {
+ controls_table.attach (*blank, 2, 3, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
+ } else {
+ controls_table.attach (*blank, 4, 5, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
+ }
+ blank->show();
}
+ if (ARDOUR::Profile->get_mixbus()) {
+ controls_button_size_group->add_widget(route_group_button);
+ controls_table.attach (route_group_button, 2, 3, 3, 4, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
+ controls_table.attach (gm.get_gain_slider(), 3, 5, 2, 4, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
+ }
+ else if (!ARDOUR::Profile->get_trx()) {
+ controls_button_size_group->add_widget(route_group_button);
+ controls_table.attach (route_group_button, 4, 5, 3, 4, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
+ controls_table.attach (gm.get_gain_slider(), 0, 2, 2, 4, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
+ }
+
ARDOUR_UI::instance()->set_tip(*solo_button,_("Solo"));
ARDOUR_UI::instance()->set_tip(*mute_button,_("Mute"));
ARDOUR_UI::instance()->set_tip(route_group_button, _("Route Group"));
update_track_number_visibility();
label_view ();
- if (!ARDOUR::Profile->get_trx()) {
- controls_table.attach (automation_button, 6, 7, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
+ if (ARDOUR::Profile->get_mixbus()) {
+ controls_table.attach (automation_button, 1, 2, 3, 4, Gtk::SHRINK, Gtk::SHRINK);
+ controls_button_size_group->add_widget(automation_button);
+ }
+ else if (!ARDOUR::Profile->get_trx()) {
+ controls_table.attach (automation_button, 3, 4, 3, 4, Gtk::SHRINK, Gtk::SHRINK);
+ controls_button_size_group->add_widget(automation_button);
}
- if (!ARDOUR::Profile->get_trx() && is_track() && track()->mode() == ARDOUR::Normal) {
- controls_table.attach (playlist_button, 5, 6, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
+ if (is_track() && track()->mode() == ARDOUR::Normal) {
+ if (ARDOUR::Profile->get_mixbus()) {
+ controls_table.attach (playlist_button, 0, 1, 3, 4, Gtk::SHRINK, Gtk::SHRINK);
+ controls_button_size_group->add_widget(playlist_button);
+ }
+ else if (!ARDOUR::Profile->get_trx()) {
+ controls_table.attach (playlist_button, 2, 3, 3, 4, Gtk::SHRINK, Gtk::SHRINK);
+ controls_button_size_group->add_widget(playlist_button);
+ }
}
_y_position = -1;
void
RouteTimeAxisView::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.is_visible()) { return; }
if (number_label.get_parent()) {
controls_table.remove (number_label);
}
- if (name_hbox.get_parent()) {
- controls_table.remove (name_hbox);
- }
if (show_label) {
- controls_table.attach (number_label, 0, 1, 0, 1, Gtk::SHRINK, Gtk::FILL|Gtk::EXPAND, 3, 0);
- controls_table.attach (name_hbox, 1, 5, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 3, 0);
- number_label.set_size_request(3 + _session->track_number_decimals() * 8, -1);
- name_hbox.show ();
+ if (ARDOUR::Profile->get_mixbus()) {
+ controls_table.attach (number_label, 3, 4, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
+ } else {
+ controls_table.attach (number_label, 0, 1, 0, 1, Gtk::SHRINK, Gtk::SHRINK, 0, 0);
+ }
+ const int tnw = std::max(2u, _session->track_number_decimals()) * 8; // TODO 8 = max_width_of_digit_0_to_9()
+ number_label.set_size_request(3 + tnw, -1);
number_label.show ();
} else {
- controls_table.attach (name_hbox, 0, 5, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 3, 0);
- name_hbox.show ();
number_label.hide ();
}
}
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 (_size_menu) {
detach_menu (*_size_menu);
}
switch (mode) {
case ARDOUR::NonLayered:
case ARDOUR::Normal:
- rec_enable_button->set_image (::get_icon (X_("record_normal_red")));
- rec_enable_button->set_text (string());
+ rec_enable_button->set_image (Glib::RefPtr<Gdk::Pixbuf>());
+ rec_enable_button->set_markup ("<span color=\"#f46f6f\">\u25CF</span>");
break;
case ARDOUR::Destructive:
- rec_enable_button->set_image (::get_icon (X_("record_tape_red")));
rec_enable_button->set_text (string());
+ rec_enable_button->set_image (::get_icon (X_("record_tape_red")));
break;
}
if (_view) {
_view->apply_color (color(), StreamView::RegionColor);
}
+
+ number_label.set_fixed_colors (gdk_color_to_rgba (color()), gdk_color_to_rgba (color()));
}
void
pl->clear_changes ();
if (Config->get_edit_mode() == Ripple) {
- std::pair<framepos_t, framepos_t> extent = (*p)->get_extent();
+ std::pair<framepos_t, framepos_t> extent = (*p)->get_extent_with_endspace();
framecnt_t amount = extent.second - extent.first;
pl->ripple(pos, amount * times, boost::shared_ptr<Region>());
}
}
void
-RouteTimeAxisView::update_rec_display ()
+RouteTimeAxisView::blink_rec_display (bool onoff)
{
- RouteUI::update_rec_display ();
+ RouteUI::blink_rec_display (onoff);
}
void
break;
}
} else {
- solo_button->set_text (_("s"));
+ solo_button->set_text (_("S"));
ARDOUR_UI::instance()->set_tip (*solo_button, _("Solo"));
}
- mute_button->set_text (_("m"));
+ mute_button->set_text (_("M"));
}
Gtk::CheckMenuItem*
projects / ardour.git / blobdiff