X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Froute_time_axis.cc;h=9ec6048de53ba2044643e826826c6e1fb66b0bd5;hb=265e26c2db45314ebaaa4801a9cc0101697fbe8f;hp=8985e85071130a1a6e15bb561d57c0ba7e4443a3;hpb=3be16e8afbd891c0bfe7227158384ed0d127597f;p=ardour.git diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc index 8985e85071..9ec6048de5 100644 --- a/gtk2_ardour/route_time_axis.cc +++ b/gtk2_ardour/route_time_axis.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2006 Paul Davis + Copyright (C) 2006 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -23,36 +23,42 @@ #include #include #include +#include #include #include -#include -#include -#include -#include +#include "pbd/error.h" +#include "pbd/stl_delete.h" +#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 -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "ardour/amp.h" +#include "ardour/audioplaylist.h" +#include "ardour/diskstream.h" +#include "ardour/event_type_map.h" +#include "ardour/ladspa_plugin.h" +#include "ardour/location.h" +#include "ardour/panner.h" +#include "ardour/playlist.h" +#include "ardour/playlist.h" +#include "ardour/processor.h" +#include "ardour/profile.h" +#include "ardour/route_group.h" +#include "ardour/session.h" +#include "ardour/session_playlist.h" +#include "ardour/debug.h" +#include "ardour/utils.h" +#include "evoral/Parameter.hpp" #include "ardour_ui.h" #include "route_time_axis.h" @@ -72,8 +78,9 @@ #include "simplerect.h" #include "streamview.h" #include "utils.h" +#include "route_group_menu.h" -#include +#include "ardour/track.h" #include "i18n.h" @@ -82,7 +89,6 @@ using namespace PBD; using namespace Gtkmm2ext; using namespace Gtk; using namespace Editing; -using namespace sigc; using namespace std; Glib::RefPtr RouteTimeAxisView::slider; @@ -95,20 +101,19 @@ RouteTimeAxisView::setup_slider_pix () } } -RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session& sess, boost::shared_ptr rt, Canvas& canvas) - : AxisView(sess), - RouteUI(rt, sess, _("m"), _("s"), _("r")), // mute, solo, and record - TimeAxisView(sess,ed,(TimeAxisView*) 0, canvas), - parent_canvas (canvas), - button_table (3, 3), - edit_group_button (_("g")), // group - playlist_button (_("p")), - size_button (_("h")), // height - automation_button (_("a")), - visual_button (_("v")), - gm (sess, slider, true) +RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session* sess, boost::shared_ptr rt, Canvas& canvas) + : AxisView(sess) + , RouteUI(rt, sess) + , TimeAxisView(sess,ed,(TimeAxisView*) 0, canvas) + , parent_canvas (canvas) + , button_table (3, 3) + , route_group_button (_("g")) + , playlist_button (_("p")) + , automation_button (_("a")) + , gm (sess, slider, true, 115) + , _ignore_track_mode_change (false) { - gm.set_io (rt); + 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); @@ -116,48 +121,46 @@ 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; if (!_route->is_hidden()) { _marked_for_display = true; } + mute_changed (0); + update_solo_display (); + timestretch_rect = 0; no_redraw = false; destructive_track_mode_item = 0; normal_track_mode_item = 0; + non_layered_track_mode_item = 0; ignore_toggle = false; - edit_group_button.set_name ("TrackGroupButton"); + 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"); - - hide_button.add (*(manage (new Image (::get_icon("hide"))))); - hide_button.show_all (); - edit_group_button.signal_button_release_event().connect (mem_fun(*this, &RouteTimeAxisView::edit_click), false); - playlist_button.signal_clicked().connect (mem_fun(*this, &RouteTimeAxisView::playlist_click)); - automation_button.signal_clicked().connect (mem_fun(*this, &RouteTimeAxisView::automation_click)); - size_button.signal_button_release_event().connect (mem_fun(*this, &RouteTimeAxisView::size_click), false); - visual_button.signal_clicked().connect (mem_fun(*this, &RouteTimeAxisView::visual_click)); - hide_button.signal_clicked().connect (mem_fun(*this, &RouteTimeAxisView::hide_click)); + route_group_button.unset_flags (Gtk::CAN_FOCUS); + playlist_button.unset_flags (Gtk::CAN_FOCUS); + automation_button.unset_flags (Gtk::CAN_FOCUS); - solo_button->signal_button_press_event().connect (mem_fun(*this, &RouteUI::solo_press), false); - solo_button->signal_button_release_event().connect (mem_fun(*this, &RouteUI::solo_release)); - mute_button->signal_button_press_event().connect (mem_fun(*this, &RouteUI::mute_press), false); - mute_button->signal_button_release_event().connect (mem_fun(*this, &RouteUI::mute_release)); + route_group_button.signal_button_release_event().connect (sigc::mem_fun(*this, &RouteTimeAxisView::edit_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)); if (is_track()) { /* use icon */ rec_enable_button->remove (); + switch (track()->mode()) { case ARDOUR::Normal: + case ARDOUR::NonLayered: rec_enable_button->add (*(manage (new Image (::get_icon (X_("record_normal_red")))))); break; case ARDOUR::Destructive: @@ -166,109 +169,92 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session& sess, boost::sh } rec_enable_button->show_all (); - rec_enable_button->signal_button_press_event().connect (mem_fun(*this, &RouteUI::rec_enable_press), false); - rec_enable_button->signal_button_release_event().connect (mem_fun(*this, &RouteUI::rec_enable_release)); 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")); + 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 (mem_fun(*this, &RouteTimeAxisView::meter_changed)); - _route->input_changed.connect (mem_fun(*this, &RouteTimeAxisView::io_changed)); - _route->output_changed.connect (mem_fun(*this, &RouteTimeAxisView::io_changed)); + _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); - - controls_table.attach (edit_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(edit_group_button,_("Edit 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")); - - label_view (); - if (0) { + if (!_route->is_master()) { + controls_table.attach (*solo_button, 7, 8, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0); + } - /* old school - when we used to put an extra row of buttons in place */ + 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); - 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); + 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")); - } else { + label_view (); - 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); } - y_position = -1; - - _route->mute_changed.connect (mem_fun(*this, &RouteUI::mute_changed)); - _route->solo_changed.connect (mem_fun(*this, &RouteUI::solo_changed)); - _route->processors_changed.connect (mem_fun(*this, &RouteTimeAxisView::processors_changed)); - _route->NameChanged.connect (mem_fun(*this, &RouteTimeAxisView::route_name_changed)); - _route->solo_safe_changed.connect (mem_fun(*this, &RouteUI::solo_changed)); + _y_position = -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 (mem_fun(*this, &RouteTimeAxisView::track_mode_changed)); - track()->FreezeChange.connect (mem_fun(*this, &RouteTimeAxisView::map_frozen)); - track()->DiskstreamChanged.connect (mem_fun(*this, &RouteTimeAxisView::diskstream_changed)); - get_diskstream()->SpeedChanged.connect (mem_fun(*this, &RouteTimeAxisView::speed_changed)); + 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 (); } - editor.ZoomChanged.connect (mem_fun(*this, &RouteTimeAxisView::reset_samples_per_unit)); - ColorsChanged.connect (mem_fun (*this, &RouteTimeAxisView::color_handler)); + _editor.ZoomChanged.connect (sigc::mem_fun(*this, &RouteTimeAxisView::reset_samples_per_unit)); + ColorsChanged.connect (sigc::mem_fun (*this, &RouteTimeAxisView::color_handler)); + + 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(mem_fun(*this, &RouteTimeAxisView::controls_ebox_scroll), false); + gm.get_gain_slider().signal_scroll_event().connect(sigc::mem_fun(*this, &RouteTimeAxisView::controls_ebox_scroll), false); gm.get_gain_slider().set_name ("TrackGainFader"); } RouteTimeAxisView::~RouteTimeAxisView () { - GoingAway (); /* EMIT_SIGNAL */ + CatchDeletion (this); for (list::iterator i = processor_automation.begin(); i != processor_automation.end(); ++i) { delete *i; } - if (playlist_menu) { - delete playlist_menu; - playlist_menu = 0; - } - - if (playlist_action_menu) { - delete playlist_action_menu; - playlist_action_menu = 0; - } + delete playlist_menu; + playlist_menu = 0; - if (_view) { - delete _view; - _view = 0; - } + delete playlist_action_menu; + playlist_action_menu = 0; + + 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; } void @@ -279,81 +265,43 @@ RouteTimeAxisView::post_construct () update_diskstream_display (); subplugin_menu.items().clear (); - _route->foreach_processor (this, &RouteTimeAxisView::add_processor_to_subplugin_menu); - _route->foreach_processor (this, &RouteTimeAxisView::add_existing_processor_automation_curves); + _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)); reset_processor_automation_curves (); } -void -RouteTimeAxisView::set_playlist (boost::shared_ptr newplaylist) -{ - boost::shared_ptr pl = playlist(); - assert(pl); - - modified_connection.disconnect (); - modified_connection = pl->Modified.connect (mem_fun(*this, &RouteTimeAxisView::playlist_modified)); -} - -void -RouteTimeAxisView::playlist_modified () -{ -} - gint RouteTimeAxisView::edit_click (GdkEventButton *ev) { if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) { - _route->set_edit_group (0, this); - return FALSE; - } - - using namespace Menu_Helpers; - - MenuList& items = edit_group_menu.items (); - RadioMenuItem::Group group; - - items.clear (); - items.push_back (RadioMenuElem (group, _("No group"), - bind (mem_fun(*this, &RouteTimeAxisView::set_edit_group_from_menu), (RouteGroup *) 0))); - - if (_route->edit_group() == 0) { - static_cast(&items.back())->set_active (); + if (_route->route_group()) { + _route->route_group()->remove (_route); + } + return false; } - - _session.foreach_edit_group (bind (mem_fun (*this, &RouteTimeAxisView::add_edit_group_menu_item), &group)); - edit_group_menu.popup (ev->button, ev->time); - - return FALSE; -} - -void -RouteTimeAxisView::add_edit_group_menu_item (RouteGroup *eg, RadioMenuItem::Group* group) -{ - using namespace Menu_Helpers; - MenuList &items = edit_group_menu.items(); + route_group_menu->rebuild (_route->route_group ()); + route_group_menu->popup (ev->button, ev->time); - items.push_back (RadioMenuElem (*group, eg->name(), bind (mem_fun(*this, &RouteTimeAxisView::set_edit_group_from_menu), eg))); - if (_route->edit_group() == eg) { - static_cast(&items.back())->set_active (); - } + return false; } void -RouteTimeAxisView::set_edit_group_from_menu (RouteGroup *eg) +RouteTimeAxisView::set_route_group_from_menu (RouteGroup *eg) { - _route->set_edit_group (eg, this); + if (eg) { + eg->add (_route); + } else { + if (_route->route_group()) { + _route->route_group()->remove (_route); + } + } } void RouteTimeAxisView::playlist_changed () - { label_view (); - - if (is_track()) { - set_playlist (get_diskstream()->playlist()); - } } void @@ -365,14 +313,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) { - editor.route_name_changed (this); - label_view (); + if (what_changed.contains (ARDOUR::Properties::name)) { + label_view (); + } } void @@ -388,14 +337,12 @@ void RouteTimeAxisView::playlist_click () { // always build a new action menu - - if (playlist_action_menu != 0) { - delete playlist_action_menu; - } + + delete playlist_action_menu; playlist_action_menu = new Menu; playlist_action_menu->set_name ("ArdourContextMenu"); - + build_playlist_menu (playlist_action_menu); conditionally_add_to_selection (); @@ -405,36 +352,37 @@ RouteTimeAxisView::playlist_click () void RouteTimeAxisView::automation_click () { - if (automation_action_menu == 0) { - /* this seems odd, but the automation action - menu is built as part of the display menu. - */ - build_display_menu (); - } conditionally_add_to_selection (); + build_automation_action_menu (); automation_action_menu->popup (1, gtk_get_current_event_time()); } int -RouteTimeAxisView::set_state (const XMLNode& node) +RouteTimeAxisView::set_state (const XMLNode& node, int version) { - TimeAxisView::set_state (node); + TimeAxisView::set_state (node, version); XMLNodeList kids = node.children(); XMLNodeConstIterator iter; const XMLProperty* prop; - + + if (_view && (prop = node.property ("layer-display"))) { + set_layer_display (LayerDisplay (string_2_enum (prop->value(), _view->layer_display ()))); + } + for (iter = kids.begin(); iter != kids.end(); ++iter) { if ((*iter)->name() == AutomationTimeAxisView::state_node_name) { if ((prop = (*iter)->property ("automation-id")) != 0) { + Evoral::Parameter param = ARDOUR::EventTypeMap::instance().new_parameter(prop->value()); - bool show = ((prop = (*iter)->property ("shown")) != 0) && prop->value() == "yes"; + bool show = ((prop = (*iter)->property ("shown")) != 0) && string_is_affirmative (prop->value()); create_automation_child(param, show); } else { warning << "Automation child has no ID" << endmsg; } } } + return 0; } @@ -443,40 +391,35 @@ 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"), - mem_fun(*this, &RouteTimeAxisView::show_all_automation))); + /* 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) + */ - automation_items.push_back (MenuElem (_("Show existing automation"), - mem_fun(*this, &RouteTimeAxisView::show_existing_automation))); + detach_menu (subplugin_menu); - automation_items.push_back (MenuElem (_("Hide all automation"), - mem_fun(*this, &RouteTimeAxisView::hide_all_automation))); + delete automation_action_menu; + automation_action_menu = new Menu; - if (subplugin_menu.get_attach_widget()) - subplugin_menu.detach(); + MenuList& items = automation_action_menu->items(); - automation_items.push_back (MenuElem (_("Plugins"), subplugin_menu)); + automation_action_menu->set_name ("ArdourContextMenu"); - map::iterator i; - for (i = _automation_tracks.begin(); i != _automation_tracks.end(); ++i) { - - automation_items.push_back (SeparatorElem()); - - if (i->second->menu_item) - delete i->second->menu_item; - - automation_items.push_back(CheckMenuElem (_route->describe_parameter(i->second->param), - bind (mem_fun(*this, &RouteTimeAxisView::toggle_automation_track), i->second->param))); + 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 @@ -484,10 +427,6 @@ RouteTimeAxisView::build_display_menu () { using namespace Menu_Helpers; - /* get the size menu ready */ - - build_size_menu (); - /* prepare it */ TimeAxisView::build_display_menu (); @@ -496,17 +435,16 @@ 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"), mem_fun(*this, &RouteTimeAxisView::select_track_color))); - items.push_back (SeparatorElem()); + items.push_back (MenuElem (_("Color"), sigc::mem_fun(*this, &RouteTimeAxisView::select_track_color))); - build_remote_control_menu (); - build_automation_action_menu (); + items.push_back (SeparatorElem()); if (!Profile->get_sae()) { - items.push_back (MenuElem (_("Remote Control ID"), *remote_control_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()); } @@ -514,7 +452,7 @@ RouteTimeAxisView::build_display_menu () // Hook for derived classes to add type specific stuff append_extra_display_menu_items (); items.push_back (SeparatorElem()); - + if (is_track()) { Menu *layers_menu = manage(new Menu); @@ -524,9 +462,9 @@ RouteTimeAxisView::build_display_menu () RadioMenuItem::Group layers_group; layers_items.push_back(RadioMenuElem (layers_group, _("Overlaid"), - bind (mem_fun (*this, &RouteTimeAxisView::set_layer_display), Overlaid))); + sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::set_layer_display), Overlaid))); layers_items.push_back(RadioMenuElem (layers_group, _("Stacked"), - bind (mem_fun (*this, &RouteTimeAxisView::set_layer_display), Stacked))); + sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::set_layer_display), Stacked))); items.push_back (MenuElem (_("Layers"), *layers_menu)); @@ -536,29 +474,42 @@ RouteTimeAxisView::build_display_menu () RadioMenuItem::Group align_group; - alignment_items.push_back (RadioMenuElem (align_group, _("Align with existing material"), - bind (mem_fun(*this, &RouteTimeAxisView::set_align_style), ExistingMaterial))); + 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) + if (track()->alignment_style() == ExistingMaterial) { align_existing_item->set_active(); + } - alignment_items.push_back (RadioMenuElem (align_group, _("Align with capture time"), - bind (mem_fun(*this, &RouteTimeAxisView::set_align_style), CaptureTime))); + 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) + if (track()->alignment_style() == CaptureTime) { align_capture_item->set_active(); + } if (!Profile->get_sae()) { + items.push_back (MenuElem (_("Alignment"), *alignment_menu)); - get_diskstream()->AlignmentStyleChanged.connect (mem_fun(*this, &RouteTimeAxisView::align_style_changed)); - + track()->AlignmentStyleChanged.connect (route_connections, invalidator (*this), boost::bind (&RouteTimeAxisView::align_style_changed, this), gui_context()); + RadioMenuItem::Group mode_group; - items.push_back (RadioMenuElem (mode_group, _("Normal mode"), - bind (mem_fun (*this, &RouteTimeAxisView::set_track_mode), ARDOUR::Normal))); + 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()); - items.push_back (RadioMenuElem (mode_group, _("Tape mode"), - bind (mem_fun (*this, &RouteTimeAxisView::set_track_mode), ARDOUR::Destructive))); + + 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()); + + 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()); + + + _ignore_track_mode_change = true; switch (track()->mode()) { case ARDOUR::Destructive: @@ -567,62 +518,85 @@ RouteTimeAxisView::build_display_menu () case ARDOUR::Normal: normal_track_mode_item->set_active (); break; + case ARDOUR::NonLayered: + non_layered_track_mode_item->set_active (); + break; } + + _ignore_track_mode_change = false; + } - get_diskstream()->AlignmentStyleChanged.connect ( - mem_fun(*this, &RouteTimeAxisView::align_style_changed)); + track()->AlignmentStyleChanged.connect (route_connections, invalidator (*this), boost::bind (&RouteTimeAxisView::align_style_changed, this), gui_context()); - mode_menu = build_mode_menu(); - if (mode_menu) - items.push_back (MenuElem (_("Mode"), *mode_menu)); - - items.push_back (SeparatorElem()); + color_mode_menu = build_color_mode_menu(); + if (color_mode_menu) { + items.push_back (MenuElem (_("Color Mode"), *color_mode_menu)); } + + items.push_back (SeparatorElem()); } - items.push_back (CheckMenuElem (_("Active"), mem_fun(*this, &RouteUI::toggle_route_active))); + items.push_back (CheckMenuElem (_("Active"), sigc::mem_fun(*this, &RouteUI::toggle_route_active))); route_active_menu_item = dynamic_cast (&items.back()); route_active_menu_item->set_active (_route->active()); items.push_back (SeparatorElem()); - items.push_back (MenuElem (_("Hide"), mem_fun(*this, &RouteTimeAxisView::hide_click))); - items.push_back (MenuElem (_("Remove"), mem_fun(*this, &RouteUI::remove_this_route))); + 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 { + items.push_front (SeparatorElem()); + items.push_front (MenuElem (_("Delete"), sigc::mem_fun(*this, &RouteUI::remove_this_route))); + } } -static bool __reset_item (RadioMenuItem* item) +static bool __reset_item (RadioMenuItem* item, RadioMenuItem* item_2) { item->set_active (); + item_2->set_active (); return false; } void RouteTimeAxisView::set_track_mode (TrackMode mode) { + if (_ignore_track_mode_change) { + return; + } + RadioMenuItem* item; RadioMenuItem* other_item; + RadioMenuItem* other_item_2; switch (mode) { case ARDOUR::Normal: item = normal_track_mode_item; - other_item = destructive_track_mode_item; + other_item = non_layered_track_mode_item; + other_item_2 = destructive_track_mode_item; + break; + case ARDOUR::NonLayered: + item = non_layered_track_mode_item; + other_item = normal_track_mode_item; + other_item_2 = destructive_track_mode_item; break; case ARDOUR::Destructive: item = destructive_track_mode_item; other_item = normal_track_mode_item; + other_item_2 = non_layered_track_mode_item; break; default: fatal << string_compose (_("programming error: %1 %2"), "illegal track mode in RouteTimeAxisView::set_track_mode", mode) << endmsg; /*NOTREACHED*/ return; } - - if (item && other_item && item->get_active () && track()->mode() != mode) { - _set_track_mode (track().get(), mode, other_item); + + if (item && other_item && other_item_2 && track()->mode() != mode) { + _set_track_mode (track().get(), mode, other_item, other_item_2); } } void -RouteTimeAxisView::_set_track_mode (Track* track, TrackMode mode, RadioMenuItem* reset_item) +RouteTimeAxisView::_set_track_mode (Track* track, TrackMode mode, RadioMenuItem* reset_item, RadioMenuItem* reset_item_2) { bool needs_bounce; @@ -630,10 +604,11 @@ RouteTimeAxisView::_set_track_mode (Track* track, TrackMode mode, RadioMenuItem* if (!needs_bounce) { /* cannot be done */ - Glib::signal_idle().connect (bind (sigc::ptr_fun (__reset_item), reset_item)); + Glib::signal_idle().connect (sigc::bind (sigc::ptr_fun (__reset_item), reset_item, reset_item_2)); return; } else { cerr << "would bounce this one\n"; + /* XXX: radio menu item becomes inconsistent with track state in this case */ return; } } @@ -641,7 +616,9 @@ RouteTimeAxisView::_set_track_mode (Track* track, TrackMode mode, RadioMenuItem* track->set_mode (mode); rec_enable_button->remove (); + switch (mode) { + case ARDOUR::NonLayered: case ARDOUR::Normal: rec_enable_button->add (*(manage (new Image (::get_icon (X_("record_normal_red")))))); break; @@ -649,19 +626,22 @@ RouteTimeAxisView::_set_track_mode (Track* track, TrackMode mode, RadioMenuItem* rec_enable_button->add (*(manage (new Image (::get_icon (X_("record_tape_red")))))); break; } - rec_enable_button->show_all (); + rec_enable_button->show_all (); } void RouteTimeAxisView::track_mode_changed () { RadioMenuItem* item; - + switch (track()->mode()) { case ARDOUR::Normal: item = normal_track_mode_item; break; + case ARDOUR::NonLayered: + item = non_layered_track_mode_item; + break; case ARDOUR::Destructive: item = destructive_track_mode_item; break; @@ -680,35 +660,35 @@ RouteTimeAxisView::show_timestretch (nframes_t start, nframes_t end) double x1; double x2; double y2; - + TimeAxisView::show_timestretch (start, end); hide_timestretch (); -#if 0 +#if 0 if (ts.empty()) { return; } - /* check that the time selection was made in our route, or our edit group. - remember that edit_group() == 0 implies the route is *not* in a edit group. + /* check that the time selection was made in our route, or our route group. + remember that route_group() == 0 implies the route is *not* in a edit group. */ - if (!(ts.track == this || (ts.group != 0 && ts.group == _route->edit_group()))) { + if (!(ts.track == this || (ts.group != 0 && ts.group == _route->route_group()))) { /* this doesn't apply to us */ return; } /* ignore it if our edit group is not active */ - - if ((ts.track != this) && _route->edit_group() && !_route->edit_group()->is_active()) { + + if ((ts.track != this) && _route->route_group() && !_route->route_group()->is_active()) { return; } #endif if (timestretch_rect == 0) { - timestretch_rect = new SimpleRect (*canvas_display); + timestretch_rect = new SimpleRect (*canvas_display ()); timestretch_rect->property_x1() = 0.0; timestretch_rect->property_y1() = 0.0; timestretch_rect->property_x2() = 0.0; @@ -720,10 +700,10 @@ RouteTimeAxisView::show_timestretch (nframes_t start, nframes_t end) timestretch_rect->show (); timestretch_rect->raise_to_top (); - x1 = start / editor.get_current_zoom(); - x2 = (end - 1) / editor.get_current_zoom(); + x1 = start / _editor.get_current_zoom(); + x2 = (end - 1) / _editor.get_current_zoom(); y2 = current_height() - 2; - + timestretch_rect->property_x1() = x1; timestretch_rect->property_y1() = 1.0; timestretch_rect->property_x2() = x2; @@ -746,12 +726,12 @@ RouteTimeAxisView::show_selection (TimeSelection& ts) #if 0 /* ignore it if our edit group is not active or if the selection was started - in some other track or edit group (remember that edit_group() == 0 means - that the track is not in an edit group). + in some other track or route group (remember that route_group() == 0 means + that the track is not in an route group). */ - if (((ts.track != this && !is_child (ts.track)) && _route->edit_group() && !_route->edit_group()->is_active()) || - (!(ts.track == this || is_child (ts.track) || (ts.group != 0 && ts.group == _route->edit_group())))) { + if (((ts.track != this && !is_child (ts.track)) && _route->route_group() && !_route->route_group()->is_active()) || + (!(ts.track == this || is_child (ts.track) || (ts.group != 0 && ts.group == _route->route_group())))) { hide_selection (); return; } @@ -779,28 +759,29 @@ 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(); - solo_button->show(); + if (!_route || _route->is_monitor()) { + solo_button->hide(); + } else { + solo_button->show(); + } if (rec_enable_button) rec_enable_button->show(); - edit_group_button.show(); - hide_button.show(); - visual_button.show(); - size_button.show(); + route_group_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 (); @@ -808,41 +789,51 @@ RouteTimeAxisView::set_height (uint32_t h) gm.get_gain_slider().hide(); mute_button->show(); - solo_button->show(); + if (!_route || _route->is_monitor()) { + solo_button->hide(); + } else { + solo_button->show(); + } if (rec_enable_button) rec_enable_button->show(); - edit_group_button.hide (); - hide_button.hide (); - visual_button.hide (); - size_button.hide (); + route_group_button.hide (); automation_button.hide (); - + if (is_track() && track()->mode() == ARDOUR::Normal) { playlist_button.hide (); } } else { + + /* don't allow name_entry to be hidden while + it has focus, otherwise the GUI becomes unusable. + */ + + if (name_entry.has_focus()) { + if (name_entry.get_text() != _route->name()) { + name_entry_changed (); + } + controls_ebox.grab_focus (); + } + hide_name_entry (); show_name_label (); - + gm.get_gain_slider().hide(); mute_button->hide(); solo_button->hide(); if (rec_enable_button) rec_enable_button->hide(); - edit_group_button.hide (); - hide_button.hide (); - visual_button.hide (); - size_button.hide (); + route_group_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 */ } @@ -862,7 +853,7 @@ RouteTimeAxisView::select_track_color () void RouteTimeAxisView::reset_samples_per_unit () { - set_samples_per_unit (editor.get_current_zoom()); + set_samples_per_unit (_editor.get_current_zoom()); } void @@ -870,10 +861,10 @@ 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) { _view->set_samples_per_unit (spu * speed); } @@ -884,7 +875,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(); @@ -917,7 +908,7 @@ RouteTimeAxisView::set_align_style (AlignStyle style) } if (item->get_active()) { - get_diskstream()->set_align_style (style); + track()->set_align_style (style); } } @@ -927,15 +918,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); @@ -953,40 +947,37 @@ RouteTimeAxisView::rename_current_playlist () } } -std::string +std::string RouteTimeAxisView::resolve_new_group_playlist_name(std::string &basename, vector > const & playlists) { - std::string ret(basename); - - std::string group_string = "."+edit_group()->name()+"."; + std::string ret (basename); - if (basename.find(group_string) == string::npos) { - int maxnumber = 0; + std::string const group_string = "." + route_group()->name() + "."; - // iterate through all playlists - for (vector >::const_iterator i = playlists.begin(); i != playlists.end(); ++i) { - std::string tmp = (*i)->name(); + // iterate through all playlists + int maxnumber = 0; + for (vector >::const_iterator i = playlists.begin(); i != playlists.end(); ++i) { + std::string tmp = (*i)->name(); - std::string::size_type idx = tmp.find(group_string); - // find those which belong to this group - if (idx != string::npos) { - tmp = tmp.substr(idx + group_string.length()); + std::string::size_type idx = tmp.find(group_string); + // find those which belong to this group + if (idx != string::npos) { + tmp = tmp.substr(idx + group_string.length()); - // and find the largest current number - int x = atoi(tmp.c_str()); - if (x > maxnumber) { - maxnumber = x; - } + // and find the largest current number + int x = atoi(tmp.c_str()); + if (x > maxnumber) { + maxnumber = x; } } + } - maxnumber++; + maxnumber++; - char buf[32]; - snprintf (buf, sizeof(buf), "%d", maxnumber); - - ret = this->name()+"."+edit_group()->name()+"."+buf; - } + char buf[32]; + snprintf (buf, sizeof(buf), "%d", maxnumber); + + ret = this->name() + "." + route_group()->name () + "." + buf; return ret; } @@ -995,23 +986,25 @@ void RouteTimeAxisView::use_copy_playlist (bool prompt, vector > const & playlists_before_op) { 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; + } name = pl->name(); - - if (edit_group() && edit_group()->is_active()) { + + if (route_group() && route_group()->is_active()) { name = resolve_new_group_playlist_name(name, playlists_before_op); } - while (_session.playlist_by_name(name)) { - name = Playlist::bump_name (name, _session); + while (_session->playlists->by_name(name)) { + name = Playlist::bump_name (name, *_session); } // TODO: The prompter "new" button should be de-activated if the user @@ -1020,26 +1013,27 @@ RouteTimeAxisView::use_copy_playlist (bool prompt, vectoruse_copy_playlist (); - ds->playlist()->set_name (name); + tr->use_copy_playlist (); + tr->playlist()->set_name (name); } } @@ -1047,31 +1041,34 @@ void RouteTimeAxisView::use_new_playlist (bool prompt, vector > const & playlists_before_op) { 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; + } name = pl->name(); - - if (edit_group() && edit_group()->is_active()) { + + if (route_group() && route_group()->is_active()) { name = resolve_new_group_playlist_name(name,playlists_before_op); } - while (_session.playlist_by_name(name)) { - name = Playlist::bump_name (name, _session); + while (_session->playlists->by_name(name)) { + name = Playlist::bump_name (name, *_session); } if (prompt) { - + ArdourPrompter prompter (true); - - prompter.set_prompt (_("Name for Playlist")); + + prompter.set_title (_("New Playlist")); + prompter.set_prompt (_("Name for new playlist:")); prompter.set_initial_text (name); prompter.add_button (Gtk::Stock::NEW, Gtk::RESPONSE_ACCEPT); prompter.set_response_sensitive (Gtk::RESPONSE_ACCEPT, true); @@ -1080,53 +1077,49 @@ 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); + _editor.clear_playlist (pl); } void RouteTimeAxisView::speed_changed () { - Gtkmm2ext::UI::instance()->call_slot (mem_fun(*this, &RouteTimeAxisView::reset_samples_per_unit)); + Gtkmm2ext::UI::instance()->call_slot (invalidator (*this), boost::bind (&RouteTimeAxisView::reset_samples_per_unit, this)); } -void -RouteTimeAxisView::diskstream_changed () -{ - Gtkmm2ext::UI::instance()->call_slot (mem_fun(*this, &RouteTimeAxisView::update_diskstream_display)); -} - void RouteTimeAxisView::update_diskstream_display () { - if (!get_diskstream()) // bus + if (!track()) { return; + } - set_playlist (get_diskstream()->playlist()); map_frozen (); -} +} void RouteTimeAxisView::selection_click (GdkEventButton* ev) @@ -1134,42 +1127,32 @@ RouteTimeAxisView::selection_click (GdkEventButton* ev) if (Keyboard::modifier_state_equals (ev->state, (Keyboard::TertiaryModifier|Keyboard::PrimaryModifier))) { /* special case: select/deselect all tracks */ - if (editor.get_selection().selected (this)) { - editor.get_selection().clear_tracks (); + if (_editor.get_selection().selected (this)) { + _editor.get_selection().clear_tracks (); } else { - editor.select_all_tracks (); + _editor.select_all_tracks (); } return; - } - - PublicEditor::TrackViewList* tracks = editor.get_valid_views (this, _route->edit_group()); + } - switch (Keyboard::selection_type (ev->state)) { + switch (ArdourKeyboard::selection_type (ev->state)) { case Selection::Toggle: - editor.get_selection().toggle (*tracks); + _editor.get_selection().toggle (this); break; - + case Selection::Set: - editor.get_selection().set (*tracks); + _editor.get_selection().set (this); break; case Selection::Extend: - if (tracks->size() > 1) { - /* add each one, do not "extend" */ - editor.get_selection().add (*tracks); - } else { - /* extend to the single track */ - editor.extend_selection_to_track (*tracks->front()); - } + _editor.extend_selection_to_track (*this); break; case Selection::Add: - editor.get_selection().add (*tracks); + _editor.get_selection().add (this); break; } - - delete tracks; } void @@ -1195,20 +1178,20 @@ void RouteTimeAxisView::get_selectables (nframes_t start, nframes_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); nframes_t end_adjusted = session_frame_to_track_frame(end, speed); if ((_view && ((top < 0.0 && bot < 0.0))) || touched (top, bot)) { - _view->get_selectables (start_adjusted, end_adjusted, results); + _view->get_selectables (start_adjusted, end_adjusted, top, bot, results); } /* pick up visible automation tracks */ - + for (Children::iterator i = children.begin(); i != children.end(); ++i) { if (!(*i)->hidden()) { (*i)->get_selectables (start_adjusted, end_adjusted, top, bot, results); @@ -1232,37 +1215,10 @@ RouteTimeAxisView::get_inverted_selectables (Selection& sel, list& return; } -bool -RouteTimeAxisView::show_automation(Evoral::Parameter param) -{ - return (_show_automation.find(param) != _show_automation.end()); -} - -/** Retuns NULL 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 NULL; -} - -/** Shorthand for GainAutomation, etc. - */ -RouteTimeAxisView::RouteAutomationNode* -RouteTimeAxisView::automation_track(AutomationType type) -{ - return automation_track(Evoral::Parameter(type)); -} - RouteGroup* -RouteTimeAxisView::edit_group() const +RouteTimeAxisView::route_group () const { - return _route->edit_group(); + return _route->route_group(); } string @@ -1272,12 +1228,12 @@ RouteTimeAxisView::name() const } boost::shared_ptr -RouteTimeAxisView::playlist () const +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 (); } @@ -1289,7 +1245,7 @@ RouteTimeAxisView::name_entry_changed () string x; x = name_entry.get_text (); - + if (x == _route->name()) { return; } @@ -1301,52 +1257,36 @@ RouteTimeAxisView::name_entry_changed () return; } - if (_session.route_name_unique (x)) { - _route->set_name (x); - } else { + if (!_session->route_name_unique (x)) { 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")); + 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 (); } -nframes64_t +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; @@ -1356,44 +1296,61 @@ bool 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; } - 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); (*i).end = session_frame_to_track_frame((*i).end, speed); } } - - 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())); + _editor.get_cut_buffer().add (what_we_got); + + 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)); ret = true; } break; case Copy: if ((what_we_got = playlist->copy (time)) != 0) { - editor.get_cut_buffer().add (what_we_got); + _editor.get_cut_buffer().add (what_we_got); } break; 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; } @@ -1410,21 +1367,22 @@ RouteTimeAxisView::paste (nframes_t pos, float times, Selection& selection, size 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); + + for (p = selection.playlists.begin(); p != selection.playlists.end() && nth; ++p, --nth) {} if (p == selection.playlists.end()) { return false; } - if (get_diskstream()->speed() != 1.0f) - pos = session_frame_to_track_frame(pos, get_diskstream()->speed() ); - - XMLNode &before = playlist->get_state(); - playlist->paste (*p, pos, times); - _session.add_command( new MementoCommand(*playlist, &before, &playlist->get_state())); + if (track()->speed() != 1.0f) { + pos = session_frame_to_track_frame (pos, track()->speed()); + } + + pl->clear_history (); + pl->paste (*p, pos, times); + _session->add_command (new StatefulDiffCommand (pl)); return true; } @@ -1434,7 +1392,7 @@ 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); @@ -1444,6 +1402,12 @@ RouteTimeAxisView::get_child_list() } +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) { @@ -1457,63 +1421,70 @@ RouteTimeAxisView::build_playlist_menu (Gtk::Menu * menu) menu->set_name ("ArdourContextMenu"); playlist_items.clear(); - if (playlist_menu) { - delete playlist_menu; - } + 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.get_playlists (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(), bind (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(), bind (mem_fun (*this, &RouteTimeAxisView::use_playlist), - boost::weak_ptr(*i)))); - static_cast(&playlist_items.back())->set_active(); - + _session->playlists->get (playlists); + + /* 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"), 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 (!edit_group() || !edit_group()->is_active()) { - playlist_items.push_back (MenuElem (_("New"), bind(mem_fun(editor, &PublicEditor::new_playlists), this))); - playlist_items.push_back (MenuElem (_("New Copy"), bind(mem_fun(editor, &PublicEditor::copy_playlists), this))); + 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))); } else { // Use a label which tells the user what is happening - playlist_items.push_back (MenuElem (_("New Take"), bind(mem_fun(editor, &PublicEditor::new_playlists), this))); - playlist_items.push_back (MenuElem (_("Copy Take"), bind(mem_fun(editor, &PublicEditor::copy_playlists), this))); - + playlist_items.push_back (MenuElem (_("New Take"), sigc::bind(sigc::mem_fun(_editor, &PublicEditor::new_playlists), this))); + playlist_items.push_back (MenuElem (_("Copy Take"), sigc::bind(sigc::mem_fun(_editor, &PublicEditor::copy_playlists), this))); + } playlist_items.push_back (SeparatorElem()); - playlist_items.push_back (MenuElem (_("Clear Current"), bind(mem_fun(editor, &PublicEditor::clear_playlists), this))); + 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 ..."), 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) { @@ -1521,19 +1492,17 @@ 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 (edit_group() && edit_group()->is_active()) { - //PBD::stacktrace(cerr, 20); - std::string group_string = "."+edit_group()->name()+"."; + if (route_group() && route_group()->is_active()) { + std::string group_string = "."+route_group()->name()+"."; std::string take_name = apl->name(); std::string::size_type idx = take_name.find(group_string); @@ -1542,30 +1511,30 @@ RouteTimeAxisView::use_playlist (boost::weak_ptr wpl) return; take_name = take_name.substr(idx + group_string.length()); // find the bit containing the take number / name - - for (list::const_iterator i = edit_group()->route_list().begin(); i != edit_group()->route_list().end(); ++i) { - if ( (*i) == this->route().get()) { + + boost::shared_ptr rl (route_group()->route_list()); + + for (RouteList::const_iterator i = rl->begin(); i != rl->end(); ++i) { + if ( (*i) == this->route()) { continue; } - + std::string playlist_name = (*i)->name()+group_string+take_name; - Track *track = dynamic_cast(*i); + boost::shared_ptr track = boost::dynamic_pointer_cast(*i); if (!track) { std::cerr << "route " << (*i)->name() << " is not a Track" << std::endl; continue; } - boost::shared_ptr ipl = session().playlist_by_name(playlist_name); + 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); } - - //(*i)->get_dis } } } @@ -1574,7 +1543,7 @@ RouteTimeAxisView::use_playlist (boost::weak_ptr wpl) void RouteTimeAxisView::show_playlist_selector () { - editor.playlist_selector().show_for (this); + _editor.playlist_selector().show_for (this); } void @@ -1584,7 +1553,7 @@ RouteTimeAxisView::map_frozen () return; } - ENSURE_GUI_THREAD (mem_fun(*this, &RouteTimeAxisView::map_frozen)); + ENSURE_GUI_THREAD (*this, &RouteTimeAxisView::map_frozen) switch (track()->freeze_state()) { case Track::Frozen: @@ -1613,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 */ + } } } } @@ -1645,19 +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; } - _show_automation.erase(param); - ran->track->get_state_node()->add_property (X_("shown"), X_("no")); + Gtk::CheckMenuItem* menu = automation_child_menu_item (param); - if (ran->menu_item && !_hidden) { - ran->menu_item->set_active (false); + // if Evoral::Parameter::operator< doesn't obey strict weak ordering, we may crash here.... + track->get_state_node()->add_property (X_("shown"), X_("no")); + + 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 */ + } } @@ -1665,15 +1640,19 @@ void RouteTimeAxisView::show_all_automation () { no_redraw = true; - + /* 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); + } } @@ -1683,7 +1662,7 @@ RouteTimeAxisView::show_all_automation () for (vector::iterator ii = (*i)->lines.begin(); ii != (*i)->lines.end(); ++ii) { if ((*ii)->view == 0) { add_processor_automation_curve ((*i)->processor, (*ii)->what); - } + } (*ii)->menu_item->set_active (true); } @@ -1693,23 +1672,25 @@ RouteTimeAxisView::show_all_automation () /* Redraw */ - _route->gui_changed ("visible_tracks", (void *) 0); /* EMIT_SIGNAL */ + _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */ } void RouteTimeAxisView::show_existing_automation () { no_redraw = true; - + /* 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); + assert (menu); + menu->set_active(true); } } @@ -1718,15 +1699,15 @@ 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); } } } no_redraw = false; - - _route->gui_changed ("visible_tracks", (void *) 0); /* EMIT_SIGNAL */ + + _route->gui_changed ("track_height", (void *) 0); /* EMIT_SIGNAL */ } void @@ -1736,11 +1717,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 */ @@ -1751,10 +1737,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 */ } @@ -1762,10 +1746,10 @@ 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; - + if ((atv = boost::dynamic_pointer_cast (*i)) != 0) { atv->add_ghost(rv); } @@ -1816,7 +1800,7 @@ RouteTimeAxisView::find_processor_automation_node (boost::shared_ptr return 0; } -static string +static string legalize_for_xml_node (string str) { string::size_type pos; @@ -1842,7 +1826,7 @@ RouteTimeAxisView::add_processor_automation_curve (boost::shared_ptr ProcessorAutomationNode* pan; if ((pan = find_processor_automation_node (processor, what)) == 0) { - fatal << _("programming error: ") + error << _("programming error: ") << string_compose (X_("processor automation curve for %1:%2 not registered with track!"), processor->name(), what) << endmsg; @@ -1864,13 +1848,13 @@ RouteTimeAxisView::add_processor_automation_curve (boost::shared_ptr snprintf (state_name, sizeof (state_name), "Redirect-%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, - editor, *this, false, parent_canvas, name, state_name)); + _editor, *this, false, parent_canvas, name, state_name)); - pan->view->Hiding.connect (bind (mem_fun(*this, &RouteTimeAxisView::processor_automation_track_hidden), pan, processor)); + pan->view->Hiding.connect (sigc::bind (sigc::mem_fun(*this, &RouteTimeAxisView::processor_automation_track_hidden), pan, processor)); if (!pan->view->marked_for_display()) { pan->view->hide (); @@ -1881,7 +1865,7 @@ RouteTimeAxisView::add_processor_automation_curve (boost::shared_ptr add_child (pan->view); if (_view) { - _view->foreach_regionview (mem_fun(*pan->view.get(), &TimeAxisView::add_ghost)); + _view->foreach_regionview (sigc::mem_fun(*pan->view.get(), &TimeAxisView::add_ghost)); } processor->mark_automation_visible (what, true); @@ -1896,19 +1880,26 @@ 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 -RouteTimeAxisView::add_existing_processor_automation_curves (boost::shared_ptr processor) +RouteTimeAxisView::add_existing_processor_automation_curves (boost::weak_ptr p) { + boost::shared_ptr processor (p.lock ()); + if (!processor) { + return; + } + set s; boost::shared_ptr al; processor->what_has_visible_data (s); for (set::iterator i = s.begin(); i != s.end(); ++i) { - + if ((al = find_processor_automation_curve (processor, *i)) != 0) { al->queue_reset (); } else { @@ -1918,7 +1909,7 @@ RouteTimeAxisView::add_existing_processor_automation_curves (boost::shared_ptr

