#include "i18n.h"
using namespace ARDOUR;
+using namespace ARDOUR_UI_UTILS;
using namespace PBD;
using namespace Gtkmm2ext;
using namespace Gtk;
, 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_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());
}
void
}
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);
- 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"));
ARDOUR_UI::instance()->set_tip(automation_button, _("Automation"));
}
+ update_track_number_visibility();
label_view ();
- 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 (is_track() && track()->mode() == ARDOUR::Normal) {
- controls_table.attach (playlist_button, 5, 6, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
+ 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::label_view ()
{
- string x = _route->name();
-
- if (x != name_label.get_text()) {
+ string x = _route->name ();
+ if (x != name_label.get_text ()) {
name_label.set_text (x);
}
+ 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));
+ }
+}
+
+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 (number_label.get_parent()) {
+ controls_table.remove (number_label);
+ }
+ if (show_label) {
+ 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 {
+ number_label.hide ();
+ }
+}
+void
+RouteTimeAxisView::parameter_changed (string const & p)
+{
+ if (p == "track-name-number") {
+ update_track_number_visibility();
+ }
}
void
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);
}
} else if (active > 0 && inactive > 0) {
i->set_inconsistent (true);
}
+ i->set_sensitive(! _session->transport_rolling());
i->signal_activate().connect (sigc::bind (sigc::mem_fun (*this, &RouteUI::set_route_active), click_sets_active, true));
items.push_back (SeparatorElem());
_editor.get_selection().tracks.foreach_route_time_axis (boost::bind (&RouteTimeAxisView::set_track_mode, _1, mode, false));
} else {
- bool needs_bounce;
+ bool needs_bounce = false;
if (!track()->can_use_mode (mode, needs_bounce)) {
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
return -1;
}
+void
+RouteTimeAxisView::fade_range (TimeSelection& selection)
+{
+ boost::shared_ptr<Playlist> what_we_got;
+ boost::shared_ptr<Track> tr = track ();
+ boost::shared_ptr<Playlist> playlist;
+
+ if (tr == 0) {
+ /* route is a bus, not a track */
+ return;
+ }
+
+ playlist = tr->playlist();
+
+ TimeSelection time (selection);
+ float const speed = tr->speed();
+ if (speed != 1.0f) {
+ for (TimeSelection::iterator i = time.begin(); i != time.end(); ++i) {
+ (*i).start = session_frame_to_track_frame((*i).start, speed);
+ (*i).end = session_frame_to_track_frame((*i).end, speed);
+ }
+ }
+
+ playlist->clear_changes ();
+ playlist->clear_owned_changes ();
+
+ playlist->fade_range (time);
+
+ vector<Command*> cmds;
+ playlist->rdiff (cmds);
+ _session->add_commands (cmds);
+ _session->add_command (new StatefulDiffCommand (playlist));
+
+}
+
void
RouteTimeAxisView::cut_copy_clear (Selection& selection, CutCopyOp op)
{
switch (op) {
case Delete:
if (playlist->cut (time) != 0) {
+ if (Config->get_edit_mode() == Ripple)
+ playlist->ripple(time.start(), -time.length(), NULL);
+ // no need to exclude any regions from rippling here
+
vector<Command*> cmds;
playlist->rdiff (cmds);
_session->add_commands (cmds);
case Cut:
if ((what_we_got = playlist->cut (time)) != 0) {
_editor.get_cut_buffer().add (what_we_got);
+ if (Config->get_edit_mode() == Ripple)
+ playlist->ripple(time.start(), -time.length(), NULL);
+ // no need to exclude any regions from rippling here
+
vector<Command*> cmds;
playlist->rdiff (cmds);
_session->add_commands (cmds);
case Clear:
if ((what_we_got = playlist->cut (time)) != 0) {
+ if (Config->get_edit_mode() == Ripple)
+ playlist->ripple(time.start(), -time.length(), NULL);
+ // no need to exclude any regions from rippling here
vector<Command*> cmds;
playlist->rdiff (cmds);
DEBUG_TRACE (DEBUG::CutNPaste, string_compose ("modified paste to %1\n", pos));
}
- pl->clear_changes ();
+ pl->clear_changes ();
+ if (Config->get_edit_mode() == Ripple) {
+ 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>());
+ }
pl->paste (*p, pos, times);
+
+ vector<Command*> cmds;
+ pl->rdiff (cmds);
+ _session->add_commands (cmds);
+
_session->add_command (new StatefulDiffCommand (pl));
return true;
}
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*
add_automation_child (Evoral::Parameter(GainAutomation), gain_track, show);
}
+void
+RouteTimeAxisView::create_mute_automation_child (const Evoral::Parameter& param, bool show)
+{
+ boost::shared_ptr<AutomationControl> c = _route->mute_control();
+ if (!c) {
+ error << "Route has no mute automation, unable to add automation track view." << endmsg;
+ return;
+ }
+
+ mute_track.reset (new AutomationTimeAxisView (_session,
+ _route, _route, c, param,
+ _editor,
+ *this,
+ false,
+ parent_canvas,
+ _route->describe_parameter(param)));
+
+ if (_view) {
+ _view->foreach_regionview (sigc::mem_fun (*mute_track.get(), &TimeAxisView::add_ghost));
+ }
+
+ add_automation_child (Evoral::Parameter(MuteAutomation), mute_track, show);
+}
+
static
void add_region_to_list (RegionView* rv, RegionList* l)
{
projects / ardour.git / blobdiff