X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_routes.cc;h=075242459ede71396019b392a49fadb0c4df08f5;hb=a2c0b10d8a6cf4ab5a0fdcdfe157c35c0ed9a709;hp=9a2153f99f7866af3a23082b792e76e97e117864;hpb=653ae4acd639fef149314fe6f8c7a0d862afae40;p=ardour.git diff --git a/gtk2_ardour/editor_routes.cc b/gtk2_ardour/editor_routes.cc index 9a2153f99f..075242459e 100644 --- a/gtk2_ardour/editor_routes.cc +++ b/gtk2_ardour/editor_routes.cc @@ -28,11 +28,14 @@ #include "pbd/unwind.h" #include "ardour/debug.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" @@ -51,9 +54,10 @@ #include "plugin_setup_dialog.h" #include "route_sorter.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; @@ -255,7 +259,7 @@ EditorRoutes::EditorRoutes (Editor* e) _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)); @@ -313,9 +317,8 @@ EditorRoutes::EditorRoutes (Editor* e) _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::sync_treeview_from_presentation_info, this), gui_context()); } bool @@ -423,9 +426,14 @@ EditorRoutes::on_tv_rec_enable_changed (std::string const & path_string) TimeAxisView* tv = row[_columns.tv]; 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); + if (!rtv) { + return; + } + + boost::shared_ptr ac = rtv->route()->rec_enable_control(); + + if (ac) { + ac->set_value (!ac->get_value(), Controllable::UseGroup); } } @@ -436,11 +444,14 @@ EditorRoutes::on_tv_rec_safe_toggled (std::string const & 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_safe (rl, !rtv->track()->record_safe(), Session::rt_cleanup); + if (!rtv) { + return; + } + + boost::shared_ptr ac (rtv->route()->rec_safe_control()); + + if (ac) { + ac->set_value (!ac->get_value(), Controllable::UseGroup); } } @@ -453,8 +464,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) { - _session->set_control (rtv->route()->mute_control(), rtv->route()->mute_control()->get_value() ? 0.0 : 1.0, Controllable::UseGroup); + if (!rtv) { + return; + } + + boost::shared_ptr ac (rtv->route()->mute_control()); + + if (ac) { + ac->set_value (!ac->get_value(), Controllable::UseGroup); } } @@ -467,16 +484,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) { - bool newval; + if (!rtv) { + return; + } - if (Config->get_solo_control_is_listen_control()) { - newval = !rtv->route()->listening_via_monitor(); - } else { - newval = !rtv->route()->self_soloed(); - } + boost::shared_ptr ac (rtv->route()->solo_control()); - rtv->route()->solo_control()->set_value (newval ? 1.0 : 0.0, Controllable::UseGroup); + if (ac) { + ac->set_value (!ac->get_value(), Controllable::UseGroup); } } @@ -489,8 +504,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()->solo_isolate_control()->set_value (rtv->route()->solo_isolate_control()->get_value() ? 0.0 : 1.0, Controllable::UseGroup); + if (!rtv) { + return; + } + + boost::shared_ptr ac (rtv->route()->solo_isolate_control()); + + if (ac) { + ac->set_value (!ac->get_value(), Controllable::UseGroup); } } @@ -503,8 +524,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()->solo_safe_control()->set_value (rtv->route()->solo_safe_control()->get_value() ? 0.0 : 1.0, Controllable::UseGroup); + if (!rtv) { + return; + } + + boost::shared_ptr ac (rtv->route()->solo_safe_control()); + + if (ac) { + ac->set_value (!ac->get_value(), Controllable::UseGroup); } } @@ -554,7 +581,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 @@ -631,27 +657,28 @@ EditorRoutes::row_deleted (Gtk::TreeModel::Path const &) * 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. + * 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 @@ -684,83 +711,126 @@ 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; } } - 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_isolate_control()->solo_isolated(); - row[_columns.solo_safe_state] = (*x)->route()->solo_safe_control()->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; - boost::weak_ptr wr ((*x)->route()); + boost::weak_ptr ws (stripable); - (*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()); + /* 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) + */ + + 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()); + 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 ((*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()); + 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()); } - (*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()); + boost::shared_ptr ac; - (*x)->route()->active_changed.connect (*this, MISSING_INVALIDATOR, boost::bind (&EditorRoutes::update_active_display, this), gui_context ()); + 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 (); @@ -774,9 +844,12 @@ EditorRoutes::routes_added (list routes) _display.set_model (_model); /* now update route order keys from the treeview/track display order */ + if (!from_scratch) { - sync_order_keys_from_treeview (); + sync_presentation_info_from_treeview (); } + + redisplay (); } void @@ -820,17 +893,19 @@ EditorRoutes::route_removed (TimeAxisView *tv) } 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; } @@ -838,9 +913,23 @@ 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(); + cerr << stripable->name() << " visibility changed, redisplay\n"; + redisplay (); + + } + break; } } @@ -870,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 @@ -907,9 +996,9 @@ 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; } @@ -919,119 +1008,71 @@ EditorRoutes::reset_remote_control_ids () 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; - - for (ri = rows.begin(); ri != rows.end(); ++ri) { - - /* skip two special values */ + bool change = false; + PresentationInfo::order_t order = 0; + bool master_is_first = false; + uint32_t count = 0; - 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); - rid_change = true; - } - - if (visible) { - rid++; - } - - } - } - - 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; + // 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; } - - 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--); - - if (new_rid != route->remote_control_id()) { - route->set_remote_control_id_explicit (new_rid); - rid_change = true; - } + /* 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 (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, false); + change = true; } ++order; + ++count; } - 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) { + DEBUG_TRACE (DEBUG::OrderKeys, "... notify PI change from editor GUI\n"); + _session->notify_presentation_info_change (); + _session->set_dirty(); } } void -EditorRoutes::sync_treeview_from_order_keys () +EditorRoutes::sync_treeview_from_presentation_info () { /* Some route order key(s) have been changed, make sure that we update out tree/list model and GUI to reflect the change. @@ -1041,12 +1082,7 @@ EditorRoutes::sync_treeview_from_order_keys () return; } - DEBUG_TRACE (DEBUG::OrderKeys, "editor sync model from order keys.\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. - */ + DEBUG_TRACE (DEBUG::OrderKeys, "editor sync model from presentation info.\n"); vector neworder; TreeModel::Children rows = _model->children(); @@ -1060,8 +1096,9 @@ EditorRoutes::sync_treeview_from_order_keys () OrderingKeys sorted; for (TreeModel::Children::iterator ri = rows.begin(); ri != rows.end(); ++ri, ++old_order) { - boost::shared_ptr route = (*ri)[_columns.route]; - sorted.push_back (OrderKeys (old_order, route->order_key ())); + boost::shared_ptr stripable = (*ri)[_columns.stripable]; + /* use global order */ + sorted.push_back (OrderKeys (old_order, stripable->presentation_info().order())); } SortByNewDisplayOrder cmp; @@ -1078,9 +1115,6 @@ EditorRoutes::sync_treeview_from_order_keys () if (sr->old_display_order != n) { changed = true; } - - DEBUG_TRACE (DEBUG::OrderKeys, string_compose ("EDITOR change order from %1 to %2\n", - sr->old_display_order, n)); } if (changed) { @@ -1136,7 +1170,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 @@ -1201,7 +1235,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 @@ -1279,14 +1313,14 @@ EditorRoutes::key_press (GdkEventKey* ev) 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); + _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, &Route::solo_control), rl->front()->self_soloed() ? 0.0 : 1.0, Controllable::NoGroup); + _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; @@ -1296,7 +1330,7 @@ EditorRoutes::key_press (GdkEventKey* ev) 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); + _session->set_controls (route_list_to_control_list (rl, &Stripable::rec_enable_control), !t->rec_enable_control()->get_value(), Controllable::NoGroup); break; } } @@ -1435,7 +1469,7 @@ EditorRoutes::selection_filter (Glib::RefPtr const &, TreeModel::Path return true; } -struct EditorOrderRouteSorter +struct PresentationInfoRouteSorter { bool operator() (boost::shared_ptr a, boost::shared_ptr b) { if (a->is_master()) { @@ -1445,7 +1479,14 @@ struct EditorOrderRouteSorter /* everything else before master */ return false; } - return a->order_key () < b->order_key (); + 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 (); } }; @@ -1459,10 +1500,19 @@ EditorRoutes::initial_display () return; } + StripableList s; + RouteList r (*_session->get_routes()); + for (RouteList::iterator ri = r.begin(); ri != r.end(); ++ri) { + s.push_back (*ri); + } + + VCAList v (_session->vca_manager().vcas()); + for (VCAList::iterator vi = v.begin(); vi != v.end(); ++vi) { + s.push_back (*vi); + } - r.sort (EditorOrderRouteSorter ()); - _editor->add_routes (r); + _editor->add_stripables (s); } void @@ -1479,6 +1529,15 @@ EditorRoutes::display_drag_data_received (const RefPtr& contex context->drag_finish (true, false, time); } +struct ViewStripable { + TimeAxisView* tav; + boost::shared_ptr stripable; + uint32_t old_order; + + ViewStripable (TimeAxisView* t, boost::shared_ptr s, uint32_t n) + : tav (t), stripable (s), old_order (n) {} +}; + void EditorRoutes::move_selected_tracks (bool up) { @@ -1486,33 +1545,32 @@ EditorRoutes::move_selected_tracks (bool up) return; } - typedef std::pair > ViewRoute; - std::list view_routes; + std::list view_stripables; std::vector neworder; TreeModel::Children rows = _model->children(); TreeModel::Children::iterator ri; + TreeModel::Children::size_type n; - for (ri = rows.begin(); ri != rows.end(); ++ri) { + for (n = 0, ri = rows.begin(); ri != rows.end(); ++ri, ++n) { TimeAxisView* tv = (*ri)[_columns.tv]; - boost::shared_ptr route = (*ri)[_columns.route]; - - view_routes.push_back (ViewRoute (tv, route)); + boost::shared_ptr stripable = (*ri)[_columns.stripable]; + view_stripables.push_back (ViewStripable (tv, stripable, n)); } - list::iterator trailing; - list::iterator leading; + list::iterator trailing; + list::iterator leading; if (up) { - trailing = view_routes.begin(); - leading = view_routes.begin(); + trailing = view_stripables.begin(); + leading = view_stripables.begin(); ++leading; - 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); + while (leading != view_stripables.end()) { + if (_editor->selection->selected (leading->tav)) { + view_stripables.insert (trailing, ViewStripable (*leading)); + leading = view_stripables.erase (leading); } else { ++leading; ++trailing; @@ -1526,17 +1584,17 @@ EditorRoutes::move_selected_tracks (bool up) and so it looks like a bit of a mess. */ - trailing = view_routes.end(); - leading = view_routes.end(); + trailing = view_stripables.end(); + leading = view_stripables.end(); - --leading; if (leading == view_routes.begin()) { return; } + --leading; if (leading == view_stripables.begin()) { return; } --leading; --trailing; while (1) { - if (_editor->selection->selected (leading->first)) { - list::iterator tmp; + if (_editor->selection->selected (leading->tav)) { + list::iterator tmp; /* need to insert *after* trailing, not *before* it, which is what insert (iter, val) normally does. @@ -1545,7 +1603,7 @@ EditorRoutes::move_selected_tracks (bool up) tmp = trailing; tmp++; - view_routes.insert (tmp, ViewRoute (leading->first, leading->second)); + view_stripables.insert (tmp, ViewStripable (*leading)); /* can't use iter = cont.erase (iter); form here, because we need iter to move backwards. @@ -1556,7 +1614,7 @@ EditorRoutes::move_selected_tracks (bool up) bool done = false; - if (leading == view_routes.begin()) { + if (leading == view_stripables.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. @@ -1564,7 +1622,7 @@ EditorRoutes::move_selected_tracks (bool up) done = true; } - view_routes.erase (leading); + view_stripables.erase (leading); if (done) { break; @@ -1573,7 +1631,7 @@ EditorRoutes::move_selected_tracks (bool up) leading = tmp; } else { - if (leading == view_routes.begin()) { + if (leading == view_stripables.begin()) { break; } --leading; @@ -1582,26 +1640,24 @@ EditorRoutes::move_selected_tracks (bool up) }; } - for (leading = view_routes.begin(); leading != view_routes.end(); ++leading) { - uint32_t order = leading->second->order_key (); - neworder.push_back (order); - } + for (leading = view_stripables.begin(); leading != view_stripables.end(); ++leading) { + neworder.push_back (leading->old_order); +#ifndef NDEBUG + if (leading->old_order != neworder.size() - 1) { + DEBUG_TRACE (DEBUG::OrderKeys, string_compose ("move %1 to %2\n", leading->old_order, neworder.size() - 1)); + } +#endif + } #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; - } - assert (*i < (int) neworder.size ()); - } #endif + _model->reorder (neworder); } @@ -1612,10 +1668,10 @@ 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 (route)) { - boost::shared_ptr mt = boost::dynamic_pointer_cast (route); + if (boost::dynamic_pointer_cast (stripable)) { + boost::shared_ptr mt = boost::dynamic_pointer_cast (stripable); if (mt) { (*i)[_columns.is_input_active] = mt->input_active(); @@ -1640,12 +1696,17 @@ EditorRoutes::idle_update_mute_rec_solo_etc() 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 (); + 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)); @@ -1664,7 +1725,7 @@ EditorRoutes::idle_update_mute_rec_solo_etc() (*i)[_columns.rec_state] = 0; } - (*i)[_columns.rec_safe] = !trk->rec_safe_control()->get_value(); + (*i)[_columns.rec_safe] = trk->rec_safe_control()->get_value(); (*i)[_columns.name_editable] = !trk->rec_enable_control()->get_value(); } } @@ -1749,10 +1810,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); } } @@ -1769,7 +1830,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); } @@ -1789,7 +1850,7 @@ EditorRoutes::show_tracks_with_regions_at_playhead () /* force route order keys catch up with visibility changes */ - sync_order_keys_from_treeview (); + sync_presentation_info_from_treeview (); } int