track, bool show) +RouteTimeAxisView::add_automation_child (Evoral::Parameter param, boost::shared_ptr track, bool show) { using namespace Menu_Helpers; @@ -1927,42 +1918,50 @@ RouteTimeAxisView::add_automation_child(Evoral::Parameter param, boost::shared_p add_child (track); - track->Hiding.connect (bind (mem_fun (*this, &RouteTimeAxisView::automation_track_hidden), param)); + track->Hiding.connect (sigc::bind (sigc::mem_fun (*this, &RouteTimeAxisView::automation_track_hidden), param)); bool hideit = (!show); if ((node = track->get_state_node()) != 0) { if ((prop = node->property ("shown")) != 0) { - if (prop->value() == "yes") { + if (string_is_affirmative (prop->value())) { hideit = false; } - } + } } - _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::shared_ptr processor) +RouteTimeAxisView::add_processor_to_subplugin_menu (boost::weak_ptr p) { + boost::shared_ptr processor (p.lock ()); + + if (!processor || !processor->display_to_user ()) { + return; + } + using namespace Menu_Helpers; ProcessorAutomationInfo *rai; list::iterator x; - + const std::set& automatable = processor->what_can_be_automated (); std::set has_visible_automation; @@ -2003,12 +2002,14 @@ RouteTimeAxisView::add_processor_to_subplugin_menu (boost::shared_ptr ProcessorAutomationNode* pan; CheckMenuItem* mitem; - + string name = processor->describe_parameter (*i); - + items.push_back (CheckMenuElem (name)); mitem = dynamic_cast (&items.back()); + _parameter_menu_map[*i] = mitem; + if (has_visible_automation.find((*i)) != has_visible_automation.end()) { mitem->set_active(true); } @@ -2016,9 +2017,9 @@ RouteTimeAxisView::add_processor_to_subplugin_menu (boost::shared_ptr if ((pan = find_processor_automation_node (processor, *i)) == 0) { /* new item */ - + pan = new ProcessorAutomationNode (*i, mitem, *this); - + rai->lines.push_back (pan); } else { @@ -2027,7 +2028,7 @@ RouteTimeAxisView::add_processor_to_subplugin_menu (boost::shared_ptr } - mitem->signal_toggled().connect (bind (mem_fun(*this, &RouteTimeAxisView::processor_menu_item_toggled), rai, pan)); + mitem->signal_toggled().connect (sigc::bind (sigc::mem_fun(*this, &RouteTimeAxisView::processor_menu_item_toggled), rai, pan)); } /* add the menu for this processor, because the subplugin @@ -2056,7 +2057,8 @@ RouteTimeAxisView::processor_menu_item_toggled (RouteTimeAxisView::ProcessorAuto if (showit) { pan->view->set_marked_for_display (true); - pan->view->canvas_display->show(); + pan->view->canvas_display()->show(); + pan->view->canvas_background()->show(); } else { rai->processor->mark_automation_visible (pan->what, true); pan->view->set_marked_for_display (false); @@ -2068,27 +2070,31 @@ 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 */ } } void -RouteTimeAxisView::processors_changed () +RouteTimeAxisView::processors_changed (RouteProcessorChange c) { + if (c.type == RouteProcessorChange::MeterPointChange) { + /* nothing to do if only the meter point has changed */ + return; + } + using namespace Menu_Helpers; - + for (list::iterator i = processor_automation.begin(); i != processor_automation.end(); ++i) { (*i)->valid = false; } subplugin_menu.items().clear (); - _route->foreach_processor (this, &RouteTimeAxisView::add_processor_to_subplugin_menu); - _route->foreach_processor (this, &RouteTimeAxisView::add_existing_processor_automation_curves); + _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)); + + bool deleted_processor_automation = false; for (list::iterator i = processor_automation.begin(); i != processor_automation.end(); ) { @@ -2101,15 +2107,16 @@ RouteTimeAxisView::processors_changed () delete *i; processor_automation.erase (i); + deleted_processor_automation = true; - } + } i = tmp; } - /* change in visibility was possible */ - - _route->gui_changed ("visible_tracks", this); + if (deleted_processor_automation && !no_redraw) { + _route->gui_changed ("track_height", this); + } } boost::shared_ptr @@ -2120,7 +2127,7 @@ RouteTimeAxisView::find_processor_automation_curve (boost::shared_ptr if ((pan = find_processor_automation_node (processor, what)) != 0) { if (pan->view) { pan->view->line(); - } + } } return boost::shared_ptr(); @@ -2140,22 +2147,40 @@ RouteTimeAxisView::update_rec_display () RouteUI::update_rec_display (); name_entry.set_sensitive (!_route->record_enabled()); } - + void RouteTimeAxisView::set_layer_display (LayerDisplay d) { - _view->set_layer_display (d); + if (_view) { + _view->set_layer_display (d); + } + + ensure_xml_node (); + xml_node->add_property (N_("layer-display"), enum_2_string (d)); } - + +LayerDisplay +RouteTimeAxisView::layer_display () const +{ + if (_view) { + return _view->layer_display (); + } + + /* we don't know, since we don't have a _view, so just return something */ + return Overlaid; +} + + 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 @@ -2194,62 +2219,63 @@ RouteTimeAxisView::clear_meter () } void -RouteTimeAxisView::meter_changed (void *src) +RouteTimeAxisView::meter_changed () { - ENSURE_GUI_THREAD (bind (mem_fun(*this, &RouteTimeAxisView::meter_changed), src)); + ENSURE_GUI_THREAD (*this, &RouteTimeAxisView::meter_changed) reset_meter(); } void -RouteTimeAxisView::io_changed (IOChange change, void *src) +RouteTimeAxisView::io_changed (IOChange /*change*/, void */*src*/) { reset_meter (); } 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"); MenuList& gs_items = gs_menu->items(); - + parent_items.push_back (MenuElem (_("Underlays"), *gs_menu)); - + for(UnderlayList::iterator it = _underlay_streams.begin(); it != _underlay_streams.end(); ++it) { gs_items.push_back(MenuElem(string_compose(_("Remove \"%1\""), (*it)->trackview().name()), - bind(mem_fun(*this, &RouteTimeAxisView::remove_underlay), *it))); + sigc::bind(sigc::mem_fun(*this, &RouteTimeAxisView::remove_underlay), *it))); } } } bool -RouteTimeAxisView::set_underlay_state() +RouteTimeAxisView::set_underlay_state() { - if(!underlay_xml_node) { + if (!underlay_xml_node) { return false; } XMLNodeList nlist = underlay_xml_node->children(); XMLNodeConstIterator niter; XMLNode *child_node; - + for (niter = nlist.begin(); niter != nlist.end(); ++niter) { child_node = *niter; - if(child_node->name() != "Underlay") { + if (child_node->name() != "Underlay") { continue; } XMLProperty* prop = child_node->property ("id"); - if(prop) { - PBD::ID id(prop->value()); + if (prop) { + PBD::ID id (prop->value()); - RouteTimeAxisView* v = editor.get_route_view_by_id(id); + RouteTimeAxisView* v = _editor.get_route_view_by_id (id); - if(v) { + if (v) { add_underlay(v->view(), false); } } @@ -2259,16 +2285,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*/ } @@ -2276,10 +2302,10 @@ RouteTimeAxisView::add_underlay(StreamView* v, bool update_xml) _underlay_streams.push_back(v); other._underlay_mirrors.push_back(this); - v->foreach_regionview(mem_fun(*this, &RouteTimeAxisView::add_ghost)); + 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"); } @@ -2292,31 +2318,65 @@ 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*/ } - v->foreach_regionview(mem_fun(*this, &RouteTimeAxisView::remove_ghost)); + v->foreach_regionview(sigc::mem_fun(*this, &RouteTimeAxisView::remove_ghost)); _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()); } } } +void +RouteTimeAxisView::set_button_names () +{ + rec_enable_button_label.set_text (_("r")); + + 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 = _parameter_menu_map.find (param); + if (i == _parameter_menu_map.end()) { + return 0; + } + + return i->second; +}