X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_routes.cc;h=d28eb5d0067908388c47bd6f39f8059cdf396713;hb=e0ff70cf86c01c42f98faf8b0eaf1a8ccf867946;hp=e0b562b4942f48682221437cbdc0dce0b1e99aad;hpb=8648a8a13b04549362f14a0738947d997ef1abc7;p=ardour.git diff --git a/gtk2_ardour/editor_routes.cc b/gtk2_ardour/editor_routes.cc index e0b562b494..d28eb5d006 100644 --- a/gtk2_ardour/editor_routes.cc +++ b/gtk2_ardour/editor_routes.cc @@ -17,42 +17,48 @@ */ +#include +#include +#include #include #include #include -#include -#include -#include #include "pbd/unknown_type.h" #include "pbd/unwind.h" #include "ardour/debug.h" -#include "ardour/route.h" +#include "ardour/audio_track.h" #include "ardour/midi_track.h" +#include "ardour/route.h" #include "ardour/session.h" +#include "ardour/solo_isolate_control.h" +#include "ardour/utils.h" #include "gtkmm2ext/cell_renderer_pixbuf_multi.h" #include "gtkmm2ext/cell_renderer_pixbuf_toggle.h" #include "gtkmm2ext/treeutils.h" -#include "editor.h" -#include "keyboard.h" +#include "actions.h" #include "ardour_ui.h" #include "audio_time_axis.h" +#include "editor.h" +#include "editor_group_tabs.h" +#include "editor_routes.h" +#include "gui_thread.h" +#include "keyboard.h" #include "midi_time_axis.h" #include "mixer_strip.h" -#include "gui_thread.h" -#include "actions.h" -#include "utils.h" +#include "plugin_setup_dialog.h" #include "route_sorter.h" -#include "editor_group_tabs.h" -#include "editor_routes.h" +#include "tooltips.h" +#include "utils.h" #include "i18n.h" using namespace std; using namespace ARDOUR; +using namespace ARDOUR_UI_UTILS; using namespace PBD; using namespace Gtk; using namespace Gtkmm2ext; @@ -60,20 +66,24 @@ using namespace Glib; using Gtkmm2ext::Keyboard; struct ColumnInfo { - int index; - const char* label; - const char* tooltip; + int index; + const char* label; + const char* tooltip; }; EditorRoutes::EditorRoutes (Editor* e) : EditorComponent (e) - , _ignore_reorder (false) - , _no_redisplay (false) - , _adding_routes (false) - , _menu (0) - , old_focus (0) - , selection_countdown (0) - , name_editable (0) + , _ignore_reorder (false) + , _no_redisplay (false) + , _adding_routes (false) + , _route_deletion_in_progress (false) + , _redisplay_on_resume (false) + , _redisplay_active (0) + , _queue_tv_update (0) + , _menu (0) + , old_focus (0) + , selection_countdown (0) + , name_editable (0) { static const int column_width = 22; @@ -102,6 +112,23 @@ EditorRoutes::EditorRoutes (Editor* e) rec_state_column->set_expand(false); rec_state_column->set_fixed_width(column_width); + + // Record safe toggle + CellRendererPixbufMulti* rec_safe_renderer = manage (new CellRendererPixbufMulti ()); + + rec_safe_renderer->set_pixbuf (0, ::get_icon("rec-safe-disabled")); + rec_safe_renderer->set_pixbuf (1, ::get_icon("rec-safe-enabled")); + rec_safe_renderer->signal_changed().connect (sigc::mem_fun (*this, &EditorRoutes::on_tv_rec_safe_toggled)); + + TreeViewColumn* rec_safe_column = manage (new TreeViewColumn(_("RS"), *rec_safe_renderer)); + rec_safe_column->add_attribute(rec_safe_renderer->property_state(), _columns.rec_safe); + rec_safe_column->add_attribute(rec_safe_renderer->property_visible(), _columns.is_track); + rec_safe_column->set_sizing(TREE_VIEW_COLUMN_FIXED); + rec_safe_column->set_alignment(ALIGN_CENTER); + rec_safe_column->set_expand(false); + rec_safe_column->set_fixed_width(column_width); + + // MIDI Input Active CellRendererPixbufMulti* input_active_col_renderer = manage (new CellRendererPixbufMulti()); @@ -183,12 +210,13 @@ EditorRoutes::EditorRoutes (Editor* e) solo_safe_state_column->set_expand(false); solo_safe_state_column->set_fixed_width(column_width); - _name_column = _display.append_column ("", _columns.text) - 1; + _name_column = _display.append_column ("", _columns.text) - 1; _visible_column = _display.append_column ("", _columns.visible) - 1; _active_column = _display.append_column ("", _columns.active) - 1; _display.append_column (*input_active_column); _display.append_column (*rec_state_column); + _display.append_column (*rec_safe_column); _display.append_column (*mute_state_column); _display.append_column (*solo_state_column); _display.append_column (*solo_isolate_state_column); @@ -199,22 +227,23 @@ EditorRoutes::EditorRoutes (Editor* e) Gtk::Label* l; ColumnInfo ci[] = { - { 0, _("Name"), _("Track/Bus Name") }, - { 1, _("V"), _("Track/Bus visible ?") }, - { 2, _("A"), _("Track/Bus active ?") }, - { 3, _("I"), _("MIDI input enabled") }, - { 4, _("R"), _("Record enabled") }, - { 5, _("M"), _("Muted") }, - { 6, _("S"), _("Soloed") }, - { 7, _("SI"), _("Solo Isolated") }, - { 8, _("SS"), _("Solo Safe (Locked)") }, + { 0, _("Name"), _("Track/Bus Name") }, + { 1, S_("Visible|V"), _("Track/Bus visible ?") }, + { 2, S_("Active|A"), _("Track/Bus active ?") }, + { 3, S_("MidiInput|I"), _("MIDI input enabled") }, + { 4, S_("Rec|R"), _("Record enabled") }, + { 5, S_("Rec|RS"), _("Record Safe") }, + { 6, S_("Mute|M"), _("Muted") }, + { 7, S_("Solo|S"), _("Soloed") }, + { 8, S_("SoloIso|SI"), _("Solo Isolated") }, + { 9, S_("SoloLock|SS"), _("Solo Safe (Locked)") }, { -1, 0, 0 } }; for (int i = 0; ci[i].index >= 0; ++i) { col = _display.get_column (ci[i].index); l = manage (new Label (ci[i].label)); - ARDOUR_UI::instance()->set_tip (*l, ci[i].tooltip); + set_tooltip (*l, ci[i].tooltip); col->set_widget (*l); l->show (); } @@ -222,6 +251,7 @@ EditorRoutes::EditorRoutes (Editor* e) _display.set_headers_visible (true); _display.get_selection()->set_mode (SELECTION_SINGLE); _display.get_selection()->set_select_function (sigc::mem_fun (*this, &EditorRoutes::selection_filter)); + _display.get_selection()->signal_changed().connect (sigc::mem_fun (*this, &EditorRoutes::selection_changed)); _display.set_reorderable (true); _display.set_name (X_("EditGroupList")); _display.set_rules_hint (true); @@ -231,7 +261,7 @@ EditorRoutes::EditorRoutes (Editor* e) CellRendererText* name_cell = dynamic_cast (_display.get_column_cell_renderer (_name_column)); assert (name_cell); - name_cell->signal_editing_started().connect (sigc::mem_fun (*this, &EditorRoutes::name_edit_started)); + name_cell->signal_editing_started().connect (sigc::mem_fun (*this, &EditorRoutes::name_edit_started)); TreeViewColumn* name_column = _display.get_column (_name_column); @@ -269,50 +299,51 @@ EditorRoutes::EditorRoutes (Editor* e) active_col->set_sizing (TREE_VIEW_COLUMN_FIXED); active_col->set_fixed_width (30); active_col->set_alignment (ALIGN_CENTER); - - _model->signal_row_deleted().connect (sigc::mem_fun (*this, &EditorRoutes::route_deleted)); + + _model->signal_row_deleted().connect (sigc::mem_fun (*this, &EditorRoutes::row_deleted)); _model->signal_rows_reordered().connect (sigc::mem_fun (*this, &EditorRoutes::reordered)); _display.signal_button_press_event().connect (sigc::mem_fun (*this, &EditorRoutes::button_press), false); _scroller.signal_key_press_event().connect (sigc::mem_fun(*this, &EditorRoutes::key_press), false); - _scroller.signal_focus_in_event().connect (sigc::mem_fun (*this, &EditorRoutes::focus_in), false); - _scroller.signal_focus_out_event().connect (sigc::mem_fun (*this, &EditorRoutes::focus_out)); + _scroller.signal_focus_in_event().connect (sigc::mem_fun (*this, &EditorRoutes::focus_in), false); + _scroller.signal_focus_out_event().connect (sigc::mem_fun (*this, &EditorRoutes::focus_out)); - _display.signal_enter_notify_event().connect (sigc::mem_fun (*this, &EditorRoutes::enter_notify), false); - _display.signal_leave_notify_event().connect (sigc::mem_fun (*this, &EditorRoutes::leave_notify), false); + _display.signal_enter_notify_event().connect (sigc::mem_fun (*this, &EditorRoutes::enter_notify), false); + _display.signal_leave_notify_event().connect (sigc::mem_fun (*this, &EditorRoutes::leave_notify), false); - _display.set_enable_search (false); + _display.set_enable_search (false); - Route::SyncOrderKeys.connect (*this, MISSING_INVALIDATOR, boost::bind (&EditorRoutes::sync_treeview_from_order_keys, this), gui_context()); + Route::PluginSetup.connect_same_thread (*this, boost::bind (&EditorRoutes::plugin_setup, this, _1, _2, _3)); + Stripable::PresentationInfoChange.connect (*this, MISSING_INVALIDATOR, boost::bind (&EditorRoutes::sync_treeview_from_presentation_info, this), gui_context()); } bool EditorRoutes::focus_in (GdkEventFocus*) { - Window* win = dynamic_cast (_scroller.get_toplevel ()); + Window* win = dynamic_cast (_scroller.get_toplevel ()); - if (win) { - old_focus = win->get_focus (); - } else { - old_focus = 0; - } + if (win) { + old_focus = win->get_focus (); + } else { + old_focus = 0; + } - name_editable = 0; + name_editable = 0; - /* try to do nothing on focus in (doesn't work, hence selection_count nonsense) */ - return true; + /* try to do nothing on focus in (doesn't work, hence selection_count nonsense) */ + return true; } bool EditorRoutes::focus_out (GdkEventFocus*) { - if (old_focus) { - old_focus->grab_focus (); - old_focus = 0; - } + if (old_focus) { + old_focus->grab_focus (); + old_focus = 0; + } - return false; + return false; } bool @@ -322,27 +353,27 @@ EditorRoutes::enter_notify (GdkEventCrossing*) return true; } - /* arm counter so that ::selection_filter() will deny selecting anything for the - next two attempts to change selection status. - */ - selection_countdown = 2; - _scroller.grab_focus (); - Keyboard::magic_widget_grab_focus (); - return false; + /* arm counter so that ::selection_filter() will deny selecting anything for the + * next two attempts to change selection status. + */ + selection_countdown = 2; + _scroller.grab_focus (); + Keyboard::magic_widget_grab_focus (); + return false; } bool EditorRoutes::leave_notify (GdkEventCrossing*) { - selection_countdown = 0; + selection_countdown = 0; - if (old_focus) { - old_focus->grab_focus (); - old_focus = 0; - } + if (old_focus) { + old_focus->grab_focus (); + old_focus = 0; + } - Keyboard::magic_widget_drop_focus (); - return false; + Keyboard::magic_widget_drop_focus (); + return false; } void @@ -355,6 +386,13 @@ EditorRoutes::set_session (Session* s) if (_session) { _session->SoloChanged.connect (*this, MISSING_INVALIDATOR, boost::bind (&EditorRoutes::solo_changed_so_update_mute, this), gui_context()); _session->RecordStateChanged.connect (*this, MISSING_INVALIDATOR, boost::bind (&EditorRoutes::update_rec_display, this), gui_context()); + + /* TODO: check if these needs to be tied in with DisplaySuspender + * Given that the UI is single-threaded and DisplaySuspender is only used + * in loops in the UI thread all should be fine. + */ + _session->BatchUpdateStart.connect (*this, MISSING_INVALIDATOR, boost::bind (&EditorRoutes::suspend_redisplay, this), gui_context()); + _session->BatchUpdateEnd.connect (*this, MISSING_INVALIDATOR, boost::bind (&EditorRoutes::resume_redisplay, this), gui_context()); } } @@ -386,9 +424,23 @@ EditorRoutes::on_tv_rec_enable_changed (std::string const & path_string) RouteTimeAxisView *rtv = dynamic_cast (tv); if (rtv && rtv->track()) { + // TODO check rec-safe and ... + _session->set_control (rtv->track()->rec_enable_control(), !rtv->track()->rec_enable_control()->get_value(), Controllable::UseGroup); + } +} + +void +EditorRoutes::on_tv_rec_safe_toggled (std::string const & path_string) +{ + Gtk::TreeModel::Row row = *_model->get_iter (Gtk::TreeModel::Path (path_string)); + TimeAxisView* tv = row[_columns.tv]; + RouteTimeAxisView *rtv = dynamic_cast (tv); + + if (rtv && rtv->track() && !rtv->track()->record_enabled()) { + DisplaySuspender ds; boost::shared_ptr rl (new RouteList); rl->push_back (rtv->route()); - _session->set_record_enabled (rl, !rtv->track()->record_enabled(), Session::rt_cleanup); + _session->set_record_safe (rl, !rtv->track()->record_safe(), Session::rt_cleanup); } } @@ -402,9 +454,7 @@ EditorRoutes::on_tv_mute_enable_toggled (std::string const & path_string) RouteTimeAxisView *rtv = dynamic_cast (tv); if (rtv != 0) { - boost::shared_ptr rl (new RouteList); - rl->push_back (rtv->route()); - _session->set_mute (rl, !rtv->route()->muted(), Session::rt_cleanup); + _session->set_control (rtv->route()->mute_control(), rtv->route()->mute_control()->get_value() ? 0.0 : 1.0, Controllable::UseGroup); } } @@ -418,13 +468,7 @@ EditorRoutes::on_tv_solo_enable_toggled (std::string const & path_string) RouteTimeAxisView* rtv = dynamic_cast (tv); if (rtv != 0) { - boost::shared_ptr rl (new RouteList); - rl->push_back (rtv->route()); - if (Config->get_solo_control_is_listen_control()) { - _session->set_listen (rl, !rtv->route()->listening_via_monitor(), Session::rt_cleanup); - } else { - _session->set_solo (rl, !rtv->route()->self_soloed(), Session::rt_cleanup); - } + rtv->route()->solo_control()->set_value (rtv->route()->soloed() ? 0.0 : 1.0, Controllable::UseGroup); } } @@ -438,7 +482,7 @@ EditorRoutes::on_tv_solo_isolate_toggled (std::string const & path_string) RouteTimeAxisView* rtv = dynamic_cast (tv); if (rtv) { - rtv->route()->set_solo_isolated (!rtv->route()->solo_isolated(), this); + rtv->route()->solo_isolate_control()->set_value (rtv->route()->solo_isolate_control()->get_value() ? 0.0 : 1.0, Controllable::UseGroup); } } @@ -452,7 +496,7 @@ EditorRoutes::on_tv_solo_safe_toggled (std::string const & path_string) RouteTimeAxisView* rtv = dynamic_cast (tv); if (rtv) { - rtv->route()->set_solo_safe (!rtv->route()->solo_safe(), this); + rtv->route()->solo_safe_control()->set_value (rtv->route()->solo_safe_control()->get_value() ? 0.0 : 1.0, Controllable::UseGroup); } } @@ -475,7 +519,7 @@ EditorRoutes::build_menu () items.push_back (MenuElem (_("Hide All Audio Busses"), sigc::mem_fun (*this, &EditorRoutes::hide_all_audiobus))); items.push_back (MenuElem (_("Show All Midi Tracks"), sigc::mem_fun (*this, &EditorRoutes::show_all_miditracks))); items.push_back (MenuElem (_("Hide All Midi Tracks"), sigc::mem_fun (*this, &EditorRoutes::hide_all_miditracks))); - items.push_back (MenuElem (_("Show Tracks With Regions Under Playhead"), sigc::mem_fun (*this, &EditorRoutes::show_tracks_with_regions_at_playhead))); + items.push_back (MenuElem (_("Only Show Tracks with Regions Under Playhead"), sigc::mem_fun (*this, &EditorRoutes::show_tracks_with_regions_at_playhead))); } void @@ -489,19 +533,15 @@ EditorRoutes::show_menu () } void -EditorRoutes::redisplay () +EditorRoutes::redisplay_real () { - if (_no_redisplay || !_session || _session->deletion_in_progress()) { - return; - } - TreeModel::Children rows = _model->children(); TreeModel::Children::iterator i; uint32_t position; /* n will be the count of tracks plus children (updated by TimeAxisView::show_at), - so we will use that to know where to put things. - */ + * so we will use that to know where to put things. + */ int n; for (n = 0, position = 0, i = rows.begin(); i != rows.end(); ++i) { @@ -518,7 +558,6 @@ EditorRoutes::redisplay () /* show or hide the TimeAxisView */ if (visible) { position += tv->show_at (position, n, &_editor->edit_controls_vbox); - tv->clip_to_viewport (); } else { tv->hide (); } @@ -527,40 +566,85 @@ EditorRoutes::redisplay () } /* whenever we go idle, update the track view list to reflect the new order. - we can't do this here, because we could mess up something that is traversing - the track order and has caused a redisplay of the list. - */ + * we can't do this here, because we could mess up something that is traversing + * the track order and has caused a redisplay of the list. + */ Glib::signal_idle().connect (sigc::mem_fun (*_editor, &Editor::sync_track_view_list_and_routes)); - _editor->reset_controls_layout_height (position); - _editor->reset_controls_layout_width (); - _editor->full_canvas_height = position + _editor->canvas_timebars_vsize; - _editor->vertical_adjustment.set_upper (_editor->full_canvas_height); + _editor->reset_controls_layout_height (position); + _editor->reset_controls_layout_width (); + _editor->_full_canvas_height = position; - if ((_editor->vertical_adjustment.get_value() + _editor->_canvas_height) > _editor->vertical_adjustment.get_upper()) { + if ((_editor->vertical_adjustment.get_value() + _editor->_visible_canvas_height) > _editor->vertical_adjustment.get_upper()) { /* - We're increasing the size of the canvas while the bottom is visible. - We scroll down to keep in step with the controls layout. - */ - _editor->vertical_adjustment.set_value (_editor->full_canvas_height - _editor->_canvas_height); + * We're increasing the size of the canvas while the bottom is visible. + * We scroll down to keep in step with the controls layout. + */ + _editor->vertical_adjustment.set_value (_editor->_full_canvas_height - _editor->_visible_canvas_height); } } void -EditorRoutes::route_deleted (Gtk::TreeModel::Path const &) +EditorRoutes::redisplay () { - /* this happens as the second step of a DnD within the treeview as well - as when a row/route is actually deleted. - */ + if (!_session || _session->deletion_in_progress()) { + return; + } + + if (_no_redisplay) { + _redisplay_on_resume = true; + return; + } + + // model deprecated g_atomic_int_exchange_and_add(, 1) + g_atomic_int_inc(const_cast(&_redisplay_active)); + if (!g_atomic_int_compare_and_exchange (const_cast(&_redisplay_active), 1, 1)) { + /* recursive re-display can happen if redisplay shows/hides a TrackView + * which has children and their display status changes as result. + */ + return; + } + + redisplay_real (); + + while (!g_atomic_int_compare_and_exchange (const_cast(&_redisplay_active), 1, 0)) { + g_atomic_int_set(const_cast(&_redisplay_active), 1); + redisplay_real (); + } +} + +void +EditorRoutes::row_deleted (Gtk::TreeModel::Path const &) +{ + if (!_session || _session->deletion_in_progress()) { + return; + } + /* this happens as the second step of a DnD within the treeview, and + * when a route is actually removed. we don't differentiate between + * the two cases. + * + * note that the sync_presentation_info_from_treeview() step may not + * actually change any presentation info (e.g. the last track may be + * removed, so all other tracks keep the same presentation info), which + * means that no redisplay would happen. so we have to force a + * redisplay. + */ + DEBUG_TRACE (DEBUG::OrderKeys, "editor routes treeview row deleted\n"); - sync_order_keys_from_treeview (); + + DisplaySuspender ds; + sync_presentation_info_from_treeview (); } void EditorRoutes::reordered (TreeModel::Path const &, TreeModel::iterator const &, int* /*what*/) { + /* reordering implies that RID's will change, so + sync_presentation_info_from_treeview() will cause a redisplay. + */ + DEBUG_TRACE (DEBUG::OrderKeys, "editor routes treeview reordered\n"); - sync_order_keys_from_treeview (); + sync_presentation_info_from_treeview (); } void @@ -570,6 +654,7 @@ EditorRoutes::visible_changed (std::string const & path) return; } + DisplaySuspender ds; TreeIter iter; if ((iter = _model->get_iter (path))) { @@ -601,24 +686,19 @@ void EditorRoutes::routes_added (list routes) { PBD::Unwinder at (_adding_routes, true); - bool from_scratch = (_model->children().size() == 0); Gtk::TreeModel::Children::iterator insert_iter = _model->children().end(); for (Gtk::TreeModel::Children::iterator it = _model->children().begin(); it != _model->children().end(); ++it) { boost::shared_ptr r = (*it)[_columns.route]; - if (r->order_key() == (routes.front()->route()->order_key() + routes.size())) { + if (r->presentation_info().group_order() == (routes.front()->route()->presentation_info().group_order() + routes.size())) { insert_iter = it; break; } } - if(!from_scratch) { - _editor->selection->tracks.clear(); - } - - suspend_redisplay (); + DisplaySuspender ds; _display.set_model (Glib::RefPtr()); @@ -646,14 +726,10 @@ EditorRoutes::routes_added (list routes) row[_columns.mute_state] = (*x)->route()->muted() ? Gtkmm2ext::ExplicitActive : Gtkmm2ext::Off; row[_columns.solo_state] = RouteUI::solo_active_state ((*x)->route()); row[_columns.solo_visible] = !(*x)->route()->is_master (); - row[_columns.solo_isolate_state] = (*x)->route()->solo_isolated(); - row[_columns.solo_safe_state] = (*x)->route()->solo_safe(); + row[_columns.solo_isolate_state] = (*x)->route()->solo_isolate_control()->solo_isolated(); + row[_columns.solo_safe_state] = (*x)->route()->solo_safe_control()->solo_safe(); row[_columns.name_editable] = true; - if (!from_scratch) { - _editor->selection->add(*x); - } - boost::weak_ptr wr ((*x)->route()); (*x)->route()->gui_changed.connect (*this, MISSING_INVALIDATOR, boost::bind (&EditorRoutes::handle_gui_changes, this, _1, _2), gui_context()); @@ -661,7 +737,8 @@ EditorRoutes::routes_added (list routes) if ((*x)->is_track()) { boost::shared_ptr t = boost::dynamic_pointer_cast ((*x)->route()); - t->RecordEnableChanged.connect (*this, MISSING_INVALIDATOR, boost::bind (&EditorRoutes::update_rec_display, this), gui_context()); + t->rec_enable_control()->Changed.connect (*this, MISSING_INVALIDATOR, boost::bind (&EditorRoutes::update_rec_display, this), gui_context()); + t->rec_safe_control()->Changed.connect (*this, MISSING_INVALIDATOR, boost::bind (&EditorRoutes::update_rec_display, this), gui_context()); } if ((*x)->is_midi_track()) { @@ -670,29 +747,29 @@ EditorRoutes::routes_added (list routes) t->InputActiveChanged.connect (*this, MISSING_INVALIDATOR, boost::bind (&EditorRoutes::update_input_active_display, this), gui_context()); } - (*x)->route()->mute_changed.connect (*this, MISSING_INVALIDATOR, boost::bind (&EditorRoutes::update_mute_display, this), gui_context()); - (*x)->route()->solo_changed.connect (*this, MISSING_INVALIDATOR, boost::bind (&EditorRoutes::update_solo_display, this, _1), gui_context()); - (*x)->route()->listen_changed.connect (*this, MISSING_INVALIDATOR, boost::bind (&EditorRoutes::update_solo_display, this, _1), gui_context()); - (*x)->route()->solo_isolated_changed.connect (*this, MISSING_INVALIDATOR, boost::bind (&EditorRoutes::update_solo_isolate_display, this), gui_context()); - (*x)->route()->solo_safe_changed.connect (*this, MISSING_INVALIDATOR, boost::bind (&EditorRoutes::update_solo_safe_display, this), gui_context()); + (*x)->route()->mute_control()->Changed.connect (*this, MISSING_INVALIDATOR, boost::bind (&EditorRoutes::update_mute_display, this), gui_context()); + (*x)->route()->solo_control()->Changed.connect (*this, MISSING_INVALIDATOR, boost::bind (&EditorRoutes::update_solo_display, this), gui_context()); + (*x)->route()->solo_isolate_control()->Changed.connect (*this, MISSING_INVALIDATOR, boost::bind (&EditorRoutes::update_solo_isolate_display, this), gui_context()); + (*x)->route()->solo_safe_control()->Changed.connect (*this, MISSING_INVALIDATOR, boost::bind (&EditorRoutes::update_solo_safe_display, this), gui_context()); + (*x)->route()->active_changed.connect (*this, MISSING_INVALIDATOR, boost::bind (&EditorRoutes::update_active_display, this), gui_context ()); } update_rec_display (); update_mute_display (); - update_solo_display (true); + update_solo_display (); update_solo_isolate_display (); update_solo_safe_display (); update_input_active_display (); update_active_display (); - resume_redisplay (); _display.set_model (_model); /* now update route order keys from the treeview/track display order */ - - sync_order_keys_from_treeview (); + if (!from_scratch) { + sync_presentation_info_from_treeview (); + } } void @@ -706,7 +783,6 @@ EditorRoutes::handle_gui_changes (string const & what, void*) /* Optional :make tracks change height while it happens, instead of on first-idle */ - //update_canvas_now (); redisplay (); } @@ -725,12 +801,13 @@ EditorRoutes::route_removed (TimeAxisView *tv) for (ri = rows.begin(); ri != rows.end(); ++ri) { if ((*ri)[_columns.tv] == tv) { + PBD::Unwinder uw (_route_deletion_in_progress, true); _model->erase (ri); break; } } - /* the deleted signal for the treeview/model will take + /* the deleted signal for the treeview/model will take care of any updates. */ } @@ -765,12 +842,8 @@ EditorRoutes::route_property_changed (const PropertyChange& what_changed, boost: void EditorRoutes::update_active_display () { - TreeModel::Children rows = _model->children(); - TreeModel::Children::iterator i; - - for (i = rows.begin(); i != rows.end(); ++i) { - boost::shared_ptr route = (*i)[_columns.route]; - (*i)[_columns.active] = route->active (); + if (g_atomic_int_compare_and_exchange (const_cast(&_queue_tv_update), 0, 1)) { + Glib::signal_idle().connect (sigc::mem_fun (*this, &EditorRoutes::idle_update_mute_rec_solo_etc)); } } @@ -780,7 +853,7 @@ EditorRoutes::update_visibility () TreeModel::Children rows = _model->children(); TreeModel::Children::iterator i; - suspend_redisplay (); + DisplaySuspender ds; for (i = rows.begin(); i != rows.end(); ++i) { TimeAxisView *tv = (*i)[_columns.tv]; @@ -790,9 +863,7 @@ EditorRoutes::update_visibility () /* force route order keys catch up with visibility changes */ - sync_order_keys_from_treeview (); - - resume_redisplay (); + sync_presentation_info_from_treeview (); } void @@ -835,118 +906,63 @@ EditorRoutes::reset_remote_control_ids () return; } - TreeModel::Children rows = _model->children(); - - if (rows.empty()) { - return; - } - - - DEBUG_TRACE (DEBUG::OrderKeys, "editor reset remote control ids\n"); - - TreeModel::Children::iterator ri; - bool rid_change = false; - uint32_t rid = 1; - uint32_t invisible_key = UINT32_MAX; - - for (ri = rows.begin(); ri != rows.end(); ++ri) { - - boost::shared_ptr route = (*ri)[_columns.route]; - bool visible = (*ri)[_columns.visible]; - - - if (!route->is_master() && !route->is_monitor()) { - - uint32_t new_rid = (visible ? rid : invisible_key--); - - if (new_rid != route->remote_control_id()) { - route->set_remote_control_id_explicit (new_rid); - rid_change = true; - } - - if (visible) { - rid++; - } - - } - } - - if (rid_change) { - /* tell the world that we changed the remote control IDs */ - _session->notify_remote_id_change (); - } + sync_presentation_info_from_treeview (); } - - void -EditorRoutes::sync_order_keys_from_treeview () +EditorRoutes::sync_presentation_info_from_treeview () { if (_ignore_reorder || !_session || _session->deletion_in_progress()) { return; } TreeModel::Children rows = _model->children(); - + if (rows.empty()) { return; } - DEBUG_TRACE (DEBUG::OrderKeys, "editor sync order keys from treeview\n"); TreeModel::Children::iterator ri; - bool changed = false; - bool rid_change = false; - uint32_t order = 0; - uint32_t rid = 1; - uint32_t invisible_key = UINT32_MAX; + bool change = false; + PresentationInfo::order_t order = 0; + + /* hmm, problem ... editor doesn't represent all Stripables... we can't + reset the whole presentation order from here. + */ for (ri = rows.begin(); ri != rows.end(); ++ri) { boost::shared_ptr route = (*ri)[_columns.route]; bool visible = (*ri)[_columns.visible]; - uint32_t old_key = route->order_key (); - - if (order != old_key) { - route->set_order_key (order); - - changed = true; + if (route->presentation_info().special ()) { + continue; } - if ((Config->get_remote_model() == MixerOrdered) && !route->is_master() && !route->is_monitor()) { - - uint32_t new_rid = (visible ? rid : invisible_key--); - - if (new_rid != route->remote_control_id()) { - route->set_remote_control_id_explicit (new_rid); - rid_change = true; - } - - if (visible) { - rid++; - } + if (!visible) { + route->presentation_info().set_flag (PresentationInfo::Hidden); + } else { + route->presentation_info().unset_flag (PresentationInfo::Hidden); + } + if (order != route->presentation_info().group_order()) { + route->set_presentation_group_order_explicit (order); + change = true; } ++order; } - - if (changed) { - /* tell the world that we changed the editor sort keys */ - _session->sync_order_keys (); - } - if (rid_change) { - /* tell the world that we changed the remote control IDs */ - _session->notify_remote_id_change (); + if (change) { + Stripable::PresentationInfoChange(); /* EMIT SIGNAL */ } } void -EditorRoutes::sync_treeview_from_order_keys () +EditorRoutes::sync_treeview_from_presentation_info () { - /* Some route order key(s) have been changed, make sure that + /* Some route order key(s) have been changed, make sure that we update out tree/list model and GUI to reflect the change. */ @@ -954,7 +970,7 @@ EditorRoutes::sync_treeview_from_order_keys () return; } - DEBUG_TRACE (DEBUG::OrderKeys, "editor sync model from order keys.\n"); + DEBUG_TRACE (DEBUG::OrderKeys, "editor sync model from presentation info.\n"); /* we could get here after either a change in the Mixer or Editor sort * order, but either way, the mixer order keys reflect the intended @@ -970,21 +986,25 @@ EditorRoutes::sync_treeview_from_order_keys () return; } - OrderKeySortedRoutes sorted_routes; + OrderingKeys sorted; for (TreeModel::Children::iterator ri = rows.begin(); ri != rows.end(); ++ri, ++old_order) { boost::shared_ptr route = (*ri)[_columns.route]; - sorted_routes.push_back (RoutePlusOrderKey (route, old_order, route->order_key ())); + sorted.push_back (OrderKeys (old_order, route->presentation_info().group_order())); + DEBUG_TRACE (DEBUG::OrderKeys, string_compose ("build new order: route %3 old = %1 new = %1\n", + old_order, + route->presentation_info().group_order(), + route->name())); } SortByNewDisplayOrder cmp; - sort (sorted_routes.begin(), sorted_routes.end(), cmp); - neworder.assign (sorted_routes.size(), 0); + sort (sorted.begin(), sorted.end(), cmp); + neworder.assign (sorted.size(), 0); uint32_t n = 0; - - for (OrderKeySortedRoutes::iterator sr = sorted_routes.begin(); sr != sorted_routes.end(); ++sr, ++n) { + + for (OrderingKeys::iterator sr = sorted.begin(); sr != sorted.end(); ++sr, ++n) { neworder[n] = sr->old_display_order; @@ -992,8 +1012,8 @@ EditorRoutes::sync_treeview_from_order_keys () changed = true; } - DEBUG_TRACE (DEBUG::OrderKeys, string_compose ("EDITOR change order for %1 from %2 to %3\n", - sr->route->name(), sr->old_display_order, n)); + DEBUG_TRACE (DEBUG::OrderKeys, string_compose ("EDITOR change order from %1 to %2\n", + sr->old_display_order, n)); } if (changed) { @@ -1010,7 +1030,7 @@ EditorRoutes::hide_all_tracks (bool /*with_select*/) TreeModel::Children rows = _model->children(); TreeModel::Children::iterator i; - suspend_redisplay (); + DisplaySuspender ds; for (i = rows.begin(); i != rows.end(); ++i) { @@ -1023,14 +1043,6 @@ EditorRoutes::hide_all_tracks (bool /*with_select*/) row[_columns.visible] = false; } - - resume_redisplay (); - - /* XXX this seems like a hack and half, but its not clear where to put this - otherwise. - */ - - //reset_scrolling_region (); } void @@ -1039,7 +1051,7 @@ EditorRoutes::set_all_tracks_visibility (bool yn) TreeModel::Children rows = _model->children(); TreeModel::Children::iterator i; - suspend_redisplay (); + DisplaySuspender ds; for (i = rows.begin(); i != rows.end(); ++i) { @@ -1057,9 +1069,7 @@ EditorRoutes::set_all_tracks_visibility (bool yn) /* force route order keys catch up with visibility changes */ - sync_order_keys_from_treeview (); - - resume_redisplay (); + sync_presentation_info_from_treeview (); } void @@ -1068,7 +1078,7 @@ EditorRoutes::set_all_audio_midi_visibility (int tracks, bool yn) TreeModel::Children rows = _model->children(); TreeModel::Children::iterator i; - suspend_redisplay (); + DisplaySuspender ds; for (i = rows.begin(); i != rows.end(); ++i) { @@ -1085,17 +1095,20 @@ EditorRoutes::set_all_audio_midi_visibility (int tracks, bool yn) if ((atv = dynamic_cast(tv)) != 0) { switch (tracks) { case 0: + atv->set_marked_for_display (yn); (*i)[_columns.visible] = yn; break; case 1: if (atv->is_audio_track()) { + atv->set_marked_for_display (yn); (*i)[_columns.visible] = yn; } break; case 2: if (!atv->is_audio_track()) { + atv->set_marked_for_display (yn); (*i)[_columns.visible] = yn; } break; @@ -1104,11 +1117,13 @@ EditorRoutes::set_all_audio_midi_visibility (int tracks, bool yn) else if ((mtv = dynamic_cast(tv)) != 0) { switch (tracks) { case 0: + mtv->set_marked_for_display (yn); (*i)[_columns.visible] = yn; break; case 3: if (mtv->is_midi_track()) { + mtv->set_marked_for_display (yn); (*i)[_columns.visible] = yn; } break; @@ -1119,9 +1134,7 @@ EditorRoutes::set_all_audio_midi_visibility (int tracks, bool yn) /* force route order keys catch up with visibility changes */ - sync_order_keys_from_treeview (); - - resume_redisplay (); + sync_presentation_info_from_treeview (); } void @@ -1172,59 +1185,60 @@ EditorRoutes::hide_all_miditracks () bool EditorRoutes::key_press (GdkEventKey* ev) { - TreeViewColumn *col; - boost::shared_ptr rl (new RouteList); - TreePath path; - - switch (ev->keyval) { - case GDK_Tab: - case GDK_ISO_Left_Tab: - - /* If we appear to be editing something, leave that cleanly and appropriately. - */ - if (name_editable) { - name_editable->editing_done (); - name_editable = 0; - } - - col = _display.get_column (_name_column); // select&focus on name column - - if (Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier)) { - treeview_select_previous (_display, _model, col); - } else { - treeview_select_next (_display, _model, col); - } - - return true; - break; - - case 'm': - if (get_relevant_routes (rl)) { - _session->set_mute (rl, !rl->front()->muted(), Session::rt_cleanup); - } - return true; - break; - - case 's': - if (get_relevant_routes (rl)) { - if (Config->get_solo_control_is_listen_control()) { - _session->set_listen (rl, !rl->front()->listening_via_monitor(), Session::rt_cleanup); + TreeViewColumn *col; + boost::shared_ptr rl (new RouteList); + TreePath path; + + switch (ev->keyval) { + case GDK_Tab: + case GDK_ISO_Left_Tab: + + /* If we appear to be editing something, leave that cleanly and appropriately. */ + if (name_editable) { + name_editable->editing_done (); + name_editable = 0; + } + + col = _display.get_column (_name_column); // select&focus on name column + + if (Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier)) { + treeview_select_previous (_display, _model, col); } else { - _session->set_solo (rl, !rl->front()->self_soloed(), Session::rt_cleanup); + treeview_select_next (_display, _model, col); } - } - return true; - break; - case 'r': - if (get_relevant_routes (rl)) { - _session->set_record_enabled (rl, !rl->front()->record_enabled(), Session::rt_cleanup); - } - break; + return true; + break; + + case 'm': + if (get_relevant_routes (rl)) { + _session->set_controls (route_list_to_control_list (rl, &Route::mute_control), rl->front()->muted() ? 0.0 : 1.0, Controllable::NoGroup); + } + return true; + break; - default: - break; - } + case 's': + if (get_relevant_routes (rl)) { + _session->set_controls (route_list_to_control_list (rl, &Route::solo_control), rl->front()->self_soloed() ? 0.0 : 1.0, Controllable::NoGroup); + } + return true; + break; + + case 'r': + if (get_relevant_routes (rl)) { + for (RouteList::const_iterator r = rl->begin(); r != rl->end(); ++r) { + boost::shared_ptr t = boost::dynamic_pointer_cast (*r); + if (t) { + _session->set_controls (route_list_to_control_list (rl, &Track::rec_enable_control), !t->rec_enable_control()->get_value(), Controllable::NoGroup); + break; + } + } + } + break; + + default: + break; + } return false; } @@ -1232,44 +1246,44 @@ EditorRoutes::key_press (GdkEventKey* ev) bool EditorRoutes::get_relevant_routes (boost::shared_ptr rl) { - TimeAxisView* tv; - RouteTimeAxisView* rtv; + TimeAxisView* tv; + RouteTimeAxisView* rtv; RefPtr selection = _display.get_selection(); - TreePath path; - TreeIter iter; + TreePath path; + TreeIter iter; - if (selection->count_selected_rows() != 0) { + if (selection->count_selected_rows() != 0) { - /* use selection */ + /* use selection */ - RefPtr tm = RefPtr::cast_dynamic (_model); - iter = selection->get_selected (tm); + RefPtr tm = RefPtr::cast_dynamic (_model); + iter = selection->get_selected (tm); - } else { - /* use mouse pointer */ + } else { + /* use mouse pointer */ - int x, y; - int bx, by; + int x, y; + int bx, by; - _display.get_pointer (x, y); - _display.convert_widget_to_bin_window_coords (x, y, bx, by); + _display.get_pointer (x, y); + _display.convert_widget_to_bin_window_coords (x, y, bx, by); - if (_display.get_path_at_pos (bx, by, path)) { - iter = _model->get_iter (path); - } - } + if (_display.get_path_at_pos (bx, by, path)) { + iter = _model->get_iter (path); + } + } - if (iter) { - tv = (*iter)[_columns.tv]; - if (tv) { - rtv = dynamic_cast(tv); - if (rtv) { - rl->push_back (rtv->route()); - } - } - } + if (iter) { + tv = (*iter)[_columns.tv]; + if (tv) { + rtv = dynamic_cast(tv); + if (rtv) { + rl->push_back (rtv->route()); + } + } + } - return !rl->empty(); + return !rl->empty(); } bool @@ -1296,90 +1310,92 @@ EditorRoutes::button_press (GdkEventButton* ev) //Scroll editor canvas to selected track if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) { - // Get the model row. Gtk::TreeModel::Row row = *_model->get_iter (path); - TimeAxisView *tv = row[_columns.tv]; - int y_pos = tv->y_position(); - - //Clamp the y pos so that we do not extend beyond the canvas full height. - if (_editor->full_canvas_height - y_pos < _editor->_canvas_height){ - y_pos = _editor->full_canvas_height - _editor->_canvas_height; + if (tv) { + _editor->ensure_time_axis_view_is_visible (*tv, true); } + } + + return false; +} + +void +EditorRoutes::selection_changed () +{ + _editor->begin_reversible_selection_op (X_("Select Track from Route List")); + + if (_display.get_selection()->count_selected_rows() > 0) { + + TreeIter iter; + TreeView::Selection::ListHandle_Path rows = _display.get_selection()->get_selected_rows (); + TrackViewList selected; + + _editor->get_selection().clear_regions (); + + for (TreeView::Selection::ListHandle_Path::iterator i = rows.begin(); i != rows.end(); ++i) { + + if ((iter = _model->get_iter (*i))) { + + TimeAxisView* tv = (*iter)[_columns.tv]; + selected.push_back (tv); + } - //Only scroll to if the track is visible - if(y_pos != -1){ - _editor->reset_y_origin (y_pos); } + + _editor->get_selection().set (selected); + _editor->ensure_time_axis_view_is_visible (*(selected.front()), true); + + } else { + _editor->get_selection().clear_tracks (); } - return false; + _editor->commit_reversible_selection_op (); } bool EditorRoutes::selection_filter (Glib::RefPtr const &, TreeModel::Path const&, bool /*selected*/) { - if (selection_countdown) { - if (--selection_countdown == 0) { - return true; - } else { - /* no selection yet ... */ - return false; - } - } + if (selection_countdown) { + if (--selection_countdown == 0) { + return true; + } else { + /* no selection yet ... */ + return false; + } + } return true; } -struct EditorOrderRouteSorter { - bool operator() (boost::shared_ptr a, boost::shared_ptr b) { - if (a->is_master()) { - /* master before everything else */ - return true; - } else if (b->is_master()) { - /* everything else before master */ - return false; - } - return a->order_key () < b->order_key (); - } +struct PresentationInfoRouteSorter +{ + bool operator() (boost::shared_ptr a, boost::shared_ptr b) { + if (a->is_master()) { + /* master before everything else */ + return true; + } else if (b->is_master()) { + /* everything else before master */ + return false; + } + return a->presentation_info().global_order () < b->presentation_info().global_order (); + } }; void EditorRoutes::initial_display () { - suspend_redisplay (); + DisplaySuspender ds; _model->clear (); if (!_session) { - resume_redisplay (); return; } - boost::shared_ptr routes = _session->get_routes(); - - if (ARDOUR_UI::instance()->session_is_new ()) { - - /* new session: stamp all routes with the right editor order - * key - */ - - _editor->add_routes (*(routes.get())); - - } else { - - /* existing session: sort a copy of the route list by - * editor-order and add its contents to the display. - */ - - RouteList r (*routes); - EditorOrderRouteSorter sorter; - - r.sort (sorter); - _editor->add_routes (r); - - } + RouteList r (*_session->get_routes()); - resume_redisplay (); + r.sort (PresentationInfoRouteSorter ()); + _editor->add_routes (r); } void @@ -1500,7 +1516,7 @@ EditorRoutes::move_selected_tracks (bool up) } for (leading = view_routes.begin(); leading != view_routes.end(); ++leading) { - uint32_t order = leading->second->order_key (); + uint32_t order = (uint32_t) leading->second->presentation_info().group_order (); neworder.push_back (order); } @@ -1517,7 +1533,7 @@ EditorRoutes::move_selected_tracks (bool up) } assert (*i < (int) neworder.size ()); } -#endif +#endif _model->reorder (neworder); } @@ -1533,7 +1549,7 @@ EditorRoutes::update_input_active_display () if (boost::dynamic_pointer_cast (route)) { boost::shared_ptr mt = boost::dynamic_pointer_cast (route); - + if (mt) { (*i)[_columns.is_input_active] = mt->input_active(); } @@ -1544,16 +1560,32 @@ EditorRoutes::update_input_active_display () void EditorRoutes::update_rec_display () { + if (g_atomic_int_compare_and_exchange (const_cast(&_queue_tv_update), 0, 1)) { + Glib::signal_idle().connect (sigc::mem_fun (*this, &EditorRoutes::idle_update_mute_rec_solo_etc)); + } +} + +bool +EditorRoutes::idle_update_mute_rec_solo_etc() +{ + g_atomic_int_set (const_cast(&_queue_tv_update), 0); TreeModel::Children rows = _model->children(); TreeModel::Children::iterator i; for (i = rows.begin(); i != rows.end(); ++i) { boost::shared_ptr route = (*i)[_columns.route]; + (*i)[_columns.mute_state] = RouteUI::mute_active_state (_session, route); + (*i)[_columns.solo_state] = RouteUI::solo_active_state (route); + (*i)[_columns.solo_isolate_state] = RouteUI::solo_isolate_active_state (route) ? 1 : 0; + (*i)[_columns.solo_safe_state] = RouteUI::solo_safe_active_state (route) ? 1 : 0; + (*i)[_columns.active] = route->active (); - if (boost::dynamic_pointer_cast (route)) { + boost::shared_ptr trk (boost::dynamic_pointer_cast(route)); + + if (trk) { boost::shared_ptr mt = boost::dynamic_pointer_cast (route); - if (route->record_enabled()) { + if (trk->rec_enable_control()->get_value()) { if (_session->record_status() == Session::Recording) { (*i)[_columns.rec_state] = 1; } else { @@ -1565,56 +1597,44 @@ EditorRoutes::update_rec_display () (*i)[_columns.rec_state] = 0; } - (*i)[_columns.name_editable] = !route->record_enabled (); + (*i)[_columns.rec_safe] = !trk->rec_safe_control()->get_value(); + (*i)[_columns.name_editable] = !trk->rec_enable_control()->get_value(); } } + + return false; // do not call again (until needed) } + void EditorRoutes::update_mute_display () { - TreeModel::Children rows = _model->children(); - TreeModel::Children::iterator i; - - for (i = rows.begin(); i != rows.end(); ++i) { - boost::shared_ptr route = (*i)[_columns.route]; - (*i)[_columns.mute_state] = RouteUI::mute_active_state (_session, route); + if (g_atomic_int_compare_and_exchange (const_cast(&_queue_tv_update), 0, 1)) { + Glib::signal_idle().connect (sigc::mem_fun (*this, &EditorRoutes::idle_update_mute_rec_solo_etc)); } } void -EditorRoutes::update_solo_display (bool /* selfsoloed */) +EditorRoutes::update_solo_display () { - TreeModel::Children rows = _model->children(); - TreeModel::Children::iterator i; - - for (i = rows.begin(); i != rows.end(); ++i) { - boost::shared_ptr route = (*i)[_columns.route]; - (*i)[_columns.solo_state] = RouteUI::solo_active_state (route); + if (g_atomic_int_compare_and_exchange (const_cast(&_queue_tv_update), 0, 1)) { + Glib::signal_idle().connect (sigc::mem_fun (*this, &EditorRoutes::idle_update_mute_rec_solo_etc)); } } void EditorRoutes::update_solo_isolate_display () { - TreeModel::Children rows = _model->children(); - TreeModel::Children::iterator i; - - for (i = rows.begin(); i != rows.end(); ++i) { - boost::shared_ptr route = (*i)[_columns.route]; - (*i)[_columns.solo_isolate_state] = RouteUI::solo_isolate_active_state (route) ? 1 : 0; + if (g_atomic_int_compare_and_exchange (const_cast(&_queue_tv_update), 0, 1)) { + Glib::signal_idle().connect (sigc::mem_fun (*this, &EditorRoutes::idle_update_mute_rec_solo_etc)); } } void EditorRoutes::update_solo_safe_display () { - TreeModel::Children rows = _model->children(); - TreeModel::Children::iterator i; - - for (i = rows.begin(); i != rows.end(); ++i) { - boost::shared_ptr route = (*i)[_columns.route]; - (*i)[_columns.solo_safe_state] = RouteUI::solo_safe_active_state (route) ? 1 : 0; + if (g_atomic_int_compare_and_exchange (const_cast(&_queue_tv_update), 0, 1)) { + Glib::signal_idle().connect (sigc::mem_fun (*this, &EditorRoutes::idle_update_mute_rec_solo_etc)); } } @@ -1640,21 +1660,21 @@ EditorRoutes::clear () void EditorRoutes::name_edit_started (CellEditable* ce, const Glib::ustring&) { - name_editable = ce; + name_editable = ce; - /* give it a special name */ + /* give it a special name */ - Gtk::Entry *e = dynamic_cast (ce); + Gtk::Entry *e = dynamic_cast (ce); - if (e) { - e->set_name (X_("RouteNameEditorEntry")); - } + if (e) { + e->set_name (X_("RouteNameEditorEntry")); + } } void EditorRoutes::name_edit (std::string const & path, std::string const & new_text) { - name_editable = 0; + name_editable = 0; TreeIter iter = _model->get_iter (path); @@ -1688,14 +1708,26 @@ EditorRoutes::show_tracks_with_regions_at_playhead () } } - suspend_redisplay (); + DisplaySuspender ds; TreeModel::Children rows = _model->children (); for (TreeModel::Children::iterator i = rows.begin(); i != rows.end(); ++i) { TimeAxisView* tv = (*i)[_columns.tv]; - (*i)[_columns.visible] = (show.find (tv) != show.end()); + bool to_show = (show.find (tv) != show.end()); + + tv->set_marked_for_display (to_show); + (*i)[_columns.visible] = to_show; } - resume_redisplay (); + /* force route order keys catch up with visibility changes + */ + + sync_presentation_info_from_treeview (); } +int +EditorRoutes::plugin_setup (boost::shared_ptr r, boost::shared_ptr pi, ARDOUR::Route::PluginSetupOptions flags) +{ + PluginSetupDialog psd (r, pi, flags); + return psd.run (); +}