X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_routes.cc;h=588b900f192b3b7a875b5fd93a7bdbf517712d4b;hb=dac57703ccd7205ac94c14b407b802a69f4187f1;hp=8372287509ab4f17f1805aaa1fcb1fe2c2879e00;hpb=74f313dd6b52c5bd36536d90e7b9e62b0679087b;p=ardour.git diff --git a/gtk2_ardour/editor_routes.cc b/gtk2_ardour/editor_routes.cc index 8372287509..588b900f19 100644 --- a/gtk2_ardour/editor_routes.cc +++ b/gtk2_ardour/editor_routes.cc @@ -17,37 +17,38 @@ */ +#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/midi_track.h" +#include "ardour/route.h" #include "ardour/session.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 "route_sorter.h" -#include "editor_group_tabs.h" -#include "editor_routes.h" +#include "tooltips.h" +#include "utils.h" #include "i18n.h" @@ -61,21 +62,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) - , _route_deletion_in_progress (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; @@ -185,7 +189,7 @@ 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; @@ -201,22 +205,22 @@ 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_("Mute|M"), _("Muted") }, + { 6, S_("Solo|S"), _("Soloed") }, + { 7, S_("SoloIso|SI"), _("Solo Isolated") }, + { 8, 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 (); } @@ -234,7 +238,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); @@ -272,20 +276,20 @@ 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::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()); } @@ -293,29 +297,29 @@ EditorRoutes::EditorRoutes (Editor* e) 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 @@ -325,27 +329,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 @@ -358,6 +362,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()); } } @@ -382,6 +393,7 @@ EditorRoutes::on_input_active_changed (std::string const & path_string) void EditorRoutes::on_tv_rec_enable_changed (std::string const & path_string) { + DisplaySuspender ds; // Get the model row that has been toggled. Gtk::TreeModel::Row row = *_model->get_iter (Gtk::TreeModel::Path (path_string)); @@ -478,7 +490,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 @@ -492,19 +504,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) { @@ -529,36 +537,62 @@ 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->reset_controls_layout_height (position); + _editor->reset_controls_layout_width (); _editor->_full_canvas_height = position; 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. - */ + * 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::redisplay () +{ + 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(&_redisplay_active); + if (!g_atomic_int_compare_and_exchange (&_redisplay_active, 1, 1)) { + return; + } + + redisplay_real (); + + while (!g_atomic_int_compare_and_exchange (&_redisplay_active, 1, 0)) { + g_atomic_int_set(&_redisplay_active, 1); + redisplay_real (); + } +} + void EditorRoutes::row_deleted (Gtk::TreeModel::Path const &) { /* 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_orders_keys() step may not actually change any - RID's (e.g. the last track may be removed, so all other tracks keep - the same RID), which means that no redisplay would happen. so we - have to force a redisplay. - */ + * when a route is actually removed. we don't differentiate between + * the two cases. + * + * note that the sync_orders_keys() step may not actually change any + * RID's (e.g. the last track may be removed, so all other tracks keep + * the same RID), which means that no redisplay would happen. so we + * have to force a redisplay. + */ DEBUG_TRACE (DEBUG::OrderKeys, "editor routes treeview row deleted\n"); @@ -616,7 +650,6 @@ 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(); @@ -629,10 +662,6 @@ EditorRoutes::routes_added (list routes) } } - if(!from_scratch) { - _editor->selection->tracks.clear(); - } - DisplaySuspender ds; _display.set_model (Glib::RefPtr()); @@ -665,10 +694,6 @@ EditorRoutes::routes_added (list routes) row[_columns.solo_safe_state] = (*x)->route()->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()); @@ -679,12 +704,12 @@ EditorRoutes::routes_added (list routes) t->RecordEnableChanged.connect (*this, MISSING_INVALIDATOR, boost::bind (&EditorRoutes::update_rec_display, this), gui_context()); } - if ((*x)->is_midi_track()) { - boost::shared_ptr t = boost::dynamic_pointer_cast ((*x)->route()); + if ((*x)->is_midi_track()) { + boost::shared_ptr t = boost::dynamic_pointer_cast ((*x)->route()); t->StepEditStatusChange.connect (*this, MISSING_INVALIDATOR, boost::bind (&EditorRoutes::update_rec_display, this), gui_context()); - t->InputActiveChanged.connect (*this, MISSING_INVALIDATOR, boost::bind (&EditorRoutes::update_input_active_display, this), gui_context()); - } - + 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()); @@ -705,8 +730,9 @@ EditorRoutes::routes_added (list routes) _display.set_model (_model); /* now update route order keys from the treeview/track display order */ - - sync_order_keys_from_treeview (); + if (!from_scratch) { + sync_order_keys_from_treeview (); + } } void @@ -735,18 +761,16 @@ EditorRoutes::route_removed (TimeAxisView *tv) TreeModel::Children rows = _model->children(); TreeModel::Children::iterator ri; - bool found = false; for (ri = rows.begin(); ri != rows.end(); ++ri) { if ((*ri)[_columns.tv] == tv) { - PBD::Unwinder uw (_route_deletion_in_progress, true); + PBD::Unwinder uw (_route_deletion_in_progress, true); _model->erase (ri); - found = true; break; } } - /* the deleted signal for the treeview/model will take + /* the deleted signal for the treeview/model will take care of any updates. */ } @@ -781,12 +805,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 (&_queue_tv_update, 0, 1)) { + Glib::signal_idle().connect (sigc::mem_fun (*this, &EditorRoutes::idle_update_mute_rec_solo_etc)); } } @@ -796,7 +816,7 @@ EditorRoutes::update_visibility () TreeModel::Children rows = _model->children(); TreeModel::Children::iterator i; - DisplaySuspender ds (); + DisplaySuspender ds; for (i = rows.begin(); i != rows.end(); ++i) { TimeAxisView *tv = (*i)[_columns.tv]; @@ -850,12 +870,12 @@ EditorRoutes::reset_remote_control_ids () } TreeModel::Children rows = _model->children(); - + if (rows.empty()) { return; } - + DEBUG_TRACE (DEBUG::OrderKeys, "editor reset remote control ids\n"); TreeModel::Children::iterator ri; @@ -865,19 +885,28 @@ EditorRoutes::reset_remote_control_ids () for (ri = rows.begin(); ri != rows.end(); ++ri) { + /* skip two special values */ + + if (rid == Route::MasterBusRemoteControlID) { + rid++; + } + + if (rid == Route::MonitorBusRemoteControlID) { + rid++; + } + 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); + route->set_remote_control_id_explicit (new_rid); rid_change = true; } - + if (visible) { rid++; } @@ -900,12 +929,12 @@ EditorRoutes::sync_order_keys_from_treeview () } TreeModel::Children rows = _model->children(); - + if (rows.empty()) { return; } - + DEBUG_TRACE (DEBUG::OrderKeys, "editor sync order keys from treeview\n"); TreeModel::Children::iterator ri; @@ -933,10 +962,10 @@ EditorRoutes::sync_order_keys_from_treeview () uint32_t new_rid = (visible ? rid : invisible_key--); if (new_rid != route->remote_control_id()) { - route->set_remote_control_id_explicit (new_rid); + route->set_remote_control_id_explicit (new_rid); rid_change = true; } - + if (visible) { rid++; } @@ -945,7 +974,7 @@ EditorRoutes::sync_order_keys_from_treeview () ++order; } - + if (changed) { /* tell the world that we changed the editor sort keys */ _session->sync_order_keys (); @@ -960,7 +989,7 @@ EditorRoutes::sync_order_keys_from_treeview () void EditorRoutes::sync_treeview_from_order_keys () { - /* 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. */ @@ -997,7 +1026,7 @@ EditorRoutes::sync_treeview_from_order_keys () neworder.assign (sorted_routes.size(), 0); uint32_t n = 0; - + for (OrderKeySortedRoutes::iterator sr = sorted_routes.begin(); sr != sorted_routes.end(); ++sr, ++n) { neworder[n] = sr->old_display_order; @@ -1089,17 +1118,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; @@ -1108,11 +1140,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; @@ -1174,59 +1208,58 @@ 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; - default: - 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); + } else { + _session->set_solo (rl, !rl->front()->self_soloed(), Session::rt_cleanup); + } + } + return true; + break; + + case 'r': + if (get_relevant_routes (rl)) { + _session->set_record_enabled (rl, !rl->front()->record_enabled(), Session::rt_cleanup); + } + break; + + default: + break; + } return false; } @@ -1234,44 +1267,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 @@ -1312,6 +1345,8 @@ EditorRoutes::button_press (GdkEventButton* ev) 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; @@ -1327,7 +1362,7 @@ EditorRoutes::selection_changed () TimeAxisView* tv = (*iter)[_columns.tv]; selected.push_back (tv); } - + } _editor->get_selection().set (selected); @@ -1336,33 +1371,36 @@ EditorRoutes::selection_changed () } else { _editor->get_selection().clear_tracks (); } + + _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 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 (); + } }; void @@ -1375,29 +1413,10 @@ EditorRoutes::initial_display () 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 - */ + RouteList r (*_session->get_routes()); - _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); - - } + r.sort (EditorOrderRouteSorter ()); + _editor->add_routes (r); } void @@ -1535,7 +1554,7 @@ EditorRoutes::move_selected_tracks (bool up) } assert (*i < (int) neworder.size ()); } -#endif +#endif _model->reorder (neworder); } @@ -1551,7 +1570,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(); } @@ -1562,12 +1581,25 @@ EditorRoutes::update_input_active_display () void EditorRoutes::update_rec_display () { + if (g_atomic_int_compare_and_exchange (&_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 (&_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 mt = boost::dynamic_pointer_cast (route); @@ -1586,53 +1618,40 @@ EditorRoutes::update_rec_display () (*i)[_columns.name_editable] = !route->record_enabled (); } } + + 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 (&_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 */) { - 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 (&_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 (&_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 (&_queue_tv_update, 0, 1)) { + Glib::signal_idle().connect (sigc::mem_fun (*this, &EditorRoutes::idle_update_mute_rec_solo_etc)); } } @@ -1658,21 +1677,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); @@ -1711,6 +1730,14 @@ EditorRoutes::show_tracks_with_regions_at_playhead () 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; } + + /* force route order keys catch up with visibility changes + */ + + sync_order_keys_from_treeview (); }