X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_routes.cc;h=abdd3f47b1c651b70d35467d1e35e1d96a7a92c5;hb=4ece934e6690b515bfb5dc39ec8d71b9b2be6c48;hp=4f439a43878a60f6af030b5a007075661357730f;hpb=f23f379b37a5f4e68972a5f6c07a814c10503fdb;p=ardour.git diff --git a/gtk2_ardour/editor_routes.cc b/gtk2_ardour/editor_routes.cc index 4f439a4387..abdd3f47b1 100644 --- a/gtk2_ardour/editor_routes.cc +++ b/gtk2_ardour/editor_routes.cc @@ -17,39 +17,47 @@ */ +#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 "ardour/vca.h" +#include "ardour/vca_manager.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 "vca_time_axis.h" +#include "utils.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace ARDOUR; @@ -61,23 +69,25 @@ 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) - , _redisplay_active (0) - , _queue_tv_update (0) - , _menu (0) - , old_focus (0) - , selection_countdown (0) - , name_editable (0) + , _ignore_reorder (false) + , _ignore_selection_change (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; @@ -106,6 +116,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()); @@ -187,12 +214,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); @@ -203,40 +231,41 @@ 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 (); } _display.set_headers_visible (true); - _display.get_selection()->set_mode (SELECTION_SINGLE); + _display.get_selection()->set_mode (SELECTION_MULTIPLE); _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); _display.set_size_request (100, -1); - _display.add_object_drag (_columns.route.index(), "routes"); + _display.add_object_drag (_columns.stripable.index(), "routes"); 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); @@ -274,50 +303,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::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)); + PresentationInfo::Change.connect (*this, MISSING_INVALIDATOR, boost::bind (&EditorRoutes::presentation_info_changed, this, _1), 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 @@ -327,27 +357,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 @@ -360,6 +390,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()); } } @@ -384,17 +421,38 @@ 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)); TimeAxisView* tv = row[_columns.tv]; RouteTimeAxisView *rtv = dynamic_cast (tv); - if (rtv && rtv->track()) { - boost::shared_ptr rl (new RouteList); - rl->push_back (rtv->route()); - _session->set_record_enabled (rl, !rtv->track()->record_enabled(), Session::rt_cleanup); + if (!rtv) { + return; + } + + boost::shared_ptr ac = rtv->route()->rec_enable_control(); + + if (ac) { + ac->set_value (!ac->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) { + return; + } + + boost::shared_ptr ac (rtv->route()->rec_safe_control()); + + if (ac) { + ac->set_value (!ac->get_value(), Controllable::UseGroup); } } @@ -407,10 +465,14 @@ EditorRoutes::on_tv_mute_enable_toggled (std::string const & path_string) TimeAxisView *tv = row[_columns.tv]; 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); + if (!rtv) { + return; + } + + boost::shared_ptr ac (rtv->route()->mute_control()); + + if (ac) { + ac->set_value (!ac->get_value(), Controllable::UseGroup); } } @@ -423,14 +485,14 @@ EditorRoutes::on_tv_solo_enable_toggled (std::string const & path_string) TimeAxisView *tv = row[_columns.tv]; 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); - } + if (!rtv) { + return; + } + + boost::shared_ptr ac (rtv->route()->solo_control()); + + if (ac) { + ac->set_value (!ac->get_value(), Controllable::UseGroup); } } @@ -443,8 +505,14 @@ EditorRoutes::on_tv_solo_isolate_toggled (std::string const & path_string) TimeAxisView *tv = row[_columns.tv]; RouteTimeAxisView* rtv = dynamic_cast (tv); - if (rtv) { - rtv->route()->set_solo_isolated (!rtv->route()->solo_isolated(), this); + if (!rtv) { + return; + } + + boost::shared_ptr ac (rtv->route()->solo_isolate_control()); + + if (ac) { + ac->set_value (!ac->get_value(), Controllable::UseGroup); } } @@ -457,8 +525,14 @@ EditorRoutes::on_tv_solo_safe_toggled (std::string const & path_string) TimeAxisView *tv = row[_columns.tv]; RouteTimeAxisView* rtv = dynamic_cast (tv); - if (rtv) { - rtv->route()->set_solo_safe (!rtv->route()->solo_safe(), this); + if (!rtv) { + return; + } + + boost::shared_ptr ac (rtv->route()->solo_safe_control()); + + if (ac) { + ac->set_value (!ac->get_value(), Controllable::UseGroup); } } @@ -481,7 +555,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 @@ -508,7 +582,6 @@ EditorRoutes::redisplay_real () for (n = 0, position = 0, i = rows.begin(); i != rows.end(); ++i) { TimeAxisView *tv = (*i)[_columns.tv]; - boost::shared_ptr route = (*i)[_columns.route]; if (tv == 0) { // just a "title" row @@ -549,21 +622,28 @@ EditorRoutes::redisplay_real () void EditorRoutes::redisplay () { - if (_no_redisplay || !_session || _session->deletion_in_progress()) { + 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)) { - printf ("SKIP redisplay\n"); + 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 (&_redisplay_active, 1, 0)) { - g_atomic_pointer_set(&_redisplay_active, 1); + while (!g_atomic_int_compare_and_exchange (const_cast(&_redisplay_active), 1, 0)) { + g_atomic_int_set(const_cast(&_redisplay_active), 1); redisplay_real (); } } @@ -571,31 +651,35 @@ EditorRoutes::redisplay () 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_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_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"); DisplaySuspender ds; - sync_order_keys_from_treeview (); + 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_order_keys() will - cause a redisplay. + /* 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 @@ -628,96 +712,131 @@ EditorRoutes::active_changed (std::string const & path) } Gtk::TreeModel::Row row = *_model->get_iter (path); - boost::shared_ptr route = row[_columns.route]; - bool const active = row[_columns.active]; - route->set_active (!active, this); + boost::shared_ptr stripable = row[_columns.stripable]; + boost::shared_ptr route = boost::dynamic_pointer_cast (stripable); + if (route) { + bool const active = row[_columns.active]; + route->set_active (!active, this); + } } void -EditorRoutes::routes_added (list routes) +EditorRoutes::time_axis_views_added (list tavs) { 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())) { + boost::shared_ptr r = (*it)[_columns.stripable]; + + if (r->presentation_info().order() == (tavs.front()->stripable()->presentation_info().order() + tavs.size())) { insert_iter = it; break; } } - if(!from_scratch) { - _editor->selection->tracks.clear(); - } - - DisplaySuspender ds; - _display.set_model (Glib::RefPtr()); - for (list::iterator x = routes.begin(); x != routes.end(); ++x) { + for (list::iterator x = tavs.begin(); x != tavs.end(); ++x) { - boost::shared_ptr midi_trk = boost::dynamic_pointer_cast ((*x)->route()); + VCATimeAxisView* vtav = dynamic_cast (*x); + RouteTimeAxisView* rtav = dynamic_cast (*x); TreeModel::Row row = *(_model->insert (insert_iter)); - row[_columns.text] = (*x)->route()->name(); - row[_columns.visible] = (*x)->marked_for_display(); - row[_columns.active] = (*x)->route()->active (); - row[_columns.tv] = *x; - row[_columns.route] = (*x)->route (); - row[_columns.is_track] = (boost::dynamic_pointer_cast ((*x)->route()) != 0); + boost::shared_ptr stripable; + boost::shared_ptr midi_trk; - if (midi_trk) { - row[_columns.is_input_active] = midi_trk->input_active (); - row[_columns.is_midi] = true; - } else { + if (vtav) { + + stripable = vtav->vca(); + + row[_columns.is_track] = false; row[_columns.is_input_active] = false; row[_columns.is_midi] = false; + + } else if (rtav) { + + stripable = rtav->route (); + midi_trk= boost::dynamic_pointer_cast (stripable); + + row[_columns.is_track] = (boost::dynamic_pointer_cast (stripable) != 0); + + + if (midi_trk) { + row[_columns.is_input_active] = midi_trk->input_active (); + row[_columns.is_midi] = true; + } else { + row[_columns.is_input_active] = false; + row[_columns.is_midi] = false; + } } - 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(); + if (!stripable) { + continue; + } + + row[_columns.text] = stripable->name(); + row[_columns.visible] = (*x)->marked_for_display(); + row[_columns.active] = true; + row[_columns.tv] = *x; + row[_columns.stripable] = stripable; + row[_columns.mute_state] = RouteUI::mute_active_state (_session, stripable); + row[_columns.solo_state] = RouteUI::solo_active_state (stripable); + row[_columns.solo_visible] = true; + row[_columns.solo_isolate_state] = RouteUI::solo_isolate_active_state (stripable); + row[_columns.solo_safe_state] = RouteUI::solo_safe_active_state (stripable); row[_columns.name_editable] = true; - if (!from_scratch) { - _editor->selection->add(*x); - } + boost::weak_ptr ws (stripable); - boost::weak_ptr wr ((*x)->route()); + /* for now, we need both of these. PropertyChanged covers on + * pre-defined, "global" things of interest to a + * UI. gui_changed covers arbitrary, un-enumerated, un-typed + * changes that may only be of interest to a particular + * UI (e.g. track-height is not of any relevant to OSC) + */ - (*x)->route()->gui_changed.connect (*this, MISSING_INVALIDATOR, boost::bind (&EditorRoutes::handle_gui_changes, this, _1, _2), gui_context()); - (*x)->route()->PropertyChanged.connect (*this, MISSING_INVALIDATOR, boost::bind (&EditorRoutes::route_property_changed, this, _1, wr), gui_context()); + stripable->gui_changed.connect (*this, MISSING_INVALIDATOR, boost::bind (&EditorRoutes::handle_gui_changes, this, _1, _2), gui_context()); + stripable->PropertyChanged.connect (*this, MISSING_INVALIDATOR, boost::bind (&EditorRoutes::route_property_changed, this, _1, ws), gui_context()); + stripable->presentation_info().PropertyChanged.connect (*this, MISSING_INVALIDATOR, boost::bind (&EditorRoutes::route_property_changed, this, _1, ws), gui_context()); - 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()); + if (boost::dynamic_pointer_cast (stripable)) { + boost::shared_ptr t = boost::dynamic_pointer_cast (stripable); + 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 (midi_trk) { + midi_trk->StepEditStatusChange.connect (*this, MISSING_INVALIDATOR, boost::bind (&EditorRoutes::update_rec_display, this), gui_context()); + midi_trk->InputActiveChanged.connect (*this, MISSING_INVALIDATOR, boost::bind (&EditorRoutes::update_input_active_display, this), gui_context()); } - 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()); - } - - (*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()->active_changed.connect (*this, MISSING_INVALIDATOR, boost::bind (&EditorRoutes::update_active_display, this), gui_context ()); + boost::shared_ptr ac; + + if ((ac = stripable->mute_control()) != 0) { + ac->Changed.connect (*this, MISSING_INVALIDATOR, boost::bind (&EditorRoutes::update_mute_display, this), gui_context()); + } + if ((ac = stripable->solo_control()) != 0) { + ac->Changed.connect (*this, MISSING_INVALIDATOR, boost::bind (&EditorRoutes::update_solo_display, this), gui_context()); + } + if ((ac = stripable->solo_isolate_control()) != 0) { + ac->Changed.connect (*this, MISSING_INVALIDATOR, boost::bind (&EditorRoutes::update_solo_isolate_display, this), gui_context()); + } + if ((ac = stripable->solo_safe_control()) != 0) { + ac->Changed.connect (*this, MISSING_INVALIDATOR, boost::bind (&EditorRoutes::update_solo_safe_display, this), gui_context()); + } + if (rtav) { + rtav->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 (); @@ -727,7 +846,11 @@ EditorRoutes::routes_added (list routes) /* now update route order keys from the treeview/track display order */ - sync_order_keys_from_treeview (); + if (!from_scratch) { + sync_presentation_info_from_treeview (); + } + + redisplay (); } void @@ -765,23 +888,25 @@ EditorRoutes::route_removed (TimeAxisView *tv) } } - /* the deleted signal for the treeview/model will take + /* the deleted signal for the treeview/model will take care of any updates. */ } void -EditorRoutes::route_property_changed (const PropertyChange& what_changed, boost::weak_ptr r) +EditorRoutes::route_property_changed (const PropertyChange& what_changed, boost::weak_ptr s) { - if (!what_changed.contains (ARDOUR::Properties::name)) { + if (!what_changed.contains (ARDOUR::Properties::hidden) && !what_changed.contains (ARDOUR::Properties::name)) { return; } - ENSURE_GUI_THREAD (*this, &EditorRoutes::route_name_changed, r) + if (_adding_routes) { + return; + } - boost::shared_ptr route = r.lock (); + boost::shared_ptr stripable = s.lock (); - if (!route) { + if (!stripable) { return; } @@ -789,9 +914,22 @@ EditorRoutes::route_property_changed (const PropertyChange& what_changed, boost: TreeModel::Children::iterator i; for (i = rows.begin(); i != rows.end(); ++i) { - boost::shared_ptr t = (*i)[_columns.route]; - if (t == route) { - (*i)[_columns.text] = route->name(); + + boost::shared_ptr ss = (*i)[_columns.stripable]; + + if (ss == stripable) { + + if (what_changed.contains (ARDOUR::Properties::name)) { + (*i)[_columns.text] = stripable->name(); + break; + } + + if (what_changed.contains (ARDOUR::Properties::hidden)) { + (*i)[_columns.visible] = !stripable->presentation_info().hidden(); + redisplay (); + + } + break; } } @@ -800,7 +938,7 @@ EditorRoutes::route_property_changed (const PropertyChange& what_changed, boost: void EditorRoutes::update_active_display () { - if (g_atomic_int_compare_and_exchange (&_queue_tv_update, 0, 1)) { + 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)); } } @@ -811,7 +949,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]; @@ -821,7 +959,7 @@ EditorRoutes::update_visibility () /* force route order keys catch up with visibility changes */ - sync_order_keys_from_treeview (); + sync_presentation_info_from_treeview (); } void @@ -858,124 +996,119 @@ EditorRoutes::show_track_in_display (TimeAxisView& tv) } void -EditorRoutes::reset_remote_control_ids () +EditorRoutes::sync_presentation_info_from_treeview () { - if (Config->get_remote_model() == UserOrdered || !_session || _session->deletion_in_progress()) { + if (_ignore_reorder || !_session || _session->deletion_in_progress()) { return; } TreeModel::Children rows = _model->children(); - + if (rows.empty()) { return; } - - DEBUG_TRACE (DEBUG::OrderKeys, "editor reset remote control ids\n"); + DEBUG_TRACE (DEBUG::OrderKeys, "editor sync presentation info from treeview\n"); TreeModel::Children::iterator ri; - bool rid_change = false; - uint32_t rid = 1; - uint32_t invisible_key = UINT32_MAX; + bool change = false; + PresentationInfo::order_t order = 0; + bool master_is_first = false; + uint32_t count = 0; - for (ri = rows.begin(); ri != rows.end(); ++ri) { + OrderingKeys sorted; + const size_t cmp_max = rows.size (); - 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++; - } + PresentationInfo::ChangeSuspender cs; - } + // special case master if it's got PI order 0 lets keep it there + if (_session->master_out() && (_session->master_out()->presentation_info().order() == 0)) { + order++; + master_is_first = true; } - if (rid_change) { - /* tell the world that we changed the remote control IDs */ - _session->notify_remote_id_change (); - } -} - - -void -EditorRoutes::sync_order_keys_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; - for (ri = rows.begin(); ri != rows.end(); ++ri) { - boost::shared_ptr route = (*ri)[_columns.route]; + boost::shared_ptr stripable = (*ri)[_columns.stripable]; bool visible = (*ri)[_columns.visible]; - uint32_t old_key = route->order_key (); - - if (order != old_key) { - route->set_order_key (order); + /* Monitor and Auditioner do not get their presentation + * info reset here. + */ - changed = true; + if (stripable->is_monitor() || stripable->is_auditioner()) { + continue; } - if ((Config->get_remote_model() == MixerOrdered) && !route->is_master() && !route->is_monitor()) { + stripable->presentation_info().set_hidden (!visible); - uint32_t new_rid = (visible ? rid : invisible_key--); + /* special case master if it's got PI order 0 lets keep it there + * but still allow master to move if first non-master route has + * presentation order 1 + */ + if ((count == 0) && master_is_first && (stripable->presentation_info().order() == 1)) { + master_is_first = false; // someone has moved master + order = 0; + } - if (new_rid != route->remote_control_id()) { - route->set_remote_control_id_explicit (new_rid); - rid_change = true; - } - - if (visible) { - rid++; + if (stripable->is_master() && master_is_first) { + if (count) { + continue; + } else { + count++; + continue; } + } + if (order != stripable->presentation_info().order()) { + stripable->set_presentation_order (order); + change = true; } + sorted.push_back (OrderKeys (order, stripable, cmp_max)); + ++order; + ++count; } - - if (changed) { - /* tell the world that we changed the editor sort keys */ - _session->sync_order_keys (); + + if (!change) { + // VCA (and Mixbus) special cases according to SortByNewDisplayOrder + uint32_t n = 0; + SortByNewDisplayOrder cmp; + sort (sorted.begin(), sorted.end(), cmp); + for (OrderingKeys::iterator sr = sorted.begin(); sr != sorted.end(); ++sr, ++n) { + if (sr->old_display_order != n) { + change = true; + } + } + if (change) { + n = 0; + for (OrderingKeys::iterator sr = sorted.begin(); sr != sorted.end(); ++sr, ++n) { + if (sr->stripable->presentation_info().order() != n) { + sr->stripable->set_presentation_order (n); + } + } + } } +} + +void +EditorRoutes::presentation_info_changed (PropertyChange const & what_changed) +{ + PropertyChange soh; + soh.add (Properties::selected); + soh.add (Properties::order); + soh.add (Properties::hidden); - if (rid_change) { - /* tell the world that we changed the remote control IDs */ - _session->notify_remote_id_change (); + if (what_changed.contains (soh)) { + sync_treeview_from_presentation_info (what_changed); } } void -EditorRoutes::sync_treeview_from_order_keys () +EditorRoutes::sync_treeview_from_presentation_info (PropertyChange const & what_changed) { - /* 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. */ @@ -983,51 +1116,88 @@ 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 - * order for the GUI, so reorder the treeview model to match it. - */ + PropertyChange hidden_or_order; + hidden_or_order.add (Properties::hidden); + hidden_or_order.add (Properties::order); - vector neworder; TreeModel::Children rows = _model->children(); - uint32_t old_order = 0; - bool changed = false; - if (rows.empty()) { - return; - } + if (what_changed.contains (hidden_or_order)) { - OrderKeySortedRoutes sorted_routes; + vector neworder; + uint32_t old_order = 0; + bool changed = false; - 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 ())); - } + if (rows.empty()) { + return; + } + + OrderingKeys sorted; + const size_t cmp_max = rows.size (); + + for (TreeModel::Children::iterator ri = rows.begin(); ri != rows.end(); ++ri, ++old_order) { + boost::shared_ptr stripable = (*ri)[_columns.stripable]; + /* use global order */ + sorted.push_back (OrderKeys (old_order, stripable, cmp_max)); + } - SortByNewDisplayOrder cmp; + 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) { + uint32_t n = 0; - neworder[n] = sr->old_display_order; + for (OrderingKeys::iterator sr = sorted.begin(); sr != sorted.end(); ++sr, ++n) { - if (sr->old_display_order != n) { - changed = true; + neworder[n] = sr->old_display_order; + + if (sr->old_display_order != n) { + 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)); + if (changed) { + Unwinder uw (_ignore_reorder, true); + /* prevent traverse_cells: assertion 'row_path != NULL' + * in case of DnD re-order: row-removed + row-inserted. + * + * The rows (stripables) are not actually removed from the model, + * but only from the display in the DnDTreeView. + * ->reorder() will fail to find the row_path. + * (re-order drag -> remove row -> sync PI from TV -> notify -> sync TV from PI -> crash) + */ + Unwinder uw2 (_ignore_selection_change, true); + + _display.unset_model(); + _model->reorder (neworder); + _display.set_model (_model); + } } - if (changed) { - Unwinder uw (_ignore_reorder, true); - _model->reorder (neworder); + if (what_changed.contains (Properties::selected)) { + + TrackViewList tvl; + PBD::Unwinder uw (_ignore_selection_change, true); + + /* step one: set the treeview model selection state */ + for (TreeModel::Children::iterator ri = rows.begin(); ri != rows.end(); ++ri) { + boost::shared_ptr stripable = (*ri)[_columns.stripable]; + if (stripable && stripable->presentation_info().selected()) { + TimeAxisView* tav = (*ri)[_columns.tv]; + if (tav) { + tvl.push_back (tav); + } + _display.get_selection()->select (*ri); + } else { + _display.get_selection()->unselect (*ri); + } + } + + /* step two: set the Selection (for stripables/routes) */ + _editor->get_selection().set (tvl); } redisplay (); @@ -1078,7 +1248,7 @@ EditorRoutes::set_all_tracks_visibility (bool yn) /* force route order keys catch up with visibility changes */ - sync_order_keys_from_treeview (); + sync_presentation_info_from_treeview (); } void @@ -1104,17 +1274,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; @@ -1123,11 +1296,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; @@ -1138,7 +1313,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 (); + sync_presentation_info_from_treeview (); } void @@ -1189,59 +1364,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, &Stripable::mute_control), rl->front()->muted() ? 0.0 : 1.0, Controllable::NoGroup); + } + return true; + break; + + case 's': + if (get_relevant_routes (rl)) { + _session->set_controls (route_list_to_control_list (rl, &Stripable::solo_control), rl->front()->self_soloed() ? 0.0 : 1.0, Controllable::NoGroup); + } + return true; + break; - default: - 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, &Stripable::rec_enable_control), !t->rec_enable_control()->get_value(), Controllable::NoGroup); + break; + } + } + } + break; + + default: + break; + } return false; } @@ -1249,44 +1425,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 @@ -1327,14 +1503,18 @@ EditorRoutes::button_press (GdkEventButton* ev) void EditorRoutes::selection_changed () { + if (_ignore_selection_change) { + return; + } + + _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))) { @@ -1342,7 +1522,7 @@ EditorRoutes::selection_changed () TimeAxisView* tv = (*iter)[_columns.tv]; selected.push_back (tv); } - + } _editor->get_selection().set (selected); @@ -1351,33 +1531,52 @@ 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; - } - } +EditorRoutes::selection_filter (Glib::RefPtr const& model, TreeModel::Path const& path, bool /*selected*/) +{ + if (selection_countdown) { + if (--selection_countdown == 0) { + return true; + } else { + /* no selection yet ... */ + return false; + } + } + + TreeModel::iterator iter = model->get_iter (path); + if (iter) { + boost::shared_ptr stripable = (*iter)[_columns.stripable]; + if (boost::dynamic_pointer_cast (stripable)) { + 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().order () < b->presentation_info().order (); + } +}; + +struct PresentationInfoVCASorter +{ + bool operator() (boost::shared_ptr a, boost::shared_ptr b) { + return a->presentation_info().order () < b->presentation_info().order (); + } }; void @@ -1390,29 +1589,21 @@ EditorRoutes::initial_display () return; } - boost::shared_ptr routes = _session->get_routes(); - - if (ARDOUR_UI::instance()->session_is_new ()) { + StripableList s; - /* new session: stamp all routes with the right editor order - * key - */ + RouteList r (*_session->get_routes()); + for (RouteList::iterator ri = r.begin(); ri != r.end(); ++ri) { + s.push_back (*ri); + } - _editor->add_routes (*(routes.get())); - - } else { + VCAList v (_session->vca_manager().vcas()); + for (VCAList::iterator vi = v.begin(); vi != v.end(); ++vi) { + s.push_back (*vi); + } - /* existing session: sort a copy of the route list by - * editor-order and add its contents to the display. - */ + _editor->add_stripables (s); - RouteList r (*routes); - EditorOrderRouteSorter sorter; - - r.sort (sorter); - _editor->add_routes (r); - - } + sync_treeview_from_presentation_info (Properties::order); } void @@ -1429,130 +1620,120 @@ EditorRoutes::display_drag_data_received (const RefPtr& contex context->drag_finish (true, false, time); } +struct ViewStripable { + TimeAxisView* tav; + boost::shared_ptr stripable; + + ViewStripable (TimeAxisView* t, boost::shared_ptr s) + : tav (t), stripable (s) {} +}; + void EditorRoutes::move_selected_tracks (bool up) { - if (_editor->selection->tracks.empty()) { + TimeAxisView* scroll_to = 0; + StripableList sl; + _session->get_stripables (sl); + + if (sl.size() < 2) { + /* nope */ return; } - typedef std::pair > ViewRoute; - std::list view_routes; - std::vector neworder; - TreeModel::Children rows = _model->children(); - TreeModel::Children::iterator ri; + sl.sort (Stripable::PresentationOrderSorter()); - for (ri = rows.begin(); ri != rows.end(); ++ri) { - TimeAxisView* tv = (*ri)[_columns.tv]; - boost::shared_ptr route = (*ri)[_columns.route]; + std::list view_stripables; - view_routes.push_back (ViewRoute (tv, route)); + /* build a list that includes time axis view information */ + + for (StripableList::const_iterator sli = sl.begin(); sli != sl.end(); ++sli) { + TimeAxisView* tv = _editor->axis_view_from_stripable (*sli); + view_stripables.push_back (ViewStripable (tv, *sli)); } - list::iterator trailing; - list::iterator leading; + /* for each selected stripable, move it above or below the adjacent + * stripable that has a time-axis view representation here. If there's + * no such representation, then + */ - if (up) { + list::iterator unselected_neighbour; + list::iterator vsi; - trailing = view_routes.begin(); - leading = view_routes.begin(); + { + PresentationInfo::ChangeSuspender cs; - ++leading; + if (up) { + unselected_neighbour = view_stripables.begin (); + ++unselected_neighbour; + vsi = view_stripables.begin(); - while (leading != view_routes.end()) { - if (_editor->selection->selected (leading->first)) { - view_routes.insert (trailing, ViewRoute (leading->first, leading->second)); - leading = view_routes.erase (leading); - } else { - ++leading; - ++trailing; - } - } + while (vsi != view_stripables.end()) { - } else { + if (vsi->stripable->presentation_info().selected()) { - /* if we could use reverse_iterator in list::insert, this code - would be a beautiful reflection of the code above. but we can't - and so it looks like a bit of a mess. - */ + if (unselected_neighbour != view_stripables.end()) { - trailing = view_routes.end(); - leading = view_routes.end(); + PresentationInfo::order_t unselected_neighbour_order = unselected_neighbour->stripable->presentation_info().order(); + PresentationInfo::order_t my_order = vsi->stripable->presentation_info().order(); - --leading; if (leading == view_routes.begin()) { return; } - --leading; - --trailing; + unselected_neighbour->stripable->set_presentation_order (my_order); + vsi->stripable->set_presentation_order (unselected_neighbour_order); + + if (!scroll_to) { + scroll_to = vsi->tav; + } + } + + } else { - while (1) { + if (vsi->tav) { + unselected_neighbour = vsi; + } - if (_editor->selection->selected (leading->first)) { - list::iterator tmp; + } - /* need to insert *after* trailing, not *before* it, - which is what insert (iter, val) normally does. - */ + ++vsi; + } - tmp = trailing; - tmp++; + } else { - view_routes.insert (tmp, ViewRoute (leading->first, leading->second)); + unselected_neighbour = view_stripables.end(); + vsi = unselected_neighbour; - /* can't use iter = cont.erase (iter); form here, because - we need iter to move backwards. - */ + do { - tmp = leading; - --tmp; + --vsi; - bool done = false; + if (vsi->stripable->presentation_info().selected()) { - if (leading == view_routes.begin()) { - /* the one we've just inserted somewhere else - was the first in the list. erase this copy, - and then break, because we're done. - */ - done = true; - } + if (unselected_neighbour != view_stripables.end()) { - view_routes.erase (leading); + PresentationInfo::order_t unselected_neighbour_order = unselected_neighbour->stripable->presentation_info().order(); + PresentationInfo::order_t my_order = vsi->stripable->presentation_info().order(); - if (done) { - break; - } + unselected_neighbour->stripable->set_presentation_order (my_order); + vsi->stripable->set_presentation_order (unselected_neighbour_order); - leading = tmp; + if (!scroll_to) { + scroll_to = vsi->tav; + } + } - } else { - if (leading == view_routes.begin()) { - break; - } - --leading; - --trailing; - } - }; - } + } else { - for (leading = view_routes.begin(); leading != view_routes.end(); ++leading) { - uint32_t order = leading->second->order_key (); - neworder.push_back (order); - } + if (vsi->tav) { + unselected_neighbour = vsi; + } -#ifndef NDEBUG - DEBUG_TRACE (DEBUG::OrderKeys, "New order after moving tracks:\n"); - for (vector::iterator i = neworder.begin(); i != neworder.end(); ++i) { - DEBUG_TRACE (DEBUG::OrderKeys, string_compose ("\t%1\n", *i)); - } - DEBUG_TRACE (DEBUG::OrderKeys, "-------\n"); + } - for (vector::iterator i = neworder.begin(); i != neworder.end(); ++i) { - if (*i >= (int) neworder.size()) { - cerr << "Trying to move something to " << *i << " of " << neworder.size() << endl; + } while (vsi != view_stripables.begin()); } - assert (*i < (int) neworder.size ()); } -#endif - _model->reorder (neworder); + if (scroll_to) { + _editor->ensure_time_axis_view_is_visible (*scroll_to, false); + } } void @@ -1562,11 +1743,11 @@ EditorRoutes::update_input_active_display () TreeModel::Children::iterator i; for (i = rows.begin(); i != rows.end(); ++i) { - boost::shared_ptr route = (*i)[_columns.route]; + boost::shared_ptr stripable = (*i)[_columns.stripable]; + + if (boost::dynamic_pointer_cast (stripable)) { + boost::shared_ptr mt = boost::dynamic_pointer_cast (stripable); - 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(); } @@ -1577,7 +1758,7 @@ EditorRoutes::update_input_active_display () void EditorRoutes::update_rec_display () { - if (g_atomic_int_compare_and_exchange (&_queue_tv_update, 0, 1)) { + 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)); } } @@ -1585,37 +1766,45 @@ EditorRoutes::update_rec_display () bool EditorRoutes::idle_update_mute_rec_solo_etc() { - g_atomic_int_set (&_queue_tv_update, 0); + 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 mt = boost::dynamic_pointer_cast (route); - - if (route->record_enabled()) { - if (_session->record_status() == Session::Recording) { - (*i)[_columns.rec_state] = 1; - } else { - (*i)[_columns.rec_state] = 2; - } - } else if (mt && mt->step_editing()) { - (*i)[_columns.rec_state] = 3; + boost::shared_ptr stripable = (*i)[_columns.stripable]; + boost::shared_ptr route = boost::dynamic_pointer_cast (stripable); + (*i)[_columns.mute_state] = RouteUI::mute_active_state (_session, stripable); + (*i)[_columns.solo_state] = RouteUI::solo_active_state (stripable); + (*i)[_columns.solo_isolate_state] = RouteUI::solo_isolate_active_state (stripable) ? 1 : 0; + (*i)[_columns.solo_safe_state] = RouteUI::solo_safe_active_state (stripable) ? 1 : 0; + if (route) { + (*i)[_columns.active] = route->active (); + } else { + (*i)[_columns.active] = true; + } + + boost::shared_ptr trk (boost::dynamic_pointer_cast(route)); + + if (trk) { + boost::shared_ptr mt = boost::dynamic_pointer_cast (route); + + if (trk->rec_enable_control()->get_value()) { + if (_session->record_status() == Session::Recording) { + (*i)[_columns.rec_state] = 1; } else { - (*i)[_columns.rec_state] = 0; + (*i)[_columns.rec_state] = 2; } - - (*i)[_columns.name_editable] = !route->record_enabled (); + } else if (mt && mt->step_editing()) { + (*i)[_columns.rec_state] = 3; + } else { + (*i)[_columns.rec_state] = 0; } + + (*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) } @@ -1623,15 +1812,15 @@ EditorRoutes::idle_update_mute_rec_solo_etc() void EditorRoutes::update_mute_display () { - if (g_atomic_int_compare_and_exchange (&_queue_tv_update, 0, 1)) { + 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 () { - if (g_atomic_int_compare_and_exchange (&_queue_tv_update, 0, 1)) { + 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)); } } @@ -1639,7 +1828,7 @@ EditorRoutes::update_solo_display (bool /* selfsoloed */) void EditorRoutes::update_solo_isolate_display () { - if (g_atomic_int_compare_and_exchange (&_queue_tv_update, 0, 1)) { + 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)); } } @@ -1647,7 +1836,7 @@ EditorRoutes::update_solo_isolate_display () void EditorRoutes::update_solo_safe_display () { - if (g_atomic_int_compare_and_exchange (&_queue_tv_update, 0, 1)) { + 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)); } } @@ -1674,21 +1863,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); @@ -1696,10 +1885,10 @@ EditorRoutes::name_edit (std::string const & path, std::string const & new_text) return; } - boost::shared_ptr route = (*iter)[_columns.route]; + boost::shared_ptr stripable = (*iter)[_columns.stripable]; - if (route && route->name() != new_text) { - route->set_name (new_text); + if (stripable && stripable->name() != new_text) { + stripable->set_name (new_text); } } @@ -1716,7 +1905,7 @@ EditorRoutes::show_tracks_with_regions_at_playhead () set show; for (RouteList::const_iterator i = r->begin(); i != r->end(); ++i) { - TimeAxisView* tav = _editor->axis_view_from_route (*i); + TimeAxisView* tav = _editor->axis_view_from_stripable (*i); if (tav) { show.insert (tav); } @@ -1727,6 +1916,22 @@ 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_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); + int rv = psd.run (); + return rv + (psd.fan_out() ? 4 : 0); }