X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fselection.cc;h=ab26bfd48ab484a99e2c1f6cc63ab8aaa90e3a07;hb=5456fd5717feb3133cc22aef80cc858d1cb0551b;hp=009b40d26d6ce208db4f50adb14538512ba7a40b;hpb=fc77252d5186360c6a00f0f098f43253cd26e4ba;p=ardour.git diff --git a/gtk2_ardour/selection.cc b/gtk2_ardour/selection.cc index 009b40d26d..ab26bfd48a 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" @@ -34,24 +40,24 @@ #include "automation_time_axis.h" #include "public_editor.h" #include "control_point.h" +#include "vca_time_axis.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) : tracks (e) , editor (e) , next_time_id (0) - , _no_tracks_changed (false) { clear (); @@ -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,6 +114,41 @@ Selection::clear () clear_midi_notes (); clear_midi_regions (); clear_markers (); + pending_midi_note_selection.clear(); +} + +void +Selection::clear_objects (bool with_signal) +{ + 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 (bool with_signal) +{ + if (!tracks.empty()) { + PresentationInfo::ChangeSuspender cs; + + for (TrackViewList::iterator x = tracks.begin(); x != tracks.end(); ++x) { + (*x)->set_selected (false); + } + + tracks.clear (); + } +} + +void +Selection::clear_time (bool with_signal) +{ + time.clear(); + if (with_signal) { + TimeChanged (); + } } void @@ -121,59 +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 (); - } - } -} - -void -Selection::clear_tracks () -{ - if (!tracks.empty()) { - tracks.clear (); - if (!_no_tracks_changed) { - TracksChanged(); + 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_time () -{ - time.clear(); - - TimeChanged (); -} - -void -Selection::clear_playlists () +Selection::clear_playlists (bool with_signal) { /* Selections own their playlists */ @@ -185,31 +223,40 @@ 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(); + } } } 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()) { @@ -225,7 +272,12 @@ Selection::toggle (boost::shared_ptr pl) void Selection::toggle (const TrackViewList& track_list) { + PresentationInfo::ChangeSuspender cs; + for (TrackViewList::const_iterator i = track_list.begin(); i != track_list.end(); ++i) { + if (dynamic_cast (*i)) { + continue; + } toggle ((*i)); } } @@ -233,22 +285,28 @@ Selection::toggle (const TrackViewList& track_list) void Selection::toggle (TimeAxisView* track) { + if (dynamic_cast (track)) { + return; + } + TrackSelection::iterator i; if ((i = find (tracks.begin(), tracks.end(), track)) == tracks.end()) { tracks.push_back (track); + track->set_selected (true); } else { tracks.erase (i); + track->set_selected (false); } - if (!_no_tracks_changed) { - TracksChanged(); - } } 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)); } @@ -274,6 +332,9 @@ Selection::toggle (MidiCutBuffer* midi) 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()) { @@ -288,6 +349,9 @@ Selection::toggle (RegionView* r) void Selection::toggle (MidiRegionView* mrv) { + clear_time(); //enforce object/range exclusivity + clear_tracks(); //enforce object/track exclusivity + MidiRegionSelection::iterator i; if ((i = find (midi_regions.begin(), midi_regions.end(), mrv)) == midi_regions.end()) { @@ -302,6 +366,9 @@ Selection::toggle (MidiRegionView* mrv) void Selection::toggle (vector& r) { + clear_time(); //enforce object/range exclusivity + clear_tracks(); //enforce object/track exclusivity + RegionSelection::iterator i; for (vector::iterator x = r.begin(); x != r.end(); ++x) { @@ -318,22 +385,27 @@ Selection::toggle (vector& r) long Selection::toggle (framepos_t start, framepos_t end) { + clear_objects(); //enforce object/range exclusivity + AudioRangeComparator cmp; /* 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); @@ -344,6 +416,9 @@ Selection::add (boost::shared_ptr pl) 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) { @@ -360,13 +435,20 @@ Selection::add (const list >& pllist) } void -Selection::add (const TrackViewList& track_list) +Selection::add (TrackViewList const & track_list) { + clear_objects(); //enforce object/range exclusivity + + PresentationInfo::ChangeSuspender cs; + TrackViewList added = tracks.add (track_list); if (!added.empty()) { - if (!_no_tracks_changed) { - TracksChanged (); + for (TrackViewList::iterator x = added.begin(); x != added.end(); ++x) { + if (dynamic_cast (*x)) { + continue; + } + (*x)->set_selected (true); } } } @@ -374,6 +456,10 @@ Selection::add (const TrackViewList& track_list) void Selection::add (TimeAxisView* track) { + if (dynamic_cast (track)) { + return; + } + TrackViewList tr; tr.push_back (track); add (tr); @@ -382,6 +468,9 @@ Selection::add (TimeAxisView* track) 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(); @@ -405,6 +494,9 @@ Selection::add (MidiCutBuffer* midi) 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 */ @@ -413,9 +505,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()); - } } } @@ -427,6 +516,9 @@ Selection::add (vector& v) 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 */ @@ -435,9 +527,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()); - } } } @@ -449,28 +538,28 @@ Selection::add (const RegionSelection& rs) 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 (); } } @@ -478,22 +567,41 @@ Selection::add (MidiRegionView* mrv) long Selection::add (framepos_t start, framepos_t end) { + clear_objects(); //enforce object/range exclusivity + AudioRangeComparator cmp; /* 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); @@ -514,16 +622,23 @@ Selection::replace (uint32_t sid, framepos_t start, framepos_t end) 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); if (!al) { 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 @@ -531,40 +646,39 @@ Selection::remove (TimeAxisView* track) { list::iterator i; if ((i = find (tracks.begin(), tracks.end(), track)) != tracks.end()) { - tracks.erase (i); - if (!_no_tracks_changed) { - TracksChanged(); - } - } -} + /* erase first, because set_selected() will remove the track + from the selection, invalidating the iterator. -void -Selection::remove (ControlPoint* p) -{ - PointSelection::iterator i = find (points.begin(), points.end(), p); - if (i != points.end ()) { - points.erase (i); + In fact, we don't really even need to do the erase, but this is + a hangover of axis view selection being in the GUI. + */ + tracks.erase (i); + track->set_selected (false); } } void Selection::remove (const TrackViewList& track_list) { - bool changed = false; + PresentationInfo::ChangeSuspender cs; for (TrackViewList::const_iterator i = track_list.begin(); i != track_list.end(); ++i) { TrackViewList::iterator x = find (tracks.begin(), tracks.end(), *i); + if (x != tracks.end()) { tracks.erase (x); - changed = true; + (*i)->set_selected (false); } } +} - if (changed) { - 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); } } @@ -637,31 +751,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) { @@ -697,42 +801,92 @@ Selection::remove (boost::shared_ptr ac) void Selection::set (TimeAxisView* track) { - clear_tracks (); + if (dynamic_cast (track)) { + return; + } + clear_objects (); //enforce object/range exclusivity + + PresentationInfo::ChangeSuspender cs; + + if (!tracks.empty()) { + + if (tracks.size() == 1 && tracks.front() == track) { + /* already single selection: nothing to do */ + return; + } + + for (TrackViewList::iterator x = tracks.begin(); x != tracks.end(); ++x) { + (*x)->set_selected (false); + } + + tracks.clear (); + } + add (track); } void Selection::set (const TrackViewList& track_list) { - clear_tracks (); - add (track_list); + clear_objects(); //enforce object/range exclusivity + + + TrackViewList to_be_added; + TrackViewList to_be_removed; + + for (TrackViewList::const_iterator x = tracks.begin(); x != tracks.end(); ++x) { + if (find (track_list.begin(), track_list.end(), *x) == track_list.end()) { + to_be_removed.push_back (*x); + } + } + + for (TrackViewList::const_iterator x = track_list.begin(); x != track_list.end(); ++x) { + if (dynamic_cast (*x)) { + continue; + } + if (find (tracks.begin(), tracks.end(), *x) == tracks.end()) { + to_be_added.push_back (*x); + } + } + + PresentationInfo::ChangeSuspender cs; + remove (to_be_removed); + add (to_be_added); + } void Selection::set (const MidiNoteSelection& midi_list) { - clear_midi_notes (); + clear_time (); //enforce region/object exclusivity + clear_tracks(); //enforce object/track exclusivity + clear_objects (); add (midi_list); } void Selection::set (boost::shared_ptr playlist) { - clear_playlists (); + clear_time (); //enforce region/object exclusivity + clear_tracks(); //enforce object/track exclusivity + clear_objects (); add (playlist); } void Selection::set (const list >& pllist) { - clear_playlists (); + clear_time(); //enforce region/object exclusivity + clear_objects (); add (pllist); } void Selection::set (const RegionSelection& rs) { - clear_regions(); + clear_time(); //enforce region/object exclusivity + clear_tracks(); //enforce object/track exclusivity + clear_objects(); regions = rs; RegionsChanged(); /* EMIT SIGNAL */ } @@ -740,42 +894,28 @@ Selection::set (const RegionSelection& rs) void Selection::set (MidiRegionView* mrv) { - clear_midi_regions (); + 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_regions (); - 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 (); - } + clear_time(); //enforce region/object exclusivity + clear_tracks(); //enforce object/track exclusivity + clear_objects (); add (r); } void Selection::set (vector& v) { - bool had_regions = !regions.empty(); - - clear_regions (); + 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); } @@ -785,12 +925,15 @@ Selection::set (vector& v) long Selection::set (framepos_t start, framepos_t end) { + clear_objects(); //enforce region/object exclusivity + clear_time(); + if ((start == 0 && end == 0) || end < start) { return 0; } 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 */ @@ -819,12 +962,14 @@ Selection::set (framepos_t start, framepos_t end) void Selection::set_preserving_all_ranges (framepos_t start, framepos_t end) { + clear_objects(); //enforce region/object exclusivity + if ((start == 0 && end == 0) || (end < start)) { return; } 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; @@ -839,30 +984,33 @@ Selection::set_preserving_all_ranges (framepos_t start, framepos_t end) void Selection::set (boost::shared_ptr ac) { - lines.clear(); + 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) const { return find (markers.begin(), markers.end(), m) != markers.end(); } bool -Selection::selected (TimeAxisView* tv) +Selection::selected (TimeAxisView* tv) const { - return find (tracks.begin(), tracks.end(), tv) != tracks.end(); + return tv->selected (); } bool -Selection::selected (RegionView* rv) +Selection::selected (RegionView* rv) const { return find (regions.begin(), regions.end(), rv) != regions.end(); } bool -Selection::selected (ControlPoint* cp) +Selection::selected (ControlPoint* cp) const { return find (points.begin(), points.end(), cp) != points.end(); } @@ -889,13 +1037,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) { - cp->set_selected (!cp->get_selected ()); + clear_time(); //enforce region/object exclusivity + clear_tracks(); //enforce object/track exclusivity + + cp->set_selected (!cp->selected ()); PointSelection::iterator i = find (points.begin(), points.end(), cp); if (i == points.end()) { points.push_back (cp); @@ -909,6 +1060,9 @@ Selection::toggle (ControlPoint* cp) 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); } @@ -917,6 +1071,9 @@ Selection::toggle (vector const & cps) void Selection::toggle (list const & selectables) { + clear_time(); //enforce region/object exclusivity + clear_tracks(); //enforce object/track exclusivity + RegionView* rv; ControlPoint* cp; vector rvs; @@ -931,7 +1088,7 @@ Selection::toggle (list const & selectables) fatal << _("programming error: ") << X_("unknown selectable type passed to Selection::toggle()") << endmsg; - /*NOTREACHED*/ + abort(); /*NOTREACHED*/ } } @@ -947,12 +1104,9 @@ Selection::toggle (list const & selectables) void Selection::set (list const & selectables) { - clear_regions(); - clear_points (); - - if (Config->get_link_region_and_track_selection ()) { - clear_tracks (); - } + clear_time (); //enforce region/object exclusivity + clear_tracks(); //enforce object/track exclusivity + clear_objects (); add (selectables); } @@ -960,6 +1114,9 @@ Selection::set (list const & selectables) 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); } @@ -968,6 +1125,9 @@ Selection::add (PointSelection const & s) void Selection::add (list const & selectables) { + clear_time (); //enforce region/object exclusivity + clear_tracks(); //enforce object/track exclusivity + RegionView* rv; ControlPoint* cp; vector rvs; @@ -982,7 +1142,7 @@ Selection::add (list const & selectables) fatal << _("programming error: ") << X_("unknown selectable type passed to Selection::add()") << endmsg; - /*NOTREACHED*/ + abort(); /*NOTREACHED*/ } } @@ -996,17 +1156,22 @@ 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 (); + } } } 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); PointsChanged (); /* EMIT SIGNAL */ @@ -1015,15 +1180,23 @@ Selection::add (ControlPoint* cp) 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) { - add (*i); + (*i)->set_selected (true); + points.push_back (*i); } + PointsChanged (); /* EMIT SIGNAL */ } void Selection::set (ControlPoint* cp) { - if (cp->get_selected()) { + clear_time (); //enforce region/object exclusivity + clear_tracks(); //enforce object/track exclusivity + + if (cp->selected () && points.size () == 1) { return; } @@ -1031,19 +1204,22 @@ Selection::set (ControlPoint* cp) cp->line().nth (i)->set_selected (false); } - clear_points (); + clear_objects (); add (cp); } void -Selection::set (Marker* m) +Selection::set (ArdourMarker* m) { - clear_markers (); + clear_time (); //enforce region/object exclusivity + clear_tracks(); //enforce object/track exclusivity + markers.clear (); + add (m); } void -Selection::toggle (Marker* m) +Selection::toggle (ArdourMarker* m) { MarkerSelection::iterator i; @@ -1055,7 +1231,7 @@ Selection::toggle (Marker* m) } void -Selection::remove (Marker* m) +Selection::remove (ArdourMarker* m) { MarkerSelection::iterator i; @@ -1066,8 +1242,11 @@ 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); MarkersChanged(); @@ -1075,12 +1254,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 (); } @@ -1112,6 +1294,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) { @@ -1127,6 +1310,62 @@ 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. */ + list > > > > rid_notes; + editor->get_per_region_note_selection (rid_notes); + + list > > > >::iterator rn_it; + for (rn_it = rid_notes.begin(); rn_it != rid_notes.end(); ++rn_it) { + XMLNode* n = node->add_child (X_("MIDINotes")); + 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)->id()); + nc->add_property (X_("note-id"), 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")); @@ -1147,11 +1386,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); @@ -1159,10 +1405,143 @@ 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_("MIDINotes")) { + 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_id = (*ci)->property (X_("note-id")); + if (prop_id) { + Evoral::event_id_t id = atoi(prop_id->value()); + notes.push_back (id); + } + } + + 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); @@ -1171,7 +1550,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 @@ -1185,19 +1564,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; @@ -1218,9 +1597,3 @@ Selection::remove_regions (TimeAxisView* t) i = tmp; } } - -void -Selection::block_tracks_changed (bool yn) -{ - _no_tracks_changed = yn; -}