X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Froute_time_axis.cc;h=2c64615ea18f48b1d32391aae9f2db5320563d5d;hb=be85889464470e66e33f6f09f3cf1a64ef3c5063;hp=442fb959c42de85fd9847f4d6b90af91647961f1;hpb=aae367b63c9b619db1e40f27dc334c6987219481;p=ardour.git diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc index 442fb959c4..2c64615ea1 100644 --- a/gtk2_ardour/route_time_axis.cc +++ b/gtk2_ardour/route_time_axis.cc @@ -23,6 +23,7 @@ #include #include #include +#include #include #include @@ -32,12 +33,12 @@ #include "pbd/whitespace.h" #include "pbd/memento_command.h" #include "pbd/enumwriter.h" +#include "pbd/stateful_diff_command.h" #include #include #include #include -#include #include #include @@ -108,13 +109,10 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session* sess, boost::sh , button_table (3, 3) , route_group_button (_("g")) , playlist_button (_("p")) - , size_button (_("h")) , automation_button (_("a")) - , visual_button (_("v")) , gm (sess, slider, true, 115) + , _ignore_track_mode_change (false) { - set_button_names (); - gm.set_controls (_route, _route->shared_peak_meter(), _route->amp()); gm.get_level_meter().set_no_show_all(); gm.get_level_meter().setup_meters(50); @@ -123,6 +121,7 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session* sess, boost::sh playlist_menu = 0; playlist_action_menu = 0; automation_action_menu = 0; + plugins_submenu_item = 0; mode_menu = 0; _view = 0; @@ -130,6 +129,9 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session* sess, boost::sh _marked_for_display = true; } + mute_changed (0); + update_solo_display (); + timestretch_rect = 0; no_redraw = false; destructive_track_mode_item = 0; @@ -141,31 +143,14 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session* sess, boost::sh route_group_button.set_name ("TrackGroupButton"); playlist_button.set_name ("TrackPlaylistButton"); automation_button.set_name ("TrackAutomationButton"); - size_button.set_name ("TrackSizeButton"); - visual_button.set_name ("TrackVisualButton"); - hide_button.set_name ("TrackRemoveButton"); route_group_button.unset_flags (Gtk::CAN_FOCUS); playlist_button.unset_flags (Gtk::CAN_FOCUS); automation_button.unset_flags (Gtk::CAN_FOCUS); - size_button.unset_flags (Gtk::CAN_FOCUS); - visual_button.unset_flags (Gtk::CAN_FOCUS); - hide_button.unset_flags (Gtk::CAN_FOCUS); - - hide_button.add (*(manage (new Image (::get_icon("hide"))))); - hide_button.show_all (); - route_group_button.signal_button_release_event().connect (sigc::mem_fun(*this, &RouteTimeAxisView::edit_click), false); + route_group_button.signal_button_release_event().connect (sigc::mem_fun(*this, &RouteTimeAxisView::route_group_click), false); playlist_button.signal_clicked().connect (sigc::mem_fun(*this, &RouteTimeAxisView::playlist_click)); automation_button.signal_clicked().connect (sigc::mem_fun(*this, &RouteTimeAxisView::automation_click)); - size_button.signal_button_release_event().connect (sigc::mem_fun(*this, &RouteTimeAxisView::size_click), false); - visual_button.signal_clicked().connect (sigc::mem_fun(*this, &RouteTimeAxisView::visual_click)); - hide_button.signal_clicked().connect (sigc::mem_fun(*this, &RouteTimeAxisView::hide_click)); - - solo_button->signal_button_press_event().connect (sigc::mem_fun(*this, &RouteUI::solo_press), false); - solo_button->signal_button_release_event().connect (sigc::mem_fun(*this, &RouteUI::solo_release), false); - mute_button->signal_button_press_event().connect (sigc::mem_fun(*this, &RouteUI::mute_press), false); - mute_button->signal_button_release_event().connect (sigc::mem_fun(*this, &RouteUI::mute_release), false); if (is_track()) { @@ -184,49 +169,40 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session* sess, boost::sh } rec_enable_button->show_all (); - rec_enable_button->signal_button_press_event().connect (sigc::mem_fun(*this, &RouteUI::rec_enable_press), false); - rec_enable_button->signal_button_release_event().connect (sigc::mem_fun(*this, &RouteUI::rec_enable_release), false); controls_table.attach (*rec_enable_button, 5, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0); - ARDOUR_UI::instance()->tooltips().set_tip(*rec_enable_button, _("Record")); + + if (is_midi_track()) { + ARDOUR_UI::instance()->set_tip(*rec_enable_button, _("Record (Right-click for Step Edit)")); + } else { + ARDOUR_UI::instance()->set_tip(*rec_enable_button, _("Record")); + } rec_enable_button->set_sensitive (_session->writable()); } controls_hbox.pack_start(gm.get_level_meter(), false, false); - _route->meter_change.connect (*this, boost::bind (&RouteTimeAxisView::meter_changed, this, _1)); - _route->input()->changed.connect (*this, boost::bind (&RouteTimeAxisView::io_changed, this, _1, _2)); - _route->output()->changed.connect (*this, boost::bind (&RouteTimeAxisView::io_changed, this, _1, _2)); + _route->meter_change.connect (*this, invalidator (*this), bind (&RouteTimeAxisView::meter_changed, this), gui_context()); + _route->input()->changed.connect (*this, invalidator (*this), ui_bind (&RouteTimeAxisView::io_changed, this, _1, _2), gui_context()); + _route->output()->changed.connect (*this, invalidator (*this), ui_bind (&RouteTimeAxisView::io_changed, this, _1, _2), gui_context()); controls_table.attach (*mute_button, 6, 7, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0); - controls_table.attach (*solo_button, 7, 8, 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); + } 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::SHRINK, Gtk::SHRINK, 0, 0); - ARDOUR_UI::instance()->tooltips().set_tip(*solo_button,_("Solo")); - ARDOUR_UI::instance()->tooltips().set_tip(*mute_button,_("Mute")); - ARDOUR_UI::instance()->tooltips().set_tip(route_group_button, _("Route Group")); - ARDOUR_UI::instance()->tooltips().set_tip(size_button,_("Display Height")); - ARDOUR_UI::instance()->tooltips().set_tip(playlist_button,_("Playlist")); - ARDOUR_UI::instance()->tooltips().set_tip(automation_button, _("Automation")); - ARDOUR_UI::instance()->tooltips().set_tip(visual_button, _("Visual options")); - ARDOUR_UI::instance()->tooltips().set_tip(hide_button, _("Hide this track")); + 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(playlist_button,_("Playlist")); + ARDOUR_UI::instance()->set_tip(automation_button, _("Automation")); label_view (); - if (0) { - - /* old school - when we used to put an extra row of buttons in place */ - - controls_table.attach (hide_button, 0, 1, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); - controls_table.attach (visual_button, 1, 2, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); - controls_table.attach (size_button, 2, 3, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); - controls_table.attach (automation_button, 3, 4, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); - - } else { - - controls_table.attach (automation_button, 6, 7, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); - } + controls_table.attach (automation_button, 6, 7, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); if (is_track() && track()->mode() == ARDOUR::Normal) { controls_table.attach (playlist_button, 5, 6, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); @@ -234,19 +210,14 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session* sess, boost::sh _y_position = -1; - _route->mute_changed.connect (*this, boost::bind (&RouteUI::mute_changed, this, _1)); - _route->solo_changed.connect (*this, boost::bind (&RouteUI::solo_changed, this, _1)); - _route->processors_changed.connect (*this, boost::bind (&RouteTimeAxisView::processors_changed, this, _1)); - _route->NameChanged.connect (*this, boost::bind (&RouteTimeAxisView::route_name_changed, this)); - _route->solo_isolated_changed.connect (*this, boost::bind (&RouteUI::solo_changed, this, _1)); - + _route->processors_changed.connect (*this, invalidator (*this), ui_bind (&RouteTimeAxisView::processors_changed, this, _1), gui_context()); + _route->PropertyChanged.connect (*this, invalidator (*this), ui_bind (&RouteTimeAxisView::route_property_changed, this, _1), gui_context()); if (is_track()) { - track()->TrackModeChanged.connect (*this, boost::bind (&RouteTimeAxisView::track_mode_changed, this)); - track()->FreezeChange.connect (*this, boost::bind (&RouteTimeAxisView::map_frozen, this)); - track()->DiskstreamChanged.connect (*this, boost::bind (&RouteTimeAxisView::diskstream_changed, this)); - get_diskstream()->SpeedChanged.connect (*this, boost::bind (&RouteTimeAxisView::speed_changed, this)); + track()->TrackModeChanged.connect (*this, invalidator (*this), boost::bind (&RouteTimeAxisView::track_mode_changed, this), gui_context()); + track()->FreezeChange.connect (*this, invalidator (*this), boost::bind (&RouteTimeAxisView::map_frozen, this), gui_context()); + track()->SpeedChanged.connect (*this, invalidator (*this), boost::bind (&RouteTimeAxisView::speed_changed, this), gui_context()); /* pick up the correct freeze state */ map_frozen (); @@ -256,11 +227,13 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session* sess, boost::sh _editor.ZoomChanged.connect (sigc::mem_fun(*this, &RouteTimeAxisView::reset_samples_per_unit)); ColorsChanged.connect (sigc::mem_fun (*this, &RouteTimeAxisView::color_handler)); - route_group_menu = new RouteGroupMenu ( - _session, - (RouteGroup::Property) (RouteGroup::Mute | RouteGroup::Solo | RouteGroup::Edit) - ); - + PropertyList* plist = new PropertyList(); + + plist->add (ARDOUR::Properties::edit, true); + plist->add (ARDOUR::Properties::mute, true); + plist->add (ARDOUR::Properties::solo, true); + + route_group_menu = new RouteGroupMenu (_session, plist); route_group_menu->GroupSelected.connect (sigc::mem_fun (*this, &RouteTimeAxisView::set_route_group_from_menu)); gm.get_gain_slider().signal_scroll_event().connect(sigc::mem_fun(*this, &RouteTimeAxisView::controls_ebox_scroll), false); @@ -269,8 +242,7 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session* sess, boost::sh RouteTimeAxisView::~RouteTimeAxisView () { - drop_references (); - drop_connections (); + CatchDeletion (this); for (list::iterator i = processor_automation.begin(); i != processor_automation.end(); ++i) { delete *i; @@ -285,10 +257,6 @@ RouteTimeAxisView::~RouteTimeAxisView () delete _view; _view = 0; - for (AutomationTracks::iterator i = _automation_tracks.begin(); i != _automation_tracks.end(); ++i) { - delete i->second; - } - _automation_tracks.clear (); delete route_group_menu; @@ -301,6 +269,7 @@ RouteTimeAxisView::post_construct () update_diskstream_display (); + _subplugin_menu_map.clear (); subplugin_menu.items().clear (); _route->foreach_processor (sigc::mem_fun (*this, &RouteTimeAxisView::add_processor_to_subplugin_menu)); _route->foreach_processor (sigc::mem_fun (*this, &RouteTimeAxisView::add_existing_processor_automation_curves)); @@ -308,7 +277,7 @@ RouteTimeAxisView::post_construct () } gint -RouteTimeAxisView::edit_click (GdkEventButton *ev) +RouteTimeAxisView::route_group_click (GdkEventButton *ev) { if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) { if (_route->route_group()) { @@ -350,13 +319,15 @@ RouteTimeAxisView::label_view () name_entry.set_text (x); } - ARDOUR_UI::instance()->tooltips().set_tip (name_entry, x); + ARDOUR_UI::instance()->set_tip (name_entry, x); } void -RouteTimeAxisView::route_name_changed () +RouteTimeAxisView::route_property_changed (const PropertyChange& what_changed) { - label_view (); + if (what_changed.contains (ARDOUR::Properties::name)) { + label_view (); + } } void @@ -371,15 +342,7 @@ RouteTimeAxisView::take_name_changed (void *src) void RouteTimeAxisView::playlist_click () { - // always build a new action menu - - delete playlist_action_menu; - - playlist_action_menu = new Menu; - playlist_action_menu->set_name ("ArdourContextMenu"); - - build_playlist_menu (playlist_action_menu); - + build_playlist_menu (); conditionally_add_to_selection (); playlist_action_menu->popup (1, gtk_get_current_event_time()); } @@ -426,40 +389,36 @@ RouteTimeAxisView::build_automation_action_menu () { using namespace Menu_Helpers; - automation_action_menu = manage (new Menu); - MenuList& automation_items = automation_action_menu->items(); - automation_action_menu->set_name ("ArdourContextMenu"); - - automation_items.push_back (MenuElem (_("Show all automation"), - sigc::mem_fun(*this, &RouteTimeAxisView::show_all_automation))); - - automation_items.push_back (MenuElem (_("Show existing automation"), - sigc::mem_fun(*this, &RouteTimeAxisView::show_existing_automation))); - - automation_items.push_back (MenuElem (_("Hide all automation"), - sigc::mem_fun(*this, &RouteTimeAxisView::hide_all_automation))); - - if (subplugin_menu.get_attach_widget()) - subplugin_menu.detach(); - - automation_items.push_back (MenuElem (_("Plugins"), subplugin_menu)); - automation_items.back().set_sensitive (!subplugin_menu.items().empty()); + /* detach subplugin_menu from automation_action_menu before we delete automation_action_menu, + otherwise bad things happen (see comment for similar case in MidiTimeAxisView::build_automation_action_menu) + */ - map::iterator i; - for (i = _automation_tracks.begin(); i != _automation_tracks.end(); ++i) { + detach_menu (subplugin_menu); - automation_items.push_back (SeparatorElem()); + _main_automation_menu_map.clear (); + delete automation_action_menu; + automation_action_menu = new Menu; - delete i->second->menu_item; + MenuList& items = automation_action_menu->items(); - automation_items.push_back(CheckMenuElem (_route->describe_parameter(i->second->param), - sigc::bind (sigc::mem_fun(*this, &RouteTimeAxisView::toggle_automation_track), i->second->param))); + automation_action_menu->set_name ("ArdourContextMenu"); + + items.push_back (MenuElem (_("Show All Automation"), + sigc::mem_fun(*this, &RouteTimeAxisView::show_all_automation))); + + items.push_back (MenuElem (_("Show Existing Automation"), + sigc::mem_fun(*this, &RouteTimeAxisView::show_existing_automation))); + + items.push_back (MenuElem (_("Hide All Automation"), + sigc::mem_fun(*this, &RouteTimeAxisView::hide_all_automation))); - i->second->menu_item = static_cast(&automation_items.back()); + items.push_back (SeparatorElem ()); + + /* Attach the plugin submenu. It may have previously been used elsewhere, + so it was detached above */ - i->second->menu_item->set_active(show_automation(i->second->param)); - //i->second->menu_item->set_active(false); - } + items.push_back (MenuElem (_("Plugins"), subplugin_menu)); + items.back().set_sensitive (!subplugin_menu.items().empty()); } void @@ -467,10 +426,6 @@ RouteTimeAxisView::build_display_menu () { using namespace Menu_Helpers; - /* get the size menu ready */ - - build_size_menu (); - /* prepare it */ TimeAxisView::build_display_menu (); @@ -480,8 +435,7 @@ RouteTimeAxisView::build_display_menu () MenuList& items = display_menu->items(); display_menu->set_name ("ArdourContextMenu"); - items.push_back (MenuElem (_("Height"), *size_menu)); - items.push_back (MenuElem (_("Color"), sigc::mem_fun(*this, &RouteTimeAxisView::select_track_color))); + items.push_back (MenuElem (_("Color..."), sigc::mem_fun(*this, &RouteTimeAxisView::select_track_color))); items.push_back (SeparatorElem()); @@ -489,6 +443,7 @@ RouteTimeAxisView::build_display_menu () items.push_back (MenuElem (_("Remote Control ID..."), sigc::mem_fun (*this, &RouteUI::open_remote_control_id_dialog))); /* rebuild this every time */ build_automation_action_menu (); + detach_menu (*automation_action_menu); items.push_back (MenuElem (_("Automation"), *automation_action_menu)); items.push_back (SeparatorElem()); } @@ -512,45 +467,54 @@ RouteTimeAxisView::build_display_menu () items.push_back (MenuElem (_("Layers"), *layers_menu)); - Menu* alignment_menu = manage (new Menu); - MenuList& alignment_items = alignment_menu->items(); - alignment_menu->set_name ("ArdourContextMenu"); - - RadioMenuItem::Group align_group; - - alignment_items.push_back (RadioMenuElem (align_group, _("Align with existing material"), - sigc::bind (sigc::mem_fun(*this, &RouteTimeAxisView::set_align_style), ExistingMaterial))); - align_existing_item = dynamic_cast(&alignment_items.back()); - if (get_diskstream()->alignment_style() == ExistingMaterial) - align_existing_item->set_active(); - - alignment_items.push_back (RadioMenuElem (align_group, _("Align with capture time"), - sigc::bind (sigc::mem_fun(*this, &RouteTimeAxisView::set_align_style), CaptureTime))); - align_capture_item = dynamic_cast(&alignment_items.back()); - if (get_diskstream()->alignment_style() == CaptureTime) - align_capture_item->set_active(); - if (!Profile->get_sae()) { + + Menu* alignment_menu = manage (new Menu); + MenuList& alignment_items = alignment_menu->items(); + alignment_menu->set_name ("ArdourContextMenu"); + + RadioMenuItem::Group align_group; + + alignment_items.push_back (RadioMenuElem (align_group, _("Align With Existing Material"), + sigc::bind (sigc::mem_fun(*this, &RouteTimeAxisView::set_align_style), ExistingMaterial))); + align_existing_item = dynamic_cast(&alignment_items.back()); + if (track()->alignment_style() == ExistingMaterial) { + align_existing_item->set_active(); + } + + alignment_items.push_back (RadioMenuElem (align_group, _("Align With Capture Time"), + sigc::bind (sigc::mem_fun(*this, &RouteTimeAxisView::set_align_style), CaptureTime))); + align_capture_item = dynamic_cast(&alignment_items.back()); + if (track()->alignment_style() == CaptureTime) { + align_capture_item->set_active(); + } + items.push_back (MenuElem (_("Alignment"), *alignment_menu)); - get_diskstream()->AlignmentStyleChanged.connect (route_connections, boost::bind (&RouteTimeAxisView::align_style_changed, this)); + track()->AlignmentStyleChanged.connect (route_connections, invalidator (*this), boost::bind (&RouteTimeAxisView::align_style_changed, this), gui_context()); + + Menu* mode_menu = manage (new Menu); + MenuList& mode_items = mode_menu->items (); + mode_menu->set_name ("ArdourContextMenu"); RadioMenuItem::Group mode_group; - items.push_back (RadioMenuElem (mode_group, _("Normal mode"), sigc::bind ( + + mode_items.push_back (RadioMenuElem (mode_group, _("Normal Mode"), sigc::bind ( sigc::mem_fun (*this, &RouteTimeAxisView::set_track_mode), ARDOUR::Normal))); - normal_track_mode_item = dynamic_cast(&items.back()); + normal_track_mode_item = dynamic_cast(&mode_items.back()); - items.push_back (RadioMenuElem (mode_group, _("Tape mode"), sigc::bind ( + mode_items.push_back (RadioMenuElem (mode_group, _("Tape Mode"), sigc::bind ( sigc::mem_fun (*this, &RouteTimeAxisView::set_track_mode), ARDOUR::Destructive))); - destructive_track_mode_item = dynamic_cast(&items.back()); + destructive_track_mode_item = dynamic_cast(&mode_items.back()); - items.push_back (RadioMenuElem (mode_group, _("No layering mode"), + mode_items.push_back (RadioMenuElem (mode_group, _("Non-Layered Mode"), sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::set_track_mode), ARDOUR::NonLayered))); - non_layered_track_mode_item = dynamic_cast(&items.back()); - + non_layered_track_mode_item = dynamic_cast(&mode_items.back()); + _ignore_track_mode_change = true; + switch (track()->mode()) { case ARDOUR::Destructive: destructive_track_mode_item->set_active (); @@ -562,17 +526,27 @@ RouteTimeAxisView::build_display_menu () non_layered_track_mode_item->set_active (); break; } - } + + _ignore_track_mode_change = false; - get_diskstream()->AlignmentStyleChanged.connect (route_connections, boost::bind (&RouteTimeAxisView::align_style_changed, this)); - - mode_menu = build_mode_menu(); - if (mode_menu) items.push_back (MenuElem (_("Mode"), *mode_menu)); + } color_mode_menu = build_color_mode_menu(); - if (color_mode_menu) + if (color_mode_menu) { items.push_back (MenuElem (_("Color Mode"), *color_mode_menu)); + } + + items.push_back (SeparatorElem()); + + build_playlist_menu (); + items.push_back (MenuElem (_("Playlist"), *playlist_action_menu)); + + route_group_menu->rebuild (_route->route_group ()); + items.push_back (MenuElem (_("Route Group"), *route_group_menu)); + + build_automation_action_menu (); + items.push_back (MenuElem (_("Automation"), *automation_action_menu)); items.push_back (SeparatorElem()); } @@ -582,7 +556,7 @@ RouteTimeAxisView::build_display_menu () route_active_menu_item->set_active (_route->active()); items.push_back (SeparatorElem()); - items.push_back (MenuElem (_("Hide"), sigc::mem_fun(*this, &RouteTimeAxisView::hide_click))); + items.push_back (MenuElem (_("Hide"), sigc::bind (sigc::mem_fun(_editor, &PublicEditor::hide_track_in_display), this, false))); if (!Profile->get_sae()) { items.push_back (MenuElem (_("Remove"), sigc::mem_fun(*this, &RouteUI::remove_this_route))); } else { @@ -601,6 +575,10 @@ static bool __reset_item (RadioMenuItem* item, RadioMenuItem* item_2) void RouteTimeAxisView::set_track_mode (TrackMode mode) { + if (_ignore_track_mode_change) { + return; + } + RadioMenuItem* item; RadioMenuItem* other_item; RadioMenuItem* other_item_2; @@ -627,7 +605,7 @@ RouteTimeAxisView::set_track_mode (TrackMode mode) return; } - if (item && other_item && other_item_2 && item->get_active() && track()->mode() != mode) { + if (item && other_item && other_item_2 && track()->mode() != mode) { _set_track_mode (track().get(), mode, other_item, other_item_2); } } @@ -645,6 +623,7 @@ RouteTimeAxisView::_set_track_mode (Track* track, TrackMode mode, RadioMenuItem* return; } else { cerr << "would bounce this one\n"; + /* XXX: radio menu item becomes inconsistent with track state in this case */ return; } } @@ -795,14 +774,14 @@ RouteTimeAxisView::set_height (uint32_t h) snprintf (buf, sizeof (buf), "%u", height); xml_node->add_property ("height", buf); - if (height >= hNormal) { + if (height >= preset_height (HeightNormal)) { reset_meter(); show_name_entry (); hide_name_label (); gm.get_gain_slider().show(); mute_button->show(); - if (!_route || _route->is_control()) { + if (!_route || _route->is_monitor()) { solo_button->hide(); } else { solo_button->show(); @@ -811,16 +790,13 @@ RouteTimeAxisView::set_height (uint32_t h) rec_enable_button->show(); route_group_button.show(); - hide_button.show(); - visual_button.show(); - size_button.show(); automation_button.show(); if (is_track() && track()->mode() == ARDOUR::Normal) { playlist_button.show(); } - } else if (height >= hSmaller) { + } else if (height >= preset_height (HeightSmaller)) { reset_meter(); show_name_entry (); @@ -828,7 +804,7 @@ RouteTimeAxisView::set_height (uint32_t h) gm.get_gain_slider().hide(); mute_button->show(); - if (!_route || _route->is_control()) { + if (!_route || _route->is_monitor()) { solo_button->hide(); } else { solo_button->show(); @@ -837,9 +813,6 @@ RouteTimeAxisView::set_height (uint32_t h) rec_enable_button->show(); route_group_button.hide (); - hide_button.hide (); - visual_button.hide (); - size_button.hide (); automation_button.hide (); if (is_track() && track()->mode() == ARDOUR::Normal) { @@ -870,15 +843,12 @@ RouteTimeAxisView::set_height (uint32_t h) rec_enable_button->hide(); route_group_button.hide (); - hide_button.hide (); - visual_button.hide (); - size_button.hide (); automation_button.hide (); playlist_button.hide (); name_label.set_text (_route->name()); } - if (height_changed) { + if (height_changed && !no_redraw) { /* only emit the signal if the height really changed */ _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */ } @@ -906,8 +876,8 @@ RouteTimeAxisView::set_samples_per_unit (double spu) { double speed = 1.0; - if (get_diskstream() != 0) { - speed = get_diskstream()->speed(); + if (track()) { + speed = track()->speed(); } if (_view) { @@ -920,7 +890,7 @@ RouteTimeAxisView::set_samples_per_unit (double spu) void RouteTimeAxisView::align_style_changed () { - switch (get_diskstream()->alignment_style()) { + switch (track()->alignment_style()) { case ExistingMaterial: if (!align_existing_item->get_active()) { align_existing_item->set_active(); @@ -953,7 +923,7 @@ RouteTimeAxisView::set_align_style (AlignStyle style) } if (item->get_active()) { - get_diskstream()->set_align_style (style); + track()->set_align_style (style); } } @@ -963,15 +933,18 @@ RouteTimeAxisView::rename_current_playlist () ArdourPrompter prompter (true); string name; - boost::shared_ptr ds = get_diskstream(); - if (!ds || ds->destructive()) + boost::shared_ptr tr = track(); + if (!tr || tr->destructive()) { return; + } - boost::shared_ptr pl = ds->playlist(); - if (!pl) + boost::shared_ptr pl = tr->playlist(); + if (!pl) { return; + } - prompter.set_prompt (_("Name for playlist")); + prompter.set_title (_("Rename Playlist")); + prompter.set_prompt (_("New name for playlist:")); prompter.set_initial_text (pl->name()); prompter.add_button (_("Rename"), Gtk::RESPONSE_ACCEPT); prompter.set_response_sensitive (Gtk::RESPONSE_ACCEPT, false); @@ -1029,13 +1002,15 @@ RouteTimeAxisView::use_copy_playlist (bool prompt, vector ds = get_diskstream(); - if (!ds || ds->destructive()) + boost::shared_ptr tr = track (); + if (!tr || tr->destructive()) { return; + } - boost::shared_ptr pl = ds->playlist(); - if (!pl) + boost::shared_ptr pl = tr->playlist(); + if (!pl) { return; + } name = pl->name(); @@ -1054,7 +1029,8 @@ RouteTimeAxisView::use_copy_playlist (bool prompt, vectoruse_copy_playlist (); - ds->playlist()->set_name (name); + tr->use_copy_playlist (); + tr->playlist()->set_name (name); } } @@ -1081,13 +1057,15 @@ RouteTimeAxisView::use_new_playlist (bool prompt, vector ds = get_diskstream(); - if (!ds || ds->destructive()) + boost::shared_ptr tr = track (); + if (!tr || tr->destructive()) { return; + } - boost::shared_ptr pl = ds->playlist(); - if (!pl) + boost::shared_ptr pl = tr->playlist(); + if (!pl) { return; + } name = pl->name(); @@ -1104,7 +1082,8 @@ RouteTimeAxisView::use_new_playlist (bool prompt, vectoruse_new_playlist (); - ds->playlist()->set_name (name); + tr->use_new_playlist (); + tr->playlist()->set_name (name); } } void RouteTimeAxisView::clear_playlist () { - boost::shared_ptr ds = get_diskstream(); - if (!ds || ds->destructive()) + boost::shared_ptr tr = track (); + if (!tr || tr->destructive()) { return; + } - boost::shared_ptr pl = ds->playlist(); - if (!pl) + boost::shared_ptr pl = tr->playlist(); + if (!pl) { return; + } _editor.clear_playlist (pl); } @@ -1142,20 +1123,15 @@ RouteTimeAxisView::clear_playlist () void RouteTimeAxisView::speed_changed () { - Gtkmm2ext::UI::instance()->call_slot (boost::bind (&RouteTimeAxisView::reset_samples_per_unit, this)); -} - -void -RouteTimeAxisView::diskstream_changed () -{ - Gtkmm2ext::UI::instance()->call_slot (boost::bind (&RouteTimeAxisView::update_diskstream_display, this)); + Gtkmm2ext::UI::instance()->call_slot (invalidator (*this), boost::bind (&RouteTimeAxisView::reset_samples_per_unit, this)); } void RouteTimeAxisView::update_diskstream_display () { - if (!get_diskstream()) // bus + if (!track()) { return; + } map_frozen (); } @@ -1214,12 +1190,12 @@ RouteTimeAxisView::set_selected_regionviews (RegionSelection& regions) * @param results List to add things to. */ void -RouteTimeAxisView::get_selectables (nframes_t start, nframes_t end, double top, double bot, list& results) +RouteTimeAxisView::get_selectables (framepos_t start, framepos_t end, double top, double bot, list& results) { double speed = 1.0; - if (get_diskstream() != 0) { - speed = get_diskstream()->speed(); + if (track() != 0) { + speed = track()->speed(); } nframes_t start_adjusted = session_frame_to_track_frame(start, speed); @@ -1254,34 +1230,6 @@ RouteTimeAxisView::get_inverted_selectables (Selection& sel, list& return; } -bool -RouteTimeAxisView::show_automation(Evoral::Parameter param) -{ - return (_show_automation.find(param) != _show_automation.end()); -} - -/** Retuns 0 if track for \a param doesn't exist. - */ -RouteTimeAxisView::RouteAutomationNode* -RouteTimeAxisView::automation_track (Evoral::Parameter param) -{ - map::iterator i = _automation_tracks.find (param); - - if (i != _automation_tracks.end()) { - return i->second; - } else { - return 0; - } -} - -/** Shorthand for GainAutomation, etc. - */ -RouteTimeAxisView::RouteAutomationNode* -RouteTimeAxisView::automation_track (AutomationType type) -{ - return automation_track (Evoral::Parameter(type)); -} - RouteGroup* RouteTimeAxisView::route_group () const { @@ -1297,10 +1245,10 @@ RouteTimeAxisView::name() const boost::shared_ptr RouteTimeAxisView::playlist () const { - boost::shared_ptr ds; + boost::shared_ptr tr; - if ((ds = get_diskstream()) != 0) { - return ds->playlist(); + if ((tr = track()) != 0) { + return tr->playlist(); } else { return boost::shared_ptr (); } @@ -1328,38 +1276,21 @@ RouteTimeAxisView::name_entry_changed () ARDOUR_UI::instance()->popup_error (_("A track already exists with that name")); name_entry.set_text (_route->name()); } else if (_session->route_name_internal (x)) { - ARDOUR_UI::instance()->popup_error (_("You cannot create a track with that name as it is reserved for Ardour")); + ARDOUR_UI::instance()->popup_error (string_compose (_("You cannot create a track with that name as it is reserved for %1"), + PROGRAM_NAME)); name_entry.set_text (_route->name()); } else { _route->set_name (x); } } -void -RouteTimeAxisView::visual_click () -{ - popup_display_menu (0); -} - -void -RouteTimeAxisView::hide_click () -{ - // LAME fix for hide_button refresh fix - hide_button.set_sensitive(false); - - _editor.hide_track_in_display (*this); - - hide_button.set_sensitive(true); -} - boost::shared_ptr RouteTimeAxisView::find_next_region (nframes_t pos, RegionPoint point, int32_t dir) { - boost::shared_ptr stream; - boost::shared_ptr playlist; + boost::shared_ptr pl = playlist (); - if ((stream = get_diskstream()) != 0 && (playlist = stream->playlist()) != 0) { - return playlist->find_next_region (pos, point, dir); + if (pl) { + return pl->find_next_region (pos, point, dir); } return boost::shared_ptr (); @@ -1368,33 +1299,31 @@ RouteTimeAxisView::find_next_region (nframes_t pos, RegionPoint point, int32_t d nframes64_t RouteTimeAxisView::find_next_region_boundary (nframes64_t pos, int32_t dir) { - boost::shared_ptr stream; - boost::shared_ptr playlist; + boost::shared_ptr pl = playlist (); - if ((stream = get_diskstream()) != 0 && (playlist = stream->playlist()) != 0) { - return playlist->find_next_region_boundary (pos, dir); + if (pl) { + return pl->find_next_region_boundary (pos, dir); } return -1; } -bool +void RouteTimeAxisView::cut_copy_clear (Selection& selection, CutCopyOp op) { boost::shared_ptr what_we_got; - boost::shared_ptr ds = get_diskstream(); + boost::shared_ptr tr = track (); boost::shared_ptr playlist; - bool ret = false; - if (ds == 0) { + if (tr == 0) { /* route is a bus, not a track */ - return false; + return; } - playlist = ds->playlist(); + playlist = tr->playlist(); TimeSelection time (selection.time); - float speed = ds->speed(); + 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); @@ -1402,13 +1331,22 @@ RouteTimeAxisView::cut_copy_clear (Selection& selection, CutCopyOp op) } } - XMLNode &before = playlist->get_state(); + playlist->clear_history (); + playlist->clear_owned_history (); + switch (op) { case Cut: if ((what_we_got = playlist->cut (time)) != 0) { _editor.get_cut_buffer().add (what_we_got); - _session->add_command( new MementoCommand(*playlist.get(), &before, &playlist->get_state())); - ret = true; + + vector cmds; + + playlist->rdiff (cmds); + + for (vector::iterator c = cmds.begin(); c != cmds.end(); ++c) { + _session->add_command (*c); + } + _session->add_command (new StatefulDiffCommand (playlist)); } break; case Copy: @@ -1419,24 +1357,28 @@ RouteTimeAxisView::cut_copy_clear (Selection& selection, CutCopyOp op) case Clear: if ((what_we_got = playlist->cut (time)) != 0) { - _session->add_command( new MementoCommand(*playlist, &before, &playlist->get_state())); + vector cmds; + + playlist->rdiff (cmds); + + for (vector::iterator c = cmds.begin(); c != cmds.end(); ++c) { + _session->add_command (*c); + } + _session->add_command (new StatefulDiffCommand (playlist)); what_we_got->release (); - ret = true; } break; } - - return ret; } bool -RouteTimeAxisView::paste (nframes_t pos, float times, Selection& selection, size_t nth) +RouteTimeAxisView::paste (framepos_t pos, float times, Selection& selection, size_t nth) { if (!is_track()) { return false; } - boost::shared_ptr playlist = get_diskstream()->playlist(); + boost::shared_ptr pl = playlist (); PlaylistSelection::iterator p; for (p = selection.playlists.begin(); p != selection.playlists.end() && nth; ++p, --nth) {} @@ -1445,80 +1387,79 @@ RouteTimeAxisView::paste (nframes_t pos, float times, Selection& selection, size return false; } - if (get_diskstream()->speed() != 1.0f) { - pos = session_frame_to_track_frame(pos, get_diskstream()->speed() ); + if (track()->speed() != 1.0f) { + pos = session_frame_to_track_frame (pos, track()->speed()); } - XMLNode &before = playlist->get_state(); - playlist->paste (*p, pos, times); - _session->add_command( new MementoCommand(*playlist, &before, &playlist->get_state())); + pl->clear_history (); + pl->paste (*p, pos, times); + _session->add_command (new StatefulDiffCommand (pl)); return true; } -TimeAxisView::Children -RouteTimeAxisView::get_child_list() -{ - TimeAxisView::Children redirect_children; - - for (Children::iterator i = children.begin(); i != children.end(); ++i) { - if (!(*i)->hidden()) { - redirect_children.push_back(*i); - } - } - return redirect_children; -} - +struct PlaylistSorter { + bool operator() (boost::shared_ptr a, boost::shared_ptr b) const { + return a->sort_id() < b->sort_id(); + } +}; void -RouteTimeAxisView::build_playlist_menu (Gtk::Menu * menu) +RouteTimeAxisView::build_playlist_menu () { using namespace Menu_Helpers; - if (!menu || !is_track()) { + if (!is_track()) { return; } - MenuList& playlist_items = menu->items(); - menu->set_name ("ArdourContextMenu"); + delete playlist_action_menu; + playlist_action_menu = new Menu; + playlist_action_menu->set_name ("ArdourContextMenu"); + + MenuList& playlist_items = playlist_action_menu->items(); + playlist_action_menu->set_name ("ArdourContextMenu"); playlist_items.clear(); delete playlist_menu; - playlist_menu = new Menu; - playlist_menu->set_name ("ArdourContextMenu"); - - vector > playlists; - boost::shared_ptr ds = get_diskstream(); + vector > playlists, playlists_tr; + boost::shared_ptr tr = track(); RadioMenuItem::Group playlist_group; _session->playlists->get (playlists); - for (vector >::iterator i = playlists.begin(); i != playlists.end(); ++i) { - - if ((*i)->get_orig_diskstream_id() == ds->id()) { - playlist_items.push_back (RadioMenuElem (playlist_group, (*i)->name(), sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::use_playlist), - boost::weak_ptr (*i)))); - - if (ds->playlist()->id() == (*i)->id()) { - static_cast(&playlist_items.back())->set_active(); - } - } else if (ds->playlist()->id() == (*i)->id()) { - playlist_items.push_back (RadioMenuElem (playlist_group, (*i)->name(), sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::use_playlist), - boost::weak_ptr(*i)))); - static_cast(&playlist_items.back())->set_active(); - + /* find the playlists for this diskstream */ + for (vector >::iterator i = playlists.begin(); i != playlists.end(); ++i) { + if (((*i)->get_orig_diskstream_id() == tr->diskstream_id()) || (tr->playlist()->id() == (*i)->id())) { + playlists_tr.push_back(*i); + } + } + + /* sort the playlists */ + PlaylistSorter cmp; + sort (playlists_tr.begin(), playlists_tr.end(), cmp); + + /* add the playlists to the menu */ + for (vector >::iterator i = playlists_tr.begin(); i != playlists_tr.end(); ++i) { + playlist_items.push_back (RadioMenuElem (playlist_group, (*i)->name())); + RadioMenuItem *item = static_cast(&playlist_items.back()); + item->signal_toggled().connect(sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::use_playlist), item, boost::weak_ptr (*i))); + + if (tr->playlist()->id() == (*i)->id()) { + item->set_active(); + } } - + playlist_items.push_back (SeparatorElem()); - playlist_items.push_back (MenuElem (_("Rename"), sigc::mem_fun(*this, &RouteTimeAxisView::rename_current_playlist))); + playlist_items.push_back (MenuElem (_("Rename..."), sigc::mem_fun(*this, &RouteTimeAxisView::rename_current_playlist))); playlist_items.push_back (SeparatorElem()); if (!route_group() || !route_group()->is_active()) { - playlist_items.push_back (MenuElem (_("New"), sigc::bind(sigc::mem_fun(_editor, &PublicEditor::new_playlists), this))); - playlist_items.push_back (MenuElem (_("New Copy"), sigc::bind(sigc::mem_fun(_editor, &PublicEditor::copy_playlists), this))); + playlist_items.push_back (MenuElem (_("New..."), sigc::bind(sigc::mem_fun(_editor, &PublicEditor::new_playlists), this))); + playlist_items.push_back (MenuElem (_("New Copy..."), sigc::bind(sigc::mem_fun(_editor, &PublicEditor::copy_playlists), this))); } else { // Use a label which tells the user what is happening @@ -1531,14 +1472,19 @@ RouteTimeAxisView::build_playlist_menu (Gtk::Menu * menu) playlist_items.push_back (MenuElem (_("Clear Current"), sigc::bind(sigc::mem_fun(_editor, &PublicEditor::clear_playlists), this))); playlist_items.push_back (SeparatorElem()); - playlist_items.push_back (MenuElem(_("Select from all ..."), sigc::mem_fun(*this, &RouteTimeAxisView::show_playlist_selector))); + playlist_items.push_back (MenuElem(_("Select from all..."), sigc::mem_fun(*this, &RouteTimeAxisView::show_playlist_selector))); } void -RouteTimeAxisView::use_playlist (boost::weak_ptr wpl) +RouteTimeAxisView::use_playlist (RadioMenuItem *item, boost::weak_ptr wpl) { assert (is_track()); + // exit if we were triggered by deactivating the old playlist + if (!item->get_active()) { + return; + } + boost::shared_ptr pl (wpl.lock()); if (!pl) { @@ -1548,16 +1494,14 @@ RouteTimeAxisView::use_playlist (boost::weak_ptr wpl) boost::shared_ptr apl = boost::dynamic_pointer_cast (pl); if (apl) { - if (get_diskstream()->playlist() == apl) { - // radio button cotnrols mean this function is called for both the - // old and new playlist + if (track()->playlist() == apl) { + // exit when use_playlist is called by the creation of the playlist menu + // or the playlist choice is unchanged return; } - get_diskstream()->use_playlist (apl); - + track()->use_playlist (apl); if (route_group() && route_group()->is_active()) { - //PBD::stacktrace(cerr, 20); std::string group_string = "."+route_group()->name()+"."; std::string take_name = apl->name(); @@ -1586,10 +1530,10 @@ RouteTimeAxisView::use_playlist (boost::weak_ptr wpl) boost::shared_ptr ipl = session()->playlists->by_name(playlist_name); if (!ipl) { // No playlist for this track for this take yet, make it - track->diskstream()->use_new_playlist(); - track->diskstream()->playlist()->set_name(playlist_name); + track->use_new_playlist(); + track->playlist()->set_name(playlist_name); } else { - track->diskstream()->use_playlist(ipl); + track->use_playlist(ipl); } } } @@ -1638,31 +1582,30 @@ RouteTimeAxisView::color_handler () reset_meter(); } +/** Toggle an automation track for a fully-specified Parameter (type,channel,id) + * Will add track if necessary. + */ void -RouteTimeAxisView::toggle_automation_track (Evoral::Parameter param) +RouteTimeAxisView::toggle_automation_track (const Evoral::Parameter& param) { - RouteAutomationNode* node = automation_track(param); - - if (!node) - return; - - bool showit = node->menu_item->get_active(); - - if (showit != node->track->marked_for_display()) { - if (showit) { - node->track->set_marked_for_display (true); - node->track->canvas_display()->show(); - node->track->get_state_node()->add_property ("shown", X_("yes")); - } else { - node->track->set_marked_for_display (false); - node->track->hide (); - node->track->get_state_node()->add_property ("shown", X_("no")); - } - - /* now trigger a redisplay */ - - if (!no_redraw) { - _route->gui_changed (X_("track_height"), (void *) 0); /* EMIT_SIGNAL */ + boost::shared_ptr track = automation_child (param); + Gtk::CheckMenuItem* menu = automation_child_menu_item (param); + + if (!track) { + /* it doesn't exist yet, so we don't care about the button state: just add it */ + create_automation_child (param, true); + } else { + assert (menu); + bool yn = menu->get_active(); + if (track->set_visibility (menu->get_active()) && yn) { + + /* we made it visible, now trigger a redisplay. if it was hidden, then automation_track_hidden() + will have done that for us. + */ + + if (!no_redraw) { + _route->gui_changed (X_("track_height"), (void *) 0); /* EMIT_SIGNAL */ + } } } } @@ -1670,20 +1613,26 @@ RouteTimeAxisView::toggle_automation_track (Evoral::Parameter param) void RouteTimeAxisView::automation_track_hidden (Evoral::Parameter param) { - RouteAutomationNode* ran = automation_track(param); - if (!ran) { + boost::shared_ptr track = automation_child (param); + + if (!track) { return; } + Gtk::CheckMenuItem* menu = automation_child_menu_item (param); + // if Evoral::Parameter::operator< doesn't obey strict weak ordering, we may crash here.... - _show_automation.erase(param); - ran->track->get_state_node()->add_property (X_("shown"), X_("no")); + track->get_state_node()->add_property (X_("shown"), X_("no")); - if (ran->menu_item && !_hidden) { - ran->menu_item->set_active (false); + if (menu && !_hidden) { + ignore_toggle = true; + menu->set_active (false); + ignore_toggle = false; } - _route->gui_changed ("visible_tracks", (void *) 0); /* EMIT_SIGNAL */ + if (_route && !no_redraw) { + _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */ + } } @@ -1694,12 +1643,16 @@ RouteTimeAxisView::show_all_automation () /* Show our automation */ - map::iterator i; - for (i = _automation_tracks.begin(); i != _automation_tracks.end(); ++i) { - i->second->track->set_marked_for_display (true); - i->second->track->canvas_display()->show(); - i->second->track->get_state_node()->add_property ("shown", X_("yes")); - i->second->menu_item->set_active(true); + for (AutomationTracks::iterator i = _automation_tracks.begin(); i != _automation_tracks.end(); ++i) { + i->second->set_marked_for_display (true); + i->second->canvas_display()->show(); + i->second->get_state_node()->add_property ("shown", X_("yes")); + + Gtk::CheckMenuItem* menu = automation_child_menu_item (i->first); + + if (menu) { + menu->set_active(true); + } } @@ -1719,7 +1672,7 @@ RouteTimeAxisView::show_all_automation () /* Redraw */ - _route->gui_changed ("visible_tracks", (void *) 0); /* EMIT_SIGNAL */ + _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */ } void @@ -1729,13 +1682,16 @@ RouteTimeAxisView::show_existing_automation () /* Show our automation */ - map::iterator i; - for (i = _automation_tracks.begin(); i != _automation_tracks.end(); ++i) { - if (i->second->track->line() && i->second->track->line()->npoints() > 0) { - i->second->track->set_marked_for_display (true); - i->second->track->canvas_display()->show(); - i->second->track->get_state_node()->add_property ("shown", X_("yes")); - i->second->menu_item->set_active(true); + for (AutomationTracks::iterator i = _automation_tracks.begin(); i != _automation_tracks.end(); ++i) { + if (i->second->has_automation()) { + i->second->set_marked_for_display (true); + i->second->canvas_display()->show(); + i->second->get_state_node()->add_property ("shown", X_("yes")); + + Gtk::CheckMenuItem* menu = automation_child_menu_item (i->first); + if (menu) { + menu->set_active(true); + } } } @@ -1744,7 +1700,7 @@ RouteTimeAxisView::show_existing_automation () for (list::iterator i = processor_automation.begin(); i != processor_automation.end(); ++i) { for (vector::iterator ii = (*i)->lines.begin(); ii != (*i)->lines.end(); ++ii) { - if ((*ii)->view != 0 && (*i)->processor->data().control((*ii)->what)->list()->size() > 0) { + if ((*ii)->view != 0 && (*i)->processor->control((*ii)->what)->list()->size() > 0) { (*ii)->menu_item->set_active (true); } } @@ -1752,7 +1708,7 @@ RouteTimeAxisView::show_existing_automation () no_redraw = false; - _route->gui_changed ("visible_tracks", (void *) 0); /* EMIT_SIGNAL */ + _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */ } void @@ -1762,11 +1718,16 @@ RouteTimeAxisView::hide_all_automation () /* Hide our automation */ - for (map::iterator i = _automation_tracks.begin(); i != _automation_tracks.end(); ++i) { - i->second->track->set_marked_for_display (false); - i->second->track->hide (); - i->second->track->get_state_node()->add_property ("shown", X_("no")); - i->second->menu_item->set_active (false); + for (AutomationTracks::iterator i = _automation_tracks.begin(); i != _automation_tracks.end(); ++i) { + i->second->set_marked_for_display (false); + i->second->hide (); + i->second->get_state_node()->add_property ("shown", X_("no")); + + Gtk::CheckMenuItem* menu = automation_child_menu_item (i->first); + + if (menu) { + menu->set_active (false); + } } /* Hide processor automation */ @@ -1777,10 +1738,8 @@ RouteTimeAxisView::hide_all_automation () } } - _show_automation.clear(); - no_redraw = false; - _route->gui_changed ("visible_tracks", (void *) 0); /* EMIT_SIGNAL */ + _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */ } @@ -1788,7 +1747,7 @@ void RouteTimeAxisView::region_view_added (RegionView* rv) { /* XXX need to find out if automation children have automationstreamviews. If yes, no ghosts */ - if(is_audio_track()) { + if (is_audio_track()) { for (Children::iterator i = children.begin(); i != children.end(); ++i) { boost::shared_ptr atv; @@ -1868,9 +1827,10 @@ RouteTimeAxisView::add_processor_automation_curve (boost::shared_ptr ProcessorAutomationNode* pan; if ((pan = find_processor_automation_node (processor, what)) == 0) { - error << _("programming error: ") - << string_compose (X_("processor automation curve for %1:%2 not registered with track!"), - processor->name(), what) + /* session state may never have been saved with new plugin */ + error << _("programming error: ") + << string_compose (X_("processor automation curve for %1:%2/%3/%4 not registered with track!"), + processor->name(), what.type(), (int) what.channel(), what.id() ) << endmsg; /*NOTREACHED*/ return; @@ -1887,10 +1847,10 @@ RouteTimeAxisView::add_processor_automation_curve (boost::shared_ptr /* FIXME: ew */ char state_name[256]; - snprintf (state_name, sizeof (state_name), "Redirect-%s-%" PRIu32, legalize_for_xml_node (processor->name()).c_str(), what.id()); + snprintf (state_name, sizeof (state_name), "%s-%" PRIu32, legalize_for_xml_node (processor->name()).c_str(), what.id()); boost::shared_ptr control - = boost::dynamic_pointer_cast(processor->data().control(what, true)); + = boost::dynamic_pointer_cast(processor->control(what, true)); pan->view = boost::shared_ptr( new AutomationTimeAxisView (_session, _route, processor, control, @@ -1922,7 +1882,9 @@ RouteTimeAxisView::processor_automation_track_hidden (RouteTimeAxisView::Process i->mark_automation_visible (pan->what, false); - _route->gui_changed ("visible_tracks", (void *) 0); /* EMIT_SIGNAL */ + if (!no_redraw) { + _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */ + } } void @@ -1949,7 +1911,7 @@ RouteTimeAxisView::add_existing_processor_automation_curves (boost::weak_ptr track, bool show) +RouteTimeAxisView::add_automation_child (Evoral::Parameter param, boost::shared_ptr track, bool show) { using namespace Menu_Helpers; @@ -1970,23 +1932,25 @@ RouteTimeAxisView::add_automation_child(Evoral::Parameter param, boost::shared_p } } - _automation_tracks.insert(std::make_pair(param, new RouteAutomationNode(param, NULL, track))); - - if (hideit) { - track->hide (); - } else { - _show_automation.insert (param); + _automation_tracks[param] = track; + track->set_visibility (!hideit); - if (!no_redraw) { - _route->gui_changed ("visible_tracks", (void *) 0); /* EMIT_SIGNAL */ - } + if (!no_redraw) { + _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */ } - build_display_menu(); + if (!EventTypeMap::instance().is_midi_parameter(param)) { + /* MIDI-related parameters are always in the menu, there's no + reason to rebuild the menu just because we added a automation + lane for one of them. But if we add a non-MIDI automation + lane, then we need to invalidate the display menu. + */ + delete display_menu; + display_menu = 0; + } } - void RouteTimeAxisView::add_processor_to_subplugin_menu (boost::weak_ptr p) { @@ -2046,6 +2010,8 @@ RouteTimeAxisView::add_processor_to_subplugin_menu (boost::weak_ptr p items.push_back (CheckMenuElem (name)); mitem = dynamic_cast (&items.back()); + _subplugin_menu_map[*i] = mitem; + if (has_visible_automation.find((*i)) != has_visible_automation.end()) { mitem->set_active(true); } @@ -2106,10 +2072,7 @@ RouteTimeAxisView::processor_menu_item_toggled (RouteTimeAxisView::ProcessorAuto } if (redraw && !no_redraw) { - - /* now trigger a redisplay */ - - _route->gui_changed ("visible_tracks", (void *) 0); /* EMIT_SIGNAL */ + _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */ } } @@ -2128,6 +2091,7 @@ RouteTimeAxisView::processors_changed (RouteProcessorChange c) (*i)->valid = false; } + _subplugin_menu_map.clear (); subplugin_menu.items().clear (); _route->foreach_processor (sigc::mem_fun (*this, &RouteTimeAxisView::add_processor_to_subplugin_menu)); @@ -2153,8 +2117,8 @@ RouteTimeAxisView::processors_changed (RouteProcessorChange c) i = tmp; } - if (deleted_processor_automation) { - _route->gui_changed ("visible_tracks", this); + if (deleted_processor_automation && !no_redraw) { + _route->gui_changed ("track_height", this); } } @@ -2215,10 +2179,11 @@ boost::shared_ptr RouteTimeAxisView::automation_child(Evoral::Parameter param) { AutomationTracks::iterator i = _automation_tracks.find(param); - if (i != _automation_tracks.end()) - return i->second->track; - else + if (i != _automation_tracks.end()) { + return i->second; + } else { return boost::shared_ptr(); + } } void @@ -2257,9 +2222,9 @@ RouteTimeAxisView::clear_meter () } void -RouteTimeAxisView::meter_changed (void *src) +RouteTimeAxisView::meter_changed () { - ENSURE_GUI_THREAD (*this, &RouteTimeAxisView::meter_changed, src) + ENSURE_GUI_THREAD (*this, &RouteTimeAxisView::meter_changed) reset_meter(); } @@ -2270,10 +2235,11 @@ RouteTimeAxisView::io_changed (IOChange /*change*/, void */*src*/) } void -RouteTimeAxisView::build_underlay_menu(Gtk::Menu* parent_menu) { +RouteTimeAxisView::build_underlay_menu(Gtk::Menu* parent_menu) +{ using namespace Menu_Helpers; - if(!_underlay_streams.empty()) { + if (!_underlay_streams.empty()) { MenuList& parent_items = parent_menu->items(); Menu* gs_menu = manage (new Menu); gs_menu->set_name ("ArdourContextMenu"); @@ -2291,7 +2257,7 @@ RouteTimeAxisView::build_underlay_menu(Gtk::Menu* parent_menu) { bool RouteTimeAxisView::set_underlay_state() { - if(!underlay_xml_node) { + if (!underlay_xml_node) { return false; } @@ -2302,7 +2268,7 @@ RouteTimeAxisView::set_underlay_state() for (niter = nlist.begin(); niter != nlist.end(); ++niter) { child_node = *niter; - if(child_node->name() != "Underlay") { + if (child_node->name() != "Underlay") { continue; } @@ -2310,7 +2276,7 @@ RouteTimeAxisView::set_underlay_state() if (prop) { PBD::ID id (prop->value()); - RouteTimeAxisView* v = _editor.get_route_view_by_id (id); + RouteTimeAxisView* v = _editor.get_route_view_by_route_id (id); if (v) { add_underlay(v->view(), false); @@ -2322,16 +2288,16 @@ RouteTimeAxisView::set_underlay_state() } void -RouteTimeAxisView::add_underlay(StreamView* v, bool update_xml) +RouteTimeAxisView::add_underlay (StreamView* v, bool update_xml) { - if(!v) { + if (!v) { return; } RouteTimeAxisView& other = v->trackview(); - if(find(_underlay_streams.begin(), _underlay_streams.end(), v) == _underlay_streams.end()) { - if(find(other._underlay_mirrors.begin(), other._underlay_mirrors.end(), this) != other._underlay_mirrors.end()) { + if (find(_underlay_streams.begin(), _underlay_streams.end(), v) == _underlay_streams.end()) { + if (find(other._underlay_mirrors.begin(), other._underlay_mirrors.end(), this) != other._underlay_mirrors.end()) { fatal << _("programming error: underlay reference pointer pairs are inconsistent!") << endmsg; /*NOTREACHED*/ } @@ -2341,8 +2307,8 @@ RouteTimeAxisView::add_underlay(StreamView* v, bool update_xml) v->foreach_regionview(sigc::mem_fun(*this, &RouteTimeAxisView::add_ghost)); - if(update_xml) { - if(!underlay_xml_node) { + if (update_xml) { + if (!underlay_xml_node) { ensure_xml_node(); underlay_xml_node = xml_node->add_child("Underlays"); } @@ -2355,19 +2321,19 @@ RouteTimeAxisView::add_underlay(StreamView* v, bool update_xml) } void -RouteTimeAxisView::remove_underlay(StreamView* v) +RouteTimeAxisView::remove_underlay (StreamView* v) { - if(!v) { + if (!v) { return; } UnderlayList::iterator it = find(_underlay_streams.begin(), _underlay_streams.end(), v); RouteTimeAxisView& other = v->trackview(); - if(it != _underlay_streams.end()) { + if (it != _underlay_streams.end()) { UnderlayMirrorList::iterator gm = find(other._underlay_mirrors.begin(), other._underlay_mirrors.end(), this); - if(gm == other._underlay_mirrors.end()) { + if (gm == other._underlay_mirrors.end()) { fatal << _("programming error: underlay reference pointer pairs are inconsistent!") << endmsg; /*NOTREACHED*/ } @@ -2377,7 +2343,7 @@ RouteTimeAxisView::remove_underlay(StreamView* v) _underlay_streams.erase(it); other._underlay_mirrors.erase(gm); - if(underlay_xml_node) { + if (underlay_xml_node) { underlay_xml_node->remove_nodes_and_delete("id", v->trackview().route()->id().to_s()); } } @@ -2388,18 +2354,37 @@ RouteTimeAxisView::set_button_names () { rec_enable_button_label.set_text (_("r")); - if (Config->get_solo_control_is_listen_control()) { - switch (Config->get_listen_position()) { - case AfterFaderListen: - solo_button_label.set_text (_("A")); - break; - case PreFaderListen: - solo_button_label.set_text (_("P")); - break; - } - } else { - solo_button_label.set_text (_("s")); + if (_route && _route->solo_safe()) { + solo_button_label.set_text (X_("!")); + } else { + if (Config->get_solo_control_is_listen_control()) { + switch (Config->get_listen_position()) { + case AfterFaderListen: + solo_button_label.set_text (_("A")); + break; + case PreFaderListen: + solo_button_label.set_text (_("P")); + break; + } + } else { + solo_button_label.set_text (_("s")); + } + } + mute_button_label.set_text (_("m")); +} + +Gtk::CheckMenuItem* +RouteTimeAxisView::automation_child_menu_item (Evoral::Parameter param) +{ + ParameterMenuMap::iterator i = _main_automation_menu_map.find (param); + if (i != _main_automation_menu_map.end()) { + return i->second; + } + + i = _subplugin_menu_map.find (param); + if (i != _subplugin_menu_map.end()) { + return i->second; } - mute_button_label.set_text (_("m")); + return 0; }