X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fselection.cc;h=0118c1c679b4f74d64fa2a572c33712ae60cad6b;hb=b115920c9dfa6d2c36debb078fa65baf370a27e7;hp=88e151c54db9a04a46c40a3f549a244aec33f22b;hpb=174b2fd7b1503109f70b4226429c0eb90f759c10;p=ardour.git diff --git a/gtk2_ardour/selection.cc b/gtk2_ardour/selection.cc index 88e151c54d..0118c1c679 100644 --- a/gtk2_ardour/selection.cc +++ b/gtk2_ardour/selection.cc @@ -19,6 +19,7 @@ #include #include + #include "pbd/error.h" #include "pbd/stacktrace.h" @@ -42,9 +43,9 @@ using namespace ARDOUR; using namespace PBD; struct AudioRangeComparator { - bool operator()(AudioRange a, AudioRange b) { - return a.start < b.start; - } + bool operator()(AudioRange a, AudioRange b) { + return a.start < b.start; + } }; Selection::Selection (const PublicEditor* e) @@ -108,6 +109,7 @@ Selection::clear () clear_midi_notes (); clear_midi_regions (); clear_markers (); + pending_midi_note_selection.clear(); } void @@ -119,13 +121,15 @@ Selection::clear_objects () clear_playlists (); clear_midi_notes (); clear_midi_regions (); - clear_markers (); } void Selection::clear_tracks () { if (!tracks.empty()) { + for (TrackViewList::iterator x = tracks.begin(); x != tracks.end(); ++x) { + (*x)->set_selected (false); + } tracks.clear (); if (!_no_tracks_changed) { TracksChanged(); @@ -157,9 +161,6 @@ Selection::clear_regions () if (!regions.empty()) { regions.clear_all (); RegionsChanged(); - if (Config->get_link_region_and_track_selection()) { - clear_tracks (); - } } } @@ -173,6 +174,10 @@ Selection::clear_midi_notes () midi_notes.clear (); MidiNotesChanged (); } + + /* The note selection is actually stored in MidiRegionView, emit signal to + tell them to clear their selection. */ + ClearMidiNoteSelection(); /* EMIT SIGNAL */ } void @@ -223,7 +228,8 @@ void Selection::toggle (boost::shared_ptr pl) { clear_time(); //enforce object/range exclusivity - + clear_tracks(); //enforce object/track exclusivity + PlaylistSelection::iterator i; if ((i = find (playlists.begin(), playlists.end(), pl)) == playlists.end()) { @@ -250,8 +256,10 @@ Selection::toggle (TimeAxisView* track) TrackSelection::iterator i; if ((i = find (tracks.begin(), tracks.end(), track)) == tracks.end()) { + track->set_selected (true); tracks.push_back (track); } else { + track->set_selected (false); tracks.erase (i); } @@ -264,6 +272,7 @@ void Selection::toggle (const MidiNoteSelection& midi_note_list) { clear_time(); //enforce object/range exclusivity + clear_tracks(); //enforce object/track exclusivity for (MidiNoteSelection::const_iterator i = midi_note_list.begin(); i != midi_note_list.end(); ++i) { toggle ((*i)); @@ -291,7 +300,8 @@ void Selection::toggle (RegionView* r) { clear_time(); //enforce object/range exclusivity - + clear_tracks(); //enforce object/track exclusivity + RegionSelection::iterator i; if ((i = find (regions.begin(), regions.end(), r)) == regions.end()) { @@ -307,6 +317,7 @@ void Selection::toggle (MidiRegionView* mrv) { clear_time(); //enforce object/range exclusivity + clear_tracks(); //enforce object/track exclusivity MidiRegionSelection::iterator i; @@ -323,6 +334,7 @@ void Selection::toggle (vector& r) { clear_time(); //enforce object/range exclusivity + clear_tracks(); //enforce object/track exclusivity RegionSelection::iterator i; @@ -359,7 +371,8 @@ void Selection::add (boost::shared_ptr pl) { clear_time(); //enforce object/range exclusivity - + clear_tracks(); //enforce object/track exclusivity + if (find (playlists.begin(), playlists.end(), pl) == playlists.end()) { pl->use (); playlists.push_back(pl); @@ -371,7 +384,8 @@ void Selection::add (const list >& pllist) { clear_time(); //enforce object/range exclusivity - + clear_tracks(); //enforce object/track exclusivity + bool changed = false; for (list >::const_iterator i = pllist.begin(); i != pllist.end(); ++i) { @@ -390,9 +404,14 @@ Selection::add (const list >& pllist) void Selection::add (const TrackViewList& track_list) { + clear_objects(); //enforce object/range exclusivity + TrackViewList added = tracks.add (track_list); if (!added.empty()) { + for (TrackViewList::iterator x = added.begin(); x != added.end(); ++x) { + (*x)->set_selected (true); + } if (!_no_tracks_changed) { TracksChanged (); } @@ -402,7 +421,10 @@ Selection::add (const TrackViewList& track_list) void Selection::add (TimeAxisView* track) { + clear_objects(); //enforce object/range exclusivity + TrackViewList tr; + track->set_selected (true); tr.push_back (track); add (tr); } @@ -411,6 +433,7 @@ void Selection::add (const MidiNoteSelection& midi_list) { clear_time(); //enforce object/range exclusivity + clear_tracks(); //enforce object/track exclusivity const MidiNoteSelection::const_iterator b = midi_list.begin(); const MidiNoteSelection::const_iterator e = midi_list.end(); @@ -436,6 +459,7 @@ void Selection::add (vector& v) { clear_time(); //enforce object/range exclusivity + clear_tracks(); //enforce object/track exclusivity /* XXX This method or the add (const RegionSelection&) needs to go */ @@ -445,9 +469,6 @@ Selection::add (vector& v) for (vector::iterator i = v.begin(); i != v.end(); ++i) { if (find (regions.begin(), regions.end(), (*i)) == regions.end()) { changed = regions.add ((*i)); - if (Config->get_link_region_and_track_selection() && changed) { - add (&(*i)->get_time_axis_view()); - } } } @@ -460,6 +481,7 @@ void Selection::add (const RegionSelection& rs) { clear_time(); //enforce object/range exclusivity + clear_tracks(); //enforce object/track exclusivity /* XXX This method or the add (const vector&) needs to go */ @@ -469,9 +491,6 @@ Selection::add (const RegionSelection& rs) for (RegionSelection::const_iterator i = rs.begin(); i != rs.end(); ++i) { if (find (regions.begin(), regions.end(), (*i)) == regions.end()) { changed = regions.add ((*i)); - if (Config->get_link_region_and_track_selection() && changed) { - add (&(*i)->get_time_axis_view()); - } } } @@ -484,15 +503,13 @@ void Selection::add (RegionView* r) { clear_time(); //enforce object/range exclusivity + clear_tracks(); //enforce object/track exclusivity if (find (regions.begin(), regions.end(), r) == regions.end()) { bool changed = regions.add (r); - if (Config->get_link_region_and_track_selection() && changed) { - add (&r->get_time_axis_view()); - } - if (changed) { - RegionsChanged (); - } + if (changed) { + RegionsChanged (); + } } } @@ -500,15 +517,11 @@ void Selection::add (MidiRegionView* mrv) { clear_time(); //enforce object/range exclusivity + clear_tracks(); //enforce object/track exclusivity if (find (midi_regions.begin(), midi_regions.end(), mrv) == midi_regions.end()) { midi_regions.push_back (mrv); /* XXX should we do this? */ -#if 0 - if (Config->get_link_region_and_track_selection()) { - add (&mrv->get_time_axis_view()); - } -#endif MidiRegionsChanged (); } } @@ -550,7 +563,7 @@ void Selection::replace (uint32_t sid, framepos_t start, framepos_t end) { clear_objects(); //enforce object/range exclusivity - + for (list::iterator i = time.begin(); i != time.end(); ++i) { if ((*i).id == sid) { time.erase (i); @@ -572,6 +585,7 @@ void Selection::add (boost::shared_ptr cl) { clear_time(); //enforce object/range exclusivity + clear_tracks(); //enforce object/track exclusivity boost::shared_ptr al = boost::dynamic_pointer_cast(cl); @@ -590,6 +604,7 @@ Selection::remove (TimeAxisView* track) { list::iterator i; if ((i = find (tracks.begin(), tracks.end(), track)) != tracks.end()) { + track->set_selected (false); tracks.erase (i); if (!_no_tracks_changed) { TracksChanged(); @@ -597,15 +612,6 @@ Selection::remove (TimeAxisView* track) } } -void -Selection::remove (ControlPoint* p) -{ - PointSelection::iterator i = find (points.begin(), points.end(), p); - if (i != points.end ()) { - points.erase (i); - } -} - void Selection::remove (const TrackViewList& track_list) { @@ -615,6 +621,7 @@ Selection::remove (const TrackViewList& track_list) TrackViewList::iterator x = find (tracks.begin(), tracks.end(), *i); if (x != tracks.end()) { + (*i)->set_selected (false); tracks.erase (x); changed = true; } @@ -627,6 +634,15 @@ Selection::remove (const TrackViewList& track_list) } } +void +Selection::remove (ControlPoint* p) +{ + PointSelection::iterator i = find (points.begin(), points.end(), p); + if (i != points.end ()) { + points.erase (i); + } +} + void Selection::remove (const MidiNoteSelection& midi_list) { @@ -696,10 +712,6 @@ Selection::remove (RegionView* r) if (regions.remove (r)) { RegionsChanged (); } - - if (Config->get_link_region_and_track_selection() && !regions.involves (r->get_time_axis_view())) { - remove (&r->get_time_axis_view()); - } } void @@ -711,13 +723,6 @@ Selection::remove (MidiRegionView* mrv) midi_regions.erase (x); MidiRegionsChanged (); } - -#if 0 - /* XXX fix this up ? */ - if (Config->get_link_region_and_track_selection() && !regions.involves (r->get_time_axis_view())) { - remove (&r->get_time_axis_view()); - } -#endif } @@ -756,6 +761,7 @@ Selection::remove (boost::shared_ptr ac) void Selection::set (TimeAxisView* track) { + clear_objects(); //enforce object/range exclusivity clear_tracks (); add (track); } @@ -763,6 +769,7 @@ Selection::set (TimeAxisView* track) void Selection::set (const TrackViewList& track_list) { + clear_objects(); //enforce object/range exclusivity clear_tracks (); add (track_list); } @@ -771,6 +778,7 @@ void Selection::set (const MidiNoteSelection& midi_list) { clear_time (); //enforce region/object exclusivity + clear_tracks(); //enforce object/track exclusivity clear_objects (); add (midi_list); } @@ -779,6 +787,7 @@ void Selection::set (boost::shared_ptr playlist) { clear_time (); //enforce region/object exclusivity + clear_tracks(); //enforce object/track exclusivity clear_objects (); add (playlist); } @@ -795,6 +804,7 @@ void Selection::set (const RegionSelection& rs) { clear_time(); //enforce region/object exclusivity + clear_tracks(); //enforce object/track exclusivity clear_objects(); regions = rs; RegionsChanged(); /* EMIT SIGNAL */ @@ -804,44 +814,27 @@ void Selection::set (MidiRegionView* mrv) { clear_time(); //enforce region/object exclusivity + clear_tracks(); //enforce object/track exclusivity clear_objects (); add (mrv); } void -Selection::set (RegionView* r, bool also_clear_tracks) +Selection::set (RegionView* r, bool /*also_clear_tracks*/) { clear_time(); //enforce region/object exclusivity + clear_tracks(); //enforce object/track exclusivity clear_objects (); - if (also_clear_tracks && !Config->get_link_region_and_track_selection()) { - /* clear_regions() will have done this if the link preference - * is enabled - */ - clear_tracks (); - } add (r); } void Selection::set (vector& v) { - bool had_regions = !regions.empty(); - clear_time(); //enforce region/object exclusivity + clear_tracks(); //enforce object/track exclusivity clear_objects(); - if (Config->get_link_region_and_track_selection()) { - if (had_regions) { - /* there were regions before, so we're changing the - * region selection (likely), thus link region/track - * selection. relevant tracks will get selected - * as we ::add() below. - */ - clear_tracks (); - // make sure to deselect any automation selections - clear_points(); - } - } add (v); } @@ -911,8 +904,9 @@ void Selection::set (boost::shared_ptr ac) { clear_time(); //enforce region/object exclusivity + clear_tracks(); //enforce object/track exclusivity clear_objects(); - + add (ac); } @@ -925,7 +919,7 @@ Selection::selected (Marker* m) bool Selection::selected (TimeAxisView* tv) { - return find (tracks.begin(), tracks.end(), tv) != tracks.end(); + return tv->get_selected (); } bool @@ -962,13 +956,14 @@ Selection::empty (bool internal_selection) as a cut buffer. */ - return object_level_empty && midi_notes.empty(); + return object_level_empty && midi_notes.empty() && points.empty(); } void Selection::toggle (ControlPoint* cp) { clear_time(); //enforce region/object exclusivity + clear_tracks(); //enforce object/track exclusivity cp->set_selected (!cp->get_selected ()); PointSelection::iterator i = find (points.begin(), points.end(), cp); @@ -985,6 +980,7 @@ void Selection::toggle (vector const & cps) { clear_time(); //enforce region/object exclusivity + clear_tracks(); //enforce object/track exclusivity for (vector::const_iterator i = cps.begin(); i != cps.end(); ++i) { toggle (*i); @@ -995,7 +991,8 @@ void Selection::toggle (list const & selectables) { clear_time(); //enforce region/object exclusivity - + clear_tracks(); //enforce object/track exclusivity + RegionView* rv; ControlPoint* cp; vector rvs; @@ -1010,7 +1007,7 @@ Selection::toggle (list const & selectables) fatal << _("programming error: ") << X_("unknown selectable type passed to Selection::toggle()") << endmsg; - /*NOTREACHED*/ + abort(); /*NOTREACHED*/ } } @@ -1027,12 +1024,9 @@ void Selection::set (list const & selectables) { clear_time (); //enforce region/object exclusivity + clear_tracks(); //enforce object/track exclusivity clear_objects (); - if (Config->get_link_region_and_track_selection ()) { - clear_tracks (); - } - add (selectables); } @@ -1040,6 +1034,7 @@ void Selection::add (PointSelection const & s) { clear_time (); //enforce region/object exclusivity + clear_tracks(); //enforce object/track exclusivity for (PointSelection::const_iterator i = s.begin(); i != s.end(); ++i) { points.push_back (*i); @@ -1050,6 +1045,7 @@ void Selection::add (list const & selectables) { clear_time (); //enforce region/object exclusivity + clear_tracks(); //enforce object/track exclusivity RegionView* rv; ControlPoint* cp; @@ -1065,7 +1061,7 @@ Selection::add (list const & selectables) fatal << _("programming error: ") << X_("unknown selectable type passed to Selection::add()") << endmsg; - /*NOTREACHED*/ + abort(); /*NOTREACHED*/ } } @@ -1091,6 +1087,7 @@ void Selection::add (ControlPoint* cp) { clear_time (); //enforce region/object exclusivity + clear_tracks(); //enforce object/track exclusivity cp->set_selected (true); points.push_back (cp); @@ -1101,6 +1098,7 @@ void Selection::add (vector const & cps) { clear_time (); //enforce region/object exclusivity + clear_tracks(); //enforce object/track exclusivity for (vector::const_iterator i = cps.begin(); i != cps.end(); ++i) { (*i)->set_selected (true); @@ -1113,6 +1111,7 @@ void Selection::set (ControlPoint* cp) { clear_time (); //enforce region/object exclusivity + clear_tracks(); //enforce object/track exclusivity if (cp->get_selected()) { return; @@ -1130,7 +1129,8 @@ void Selection::set (Marker* m) { clear_time (); //enforce region/object exclusivity - clear_objects(); + clear_tracks(); //enforce object/track exclusivity + markers.clear (); add (m); } @@ -1138,8 +1138,6 @@ Selection::set (Marker* m) void Selection::toggle (Marker* m) { - clear_time (); //enforce region/object exclusivity - MarkerSelection::iterator i; if ((i = find (markers.begin(), markers.end(), m)) == markers.end()) { @@ -1164,6 +1162,7 @@ void Selection::add (Marker* m) { clear_time (); //enforce region/object exclusivity + clear_tracks(); //enforce object/track exclusivity if (find (markers.begin(), markers.end(), m) == markers.end()) { markers.push_back (m); @@ -1175,11 +1174,12 @@ void Selection::add (const list& m) { clear_time (); //enforce region/object exclusivity + clear_tracks(); //enforce object/track exclusivity markers.insert (markers.end(), m.begin(), m.end()); markers.sort (); markers.unique (); - + MarkersChanged (); } @@ -1211,6 +1211,7 @@ Selection::get_state () const so that re-opening plugin windows for editor mixer strips works */ + char buf[32]; XMLNode* node = new XMLNode (X_("Selection")); for (TrackSelection::const_iterator i = tracks.begin(); i != tracks.end(); ++i) { @@ -1226,6 +1227,69 @@ Selection::get_state () const } } + for (RegionSelection::const_iterator i = regions.begin(); i != regions.end(); ++i) { + XMLNode* r = node->add_child (X_("Region")); + r->add_property (X_("id"), atoi ((*i)->region ()->id ().to_s ().c_str())); + } + + /* midi region views have thir own internal selection. */ + XMLNode* n = NULL; + list > > > > rid_notes; + editor->get_per_region_note_selection (rid_notes); + if (!rid_notes.empty()) { + n = node->add_child (X_("MIDINote")); + } + list > > > >::iterator rn_it; + for (rn_it = rid_notes.begin(); rn_it != rid_notes.end(); ++rn_it) { + assert(n); // hint for clang static analysis + n->add_property (X_("region_id"), atoi((*rn_it).first.to_s().c_str())); + + for (std::set > >::iterator i = (*rn_it).second.begin(); i != (*rn_it).second.end(); ++i) { + XMLNode* nc = n->add_child(X_("note")); + snprintf(buf, sizeof(buf), "%d", (*i)->channel()); + nc->add_property(X_("channel"), string(buf)); + + snprintf(buf, sizeof(buf), "%f", (*i)->time().to_double()); + nc->add_property(X_("time"), string(buf)); + + snprintf(buf, sizeof(buf), "%d", (*i)->note()); + nc->add_property(X_("note"), string(buf)); + + snprintf(buf, sizeof(buf), "%f", (*i)->length().to_double()); + nc->add_property(X_("length"), string(buf)); + + snprintf(buf, sizeof(buf), "%d", (*i)->velocity()); + nc->add_property(X_("velocity"), string(buf)); + + snprintf(buf, sizeof(buf), "%d", (*i)->off_velocity()); + nc->add_property(X_("off-velocity"), string(buf)); + } + } + + for (PointSelection::const_iterator i = points.begin(); i != points.end(); ++i) { + AutomationTimeAxisView* atv = dynamic_cast (&(*i)->line().trackview); + if (atv) { + + XMLNode* r = node->add_child (X_("ControlPoint")); + r->add_property (X_("type"), "track"); + r->add_property (X_("route-id"), atoi (atv->parent_route()->id ().to_s ().c_str())); + r->add_property (X_("automation-list-id"), atoi ((*i)->line().the_list()->id ().to_s ().c_str())); + r->add_property (X_("parameter"), EventTypeMap::instance().to_symbol ((*i)->line().the_list()->parameter ())); + + snprintf(buf, sizeof(buf), "%d", (*i)->view_index()); + r->add_property (X_("view-index"), string(buf)); + + } + } + + for (TimeSelection::const_iterator i = time.begin(); i != time.end(); ++i) { + XMLNode* t = node->add_child (X_("AudioRange")); + snprintf(buf, sizeof(buf), "%" PRId64, (*i).start); + t->add_property (X_("start"), string(buf)); + snprintf(buf, sizeof(buf), "%" PRId64, (*i).end); + t->add_property (X_("end"), string(buf)); + } + for (MarkerSelection::const_iterator i = markers.begin(); i != markers.end(); ++i) { XMLNode* t = node->add_child (X_("Marker")); @@ -1246,6 +1310,13 @@ Selection::set_state (XMLNode const & node, int) return -1; } + clear_regions (); + clear_midi_notes (); + clear_points (); + clear_time (); + clear_tracks (); + clear_markers (); + XMLNodeList children = node.children (); for (XMLNodeList::const_iterator i = children.begin(); i != children.end(); ++i) { if ((*i)->name() == X_("RouteView")) { @@ -1258,6 +1329,131 @@ Selection::set_state (XMLNode const & node, int) add (rtv); } + } else if ((*i)->name() == X_("Region")) { + XMLProperty* prop_id = (*i)->property (X_("id")); + assert (prop_id); + PBD::ID id (prop_id->value ()); + + RegionSelection rs; + editor->get_regionviews_by_id (id, rs); + + if (!rs.empty ()) { + add (rs); + } else { + /* + regionviews haven't been constructed - stash the region IDs + so we can identify them in Editor::region_view_added () + */ + regions.pending.push_back (id); + } + + } else if ((*i)->name() == X_("MIDINote")) { + XMLProperty* prop_region_id = (*i)->property (X_("region-id")); + + assert (prop_region_id); + + PBD::ID const id (prop_region_id->value ()); + RegionSelection rs; + + editor->get_regionviews_by_id (id, rs); // there could be more than one + + std::list > > notes; + XMLNodeList children = (*i)->children (); + + for (XMLNodeList::const_iterator ci = children.begin(); ci != children.end(); ++ci) { + XMLProperty* prop_channel = (*ci)->property (X_("channel")); + XMLProperty* prop_time = (*ci)->property (X_("time")); + XMLProperty* prop_note = (*ci)->property (X_("note")); + XMLProperty* prop_length = (*ci)->property (X_("length")); + XMLProperty* prop_velocity = (*ci)->property (X_("velocity")); + XMLProperty* prop_off_velocity = (*ci)->property (X_("off-velocity")); + + assert (prop_channel); + assert (prop_time); + assert (prop_note); + assert (prop_length); + assert (prop_velocity); + assert (prop_off_velocity); + + uint8_t channel = atoi(prop_channel->value()); + Evoral::Beats time (atof(prop_time->value())); + Evoral::Beats length (atof(prop_length->value())); + uint8_t note = atoi(prop_note->value()); + uint8_t velocity = atoi(prop_velocity->value()); + uint8_t off_velocity = atoi(prop_off_velocity->value()); + boost::shared_ptr > the_note + (new Evoral::Note (channel, time, length, note, velocity)); + the_note->set_off_velocity (off_velocity); + + notes.push_back (the_note); + } + + for (RegionSelection::iterator rsi = rs.begin(); rsi != rs.end(); ++rsi) { + MidiRegionView* mrv = dynamic_cast (*rsi); + if (mrv) { + mrv->select_notes(notes); + } + } + + if (rs.empty()) { + /* regionviews containing these notes don't yet exist on the canvas.*/ + pending_midi_note_selection.push_back (make_pair (id, notes)); + } + + } else if ((*i)->name() == X_("ControlPoint")) { + XMLProperty* prop_type = (*i)->property (X_("type")); + + assert(prop_type); + + if (prop_type->value () == "track") { + + XMLProperty* prop_route_id = (*i)->property (X_("route-id")); + XMLProperty* prop_alist_id = (*i)->property (X_("automation-list-id")); + XMLProperty* prop_parameter = (*i)->property (X_("parameter")); + XMLProperty* prop_view_index = (*i)->property (X_("view-index")); + + assert (prop_type); + assert (prop_route_id); + assert (prop_alist_id); + assert (prop_parameter); + assert (prop_view_index); + + PBD::ID route_id (prop_route_id->value ()); + RouteTimeAxisView* rtv = editor->get_route_view_by_route_id (route_id); + vector cps; + + if (rtv) { + boost::shared_ptr atv = rtv->automation_child (EventTypeMap::instance().from_symbol (prop_parameter->value ())); + if (atv) { + list > lines = atv->lines(); + for (list > ::iterator li = lines.begin(); li != lines.end(); ++li) { + if ((*li)->the_list()->id() == prop_alist_id->value()) { + ControlPoint* cp = (*li)->nth(atol(prop_view_index->value().c_str())); + if (cp) { + cps.push_back (cp); + cp->show(); + } + } + } + } + } + if (!cps.empty()) { + add (cps); + } + } + + } else if ((*i)->name() == X_("AudioRange")) { + XMLProperty* prop_start = (*i)->property (X_("start")); + XMLProperty* prop_end = (*i)->property (X_("end")); + + assert (prop_start); + assert (prop_end); + + framepos_t s (atol (prop_start->value ().c_str())); + framepos_t e (atol (prop_end->value ().c_str())); + + set_preserving_all_ranges (s, e); + } else if ((*i)->name() == X_("AutomationView")) { XMLProperty* prop_id = (*i)->property (X_("id")); @@ -1270,7 +1466,7 @@ Selection::set_state (XMLNode const & node, int) RouteTimeAxisView* rtv = editor->get_route_view_by_route_id (id); if (rtv) { - boost::shared_ptr atv = rtv->automation_child (EventTypeMap::instance().new_parameter (prop_parameter->value ())); + boost::shared_ptr atv = rtv->automation_child (EventTypeMap::instance().from_symbol (prop_parameter->value ())); /* the automation could be for an entity that was never saved in the session file. Don't freak out if we can't find @@ -1294,9 +1490,9 @@ Selection::set_state (XMLNode const & node, int) if (m) { add (m); } - + } - + } return 0;