X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fselection.cc;h=f7eb676d9693adeeca9c1388c6da76d51d30675f;hb=cf4b4dea3e38bbddb9a1960fcfd4205bb58c1837;hp=395ceda1696ad95aa00b814d292bca6bb473653f;hpb=b43875dd27f9a16ed277d5f87fb6007c367001c9;p=ardour.git diff --git a/gtk2_ardour/selection.cc b/gtk2_ardour/selection.cc index 395ceda169..f7eb676d96 100644 --- a/gtk2_ardour/selection.cc +++ b/gtk2_ardour/selection.cc @@ -19,14 +19,20 @@ #include #include + #include "pbd/error.h" #include "pbd/stacktrace.h" #include "ardour/playlist.h" #include "ardour/rc_configuration.h" +#include "control_protocol/control_protocol.h" + +#include "audio_region_view.h" +#include "debug.h" #include "gui_thread.h" #include "midi_cut_buffer.h" +#include "region_gain_line.h" #include "region_view.h" #include "selection.h" #include "selection_templates.h" @@ -35,16 +41,16 @@ #include "public_editor.h" #include "control_point.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; 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) @@ -60,8 +66,8 @@ Selection::Selection (const PublicEditor* e) void (Selection::*track_remove)(TimeAxisView*) = &Selection::remove; TimeAxisView::CatchDeletion.connect (*this, MISSING_INVALIDATOR, boost::bind (track_remove, this, _1), gui_context()); - void (Selection::*marker_remove)(Marker*) = &Selection::remove; - Marker::CatchDeletion.connect (*this, MISSING_INVALIDATOR, boost::bind (marker_remove, this, _1), gui_context()); + void (Selection::*marker_remove)(ArdourMarker*) = &Selection::remove; + ArdourMarker::CatchDeletion.connect (*this, MISSING_INVALIDATOR, boost::bind (marker_remove, this, _1), gui_context()); void (Selection::*point_remove)(ControlPoint*) = &Selection::remove; ControlPoint::CatchDeletion.connect (*this, MISSING_INVALIDATOR, boost::bind (point_remove, this, _1), gui_context()); @@ -108,37 +114,41 @@ Selection::clear () clear_midi_notes (); clear_midi_regions (); clear_markers (); + pending_midi_note_selection.clear(); } void -Selection::clear_objects () +Selection::clear_objects (bool with_signal) { - clear_regions (); - clear_points (); - clear_lines(); - clear_playlists (); - clear_midi_notes (); - clear_midi_regions (); - clear_markers (); + clear_regions (with_signal); + clear_points (with_signal); + clear_lines(with_signal); + clear_playlists (with_signal); + clear_midi_notes (with_signal); + clear_midi_regions (with_signal); } void -Selection::clear_tracks () +Selection::clear_tracks (bool with_signal) { if (!tracks.empty()) { + for (TrackViewList::iterator x = tracks.begin(); x != tracks.end(); ++x) { + (*x)->set_selected (false); + } tracks.clear (); - if (!_no_tracks_changed) { + if (!_no_tracks_changed && with_signal) { TracksChanged(); } } } void -Selection::clear_time () +Selection::clear_time (bool with_signal) { time.clear(); - - TimeChanged (); + if (with_signal) { + TimeChanged (); + } } void @@ -152,40 +162,56 @@ Selection::dump_region_layers() void -Selection::clear_regions () +Selection::clear_regions (bool with_signal) { if (!regions.empty()) { regions.clear_all (); - RegionsChanged(); - if (Config->get_link_region_and_track_selection()) { - clear_tracks (); + if (with_signal) { + RegionsChanged(); } } } void -Selection::clear_midi_notes () +Selection::clear_midi_notes (bool with_signal) { if (!midi_notes.empty()) { for (MidiNoteSelection::iterator x = midi_notes.begin(); x != midi_notes.end(); ++x) { delete *x; } midi_notes.clear (); - MidiNotesChanged (); + if (with_signal) { + MidiNotesChanged (); + } + } + + // clear note selections for MRV's that have note selections + // this will cause the MRV to be removed from the list + for (MidiRegionSelection::iterator i = midi_regions.begin(); + i != midi_regions.end();) { + MidiRegionSelection::iterator tmp = i; + ++tmp; + MidiRegionView* mrv = dynamic_cast(*i); + if (mrv) { + mrv->clear_selection(); + } + i = tmp; } } void -Selection::clear_midi_regions () +Selection::clear_midi_regions (bool with_signal) { if (!midi_regions.empty()) { midi_regions.clear (); - MidiRegionsChanged (); + if (with_signal) { + MidiRegionsChanged (); + } } } void -Selection::clear_playlists () +Selection::clear_playlists (bool with_signal) { /* Selections own their playlists */ @@ -197,25 +223,31 @@ Selection::clear_playlists () if (!playlists.empty()) { playlists.clear (); - PlaylistsChanged(); + if (with_signal) { + PlaylistsChanged(); + } } } void -Selection::clear_lines () +Selection::clear_lines (bool with_signal) { if (!lines.empty()) { lines.clear (); - LinesChanged(); + if (with_signal) { + LinesChanged(); + } } } void -Selection::clear_markers () +Selection::clear_markers (bool with_signal) { if (!markers.empty()) { markers.clear (); - MarkersChanged(); + if (with_signal) { + MarkersChanged(); + } } } @@ -223,7 +255,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 +283,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 +299,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 +327,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 +344,7 @@ void Selection::toggle (MidiRegionView* mrv) { clear_time(); //enforce object/range exclusivity + clear_tracks(); //enforce object/track exclusivity MidiRegionSelection::iterator i; @@ -323,6 +361,7 @@ void Selection::toggle (vector& r) { clear_time(); //enforce object/range exclusivity + clear_tracks(); //enforce object/track exclusivity RegionSelection::iterator i; @@ -346,20 +385,21 @@ Selection::toggle (framepos_t start, framepos_t end) /* XXX this implementation is incorrect */ - time.push_back (AudioRange (start, end, next_time_id++)); + time.push_back (AudioRange (start, end, ++next_time_id)); time.consolidate (); time.sort (cmp); TimeChanged (); - return next_time_id - 1; + return next_time_id; } 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 +411,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 +431,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 +448,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 +460,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 +486,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 +496,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 +508,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 +518,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,31 +530,27 @@ 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 (); + } } } void Selection::add (MidiRegionView* mrv) { + DEBUG_TRACE(DEBUG::Selection, string_compose("Selection::add MRV %1\n", 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 (); } } @@ -522,20 +564,35 @@ Selection::add (framepos_t start, framepos_t end) /* XXX this implementation is incorrect */ - time.push_back (AudioRange (start, end, next_time_id++)); + time.push_back (AudioRange (start, end, ++next_time_id)); time.consolidate (); time.sort (cmp); TimeChanged (); - return next_time_id - 1; + return next_time_id; +} + +void +Selection::move_time (framecnt_t distance) +{ + if (distance == 0) { + return; + } + + for (list::iterator i = time.begin(); i != time.end(); ++i) { + (*i).start += distance; + (*i).end += distance; + } + + TimeChanged (); } 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); @@ -557,6 +614,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); @@ -564,10 +622,14 @@ Selection::add (boost::shared_ptr cl) warning << "Programming error: Selected list is not an ARDOUR::AutomationList" << endmsg; return; } - if (find (lines.begin(), lines.end(), al) == lines.end()) { - lines.push_back (al); - LinesChanged(); - } + + /* The original may change so we must store a copy (not a pointer) here. + * e.g AutomationLine rewrites the list with gain mapping. + * the downside is that we can't perfom duplicate checks. + * This code was changed in response to #6842 + */ + lines.push_back (boost::shared_ptr (new ARDOUR::AutomationList(*al))); + LinesChanged(); } void @@ -575,22 +637,15 @@ 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(); } } } -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) { @@ -600,6 +655,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; } @@ -612,6 +668,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) { @@ -681,31 +746,21 @@ 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 Selection::remove (MidiRegionView* mrv) { + DEBUG_TRACE(DEBUG::Selection, string_compose("Selection::remove MRV %1\n", mrv)); + MidiRegionSelection::iterator x; if ((x = find (midi_regions.begin(), midi_regions.end(), mrv)) != midi_regions.end()) { 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 } - void Selection::remove (uint32_t selection_id) { @@ -741,14 +796,16 @@ Selection::remove (boost::shared_ptr ac) void Selection::set (TimeAxisView* track) { - clear_tracks (); + clear_objects (); //enforce object/range exclusivity + clear_tracks (false); add (track); } void Selection::set (const TrackViewList& track_list) { - clear_tracks (); + clear_objects(); //enforce object/range exclusivity + clear_tracks (false); add (track_list); } @@ -756,6 +813,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); } @@ -764,6 +822,7 @@ void Selection::set (boost::shared_ptr playlist) { clear_time (); //enforce region/object exclusivity + clear_tracks(); //enforce object/track exclusivity clear_objects (); add (playlist); } @@ -780,6 +839,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 */ @@ -789,44 +849,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); } @@ -844,7 +887,7 @@ Selection::set (framepos_t start, framepos_t end) } if (time.empty()) { - time.push_back (AudioRange (start, end, next_time_id++)); + time.push_back (AudioRange (start, end, ++next_time_id)); } else { /* reuse the first entry, and remove all the rest */ @@ -880,7 +923,7 @@ Selection::set_preserving_all_ranges (framepos_t start, framepos_t end) } if (time.empty ()) { - time.push_back (AudioRange (start, end, next_time_id++)); + time.push_back (AudioRange (start, end, ++next_time_id)); } else { time.sort (AudioRangeComparator ()); time.front().start = start; @@ -896,13 +939,14 @@ void Selection::set (boost::shared_ptr ac) { clear_time(); //enforce region/object exclusivity + clear_tracks(); //enforce object/track exclusivity clear_objects(); - + add (ac); } bool -Selection::selected (Marker* m) +Selection::selected (ArdourMarker* m) { return find (markers.begin(), markers.end(), m) != markers.end(); } @@ -910,7 +954,7 @@ Selection::selected (Marker* m) bool Selection::selected (TimeAxisView* tv) { - return find (tracks.begin(), tracks.end(), tv) != tracks.end(); + return tv->selected (); } bool @@ -947,15 +991,16 @@ 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 ()); + cp->set_selected (!cp->selected ()); PointSelection::iterator i = find (points.begin(), points.end(), cp); if (i == points.end()) { points.push_back (cp); @@ -970,6 +1015,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); @@ -980,7 +1026,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; @@ -995,7 +1042,7 @@ Selection::toggle (list const & selectables) fatal << _("programming error: ") << X_("unknown selectable type passed to Selection::toggle()") << endmsg; - /*NOTREACHED*/ + abort(); /*NOTREACHED*/ } } @@ -1012,12 +1059,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); } @@ -1025,6 +1069,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); @@ -1035,6 +1080,7 @@ void Selection::add (list const & selectables) { clear_time (); //enforce region/object exclusivity + clear_tracks(); //enforce object/track exclusivity RegionView* rv; ControlPoint* cp; @@ -1050,7 +1096,7 @@ Selection::add (list const & selectables) fatal << _("programming error: ") << X_("unknown selectable type passed to Selection::add()") << endmsg; - /*NOTREACHED*/ + abort(); /*NOTREACHED*/ } } @@ -1064,11 +1110,13 @@ Selection::add (list const & selectables) } void -Selection::clear_points () +Selection::clear_points (bool with_signal) { if (!points.empty()) { points.clear (); - PointsChanged (); + if (with_signal) { + PointsChanged (); + } } } @@ -1076,6 +1124,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); @@ -1086,6 +1135,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); @@ -1098,8 +1148,9 @@ void Selection::set (ControlPoint* cp) { clear_time (); //enforce region/object exclusivity + clear_tracks(); //enforce object/track exclusivity - if (cp->get_selected()) { + if (cp->selected () && points.size () == 1) { return; } @@ -1112,19 +1163,18 @@ Selection::set (ControlPoint* cp) } void -Selection::set (Marker* m) +Selection::set (ArdourMarker* m) { clear_time (); //enforce region/object exclusivity - clear_objects(); + clear_tracks(); //enforce object/track exclusivity + markers.clear (); add (m); } void -Selection::toggle (Marker* m) +Selection::toggle (ArdourMarker* m) { - clear_time (); //enforce region/object exclusivity - MarkerSelection::iterator i; if ((i = find (markers.begin(), markers.end(), m)) == markers.end()) { @@ -1135,7 +1185,7 @@ Selection::toggle (Marker* m) } void -Selection::remove (Marker* m) +Selection::remove (ArdourMarker* m) { MarkerSelection::iterator i; @@ -1146,9 +1196,10 @@ Selection::remove (Marker* m) } void -Selection::add (Marker* m) +Selection::add (ArdourMarker* 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); @@ -1157,14 +1208,15 @@ Selection::add (Marker* m) } void -Selection::add (const list& m) +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 (); } @@ -1196,6 +1248,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) { @@ -1211,6 +1264,79 @@ 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)); + continue; + } + + AudioRegionGainLine* argl = dynamic_cast (&(*i)->line()); + if (argl) { + XMLNode* r = node->add_child (X_("ControlPoint")); + r->add_property (X_("type"), "region"); + r->add_property (X_("region-id"), atoi (argl->region_view ().region ()->id ().to_s ().c_str())); + 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")); @@ -1231,11 +1357,18 @@ 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")) { - XMLProperty* prop_id = (*i)->property (X_("id")); + XMLProperty const * prop_id = (*i)->property (X_("id")); assert (prop_id); PBD::ID id (prop_id->value ()); RouteTimeAxisView* rtv = editor->get_route_view_by_route_id (id); @@ -1243,10 +1376,163 @@ Selection::set_state (XMLNode const & node, int) add (rtv); } + } else if ((*i)->name() == X_("Region")) { + XMLProperty const * 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 const * 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 const * prop_channel = (*ci)->property (X_("channel")); + XMLProperty const * prop_time = (*ci)->property (X_("time")); + XMLProperty const * prop_note = (*ci)->property (X_("note")); + XMLProperty const * prop_length = (*ci)->property (X_("length")); + XMLProperty const * prop_velocity = (*ci)->property (X_("velocity")); + XMLProperty const * 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 const * prop_type = (*i)->property (X_("type")); + + assert(prop_type); + + if (prop_type->value () == "track") { + + XMLProperty const * prop_route_id = (*i)->property (X_("route-id")); + XMLProperty const * prop_alist_id = (*i)->property (X_("automation-list-id")); + XMLProperty const * prop_parameter = (*i)->property (X_("parameter")); + XMLProperty const * prop_view_index = (*i)->property (X_("view-index")); + + 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 (prop_type->value () == "region") { + XMLProperty const * prop_region_id = (*i)->property (X_("region-id")); + XMLProperty const * prop_view_index = (*i)->property (X_("view-index")); + + if (!prop_region_id || !prop_view_index) { + continue; + } + + PBD::ID region_id (prop_region_id->value ()); + RegionSelection rs; + editor->get_regionviews_by_id (region_id, rs); + + if (!rs.empty ()) { + vector cps; + for (RegionSelection::iterator rsi = rs.begin(); rsi != rs.end(); ++rsi) { + AudioRegionView* arv = dynamic_cast (*rsi); + if (arv) { + boost::shared_ptr gl = arv->get_gain_line (); + ControlPoint* cp = gl->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 const * prop_start = (*i)->property (X_("start")); + XMLProperty const * 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")); - XMLProperty* prop_parameter = (*i)->property (X_("parameter")); + XMLProperty const * prop_id = (*i)->property (X_("id")); + XMLProperty const * prop_parameter = (*i)->property (X_("parameter")); assert (prop_id); assert (prop_parameter); @@ -1255,7 +1541,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 @@ -1269,19 +1555,19 @@ Selection::set_state (XMLNode const & node, int) } else if ((*i)->name() == X_("Marker")) { - XMLProperty* prop_id = (*i)->property (X_("id")); - XMLProperty* prop_start = (*i)->property (X_("start")); + XMLProperty const * prop_id = (*i)->property (X_("id")); + XMLProperty const * prop_start = (*i)->property (X_("start")); assert (prop_id); assert (prop_start); PBD::ID id (prop_id->value ()); - Marker* m = editor->find_marker_from_location_id (id, string_is_affirmative (prop_start->value ())); + ArdourMarker* m = editor->find_marker_from_location_id (id, string_is_affirmative (prop_start->value ())); if (m) { add (m); } - + } - + } return 0;