X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fselection.cc;h=146d9a65c50f9c2da169a66bdc44b8a7988e0aac;hb=89b0beb2ddf002e8d95ad89148e2c7e395294b0c;hp=66d1075557d9f7079d3a5b966c909d2c630338ee;hpb=e57c4d4c43c0d302c0b06128e0ba10c4683ee8fe;p=ardour.git diff --git a/gtk2_ardour/selection.cc b/gtk2_ardour/selection.cc index 66d1075557..146d9a65c5 100644 --- a/gtk2_ardour/selection.cc +++ b/gtk2_ardour/selection.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2002 Paul Davis + Copyright (C) 2002 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -25,6 +25,7 @@ #include "ardour/playlist.h" #include "ardour/rc_configuration.h" +#include "gui_thread.h" #include "midi_cut_buffer.h" #include "region_view.h" #include "selection.h" @@ -32,13 +33,13 @@ #include "time_axis_view.h" #include "automation_time_axis.h" #include "public_editor.h" +#include "control_point.h" #include "i18n.h" using namespace std; using namespace ARDOUR; using namespace PBD; -using namespace sigc; struct AudioRangeComparator { bool operator()(AudioRange a, AudioRange b) { @@ -46,6 +47,27 @@ struct AudioRangeComparator { } }; +Selection::Selection (const PublicEditor* e) + : tracks (e) + , editor (e) + , next_time_id (0) + , _no_tracks_changed (false) +{ + clear (); + + /* we have disambiguate which remove() for the compiler */ + + 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::*point_remove)(ControlPoint*) = &Selection::remove; + ControlPoint::CatchDeletion.connect (*this, MISSING_INVALIDATOR, boost::bind (point_remove, this, _1), gui_context()); +} + +#if 0 Selection& Selection::operator= (const Selection& other) { @@ -59,14 +81,13 @@ Selection::operator= (const Selection& other) } return *this; } +#endif bool operator== (const Selection& a, const Selection& b) { return a.regions == b.regions && a.tracks == b.tracks && - a.time.track == b.time.track && - a.time.group == b.time.group && a.time == b.time && a.lines == b.lines && a.playlists == b.playlists && @@ -86,6 +107,37 @@ Selection::clear () clear_playlists (); clear_midi_notes (); clear_midi_regions (); + clear_markers (); +} + +void +Selection::clear_objects () +{ + clear_regions (); + clear_points (); + clear_lines(); + clear_playlists (); + clear_midi_notes (); + clear_midi_regions (); +} + +void +Selection::clear_tracks () +{ + if (!tracks.empty()) { + tracks.clear (); + if (!_no_tracks_changed) { + TracksChanged(); + } + } +} + +void +Selection::clear_time () +{ + time.clear(); + + TimeChanged (); } void @@ -104,15 +156,9 @@ Selection::clear_regions () if (!regions.empty()) { regions.clear_all (); RegionsChanged(); - } -} - -void -Selection::clear_tracks () -{ - if (!tracks.empty()) { - tracks.clear (); - TracksChanged(); + if (Config->get_link_region_and_track_selection()) { + clear_tracks (); + } } } @@ -137,16 +183,6 @@ Selection::clear_midi_regions () } } -void -Selection::clear_time () -{ - time.track = 0; - time.group = 0; - time.clear(); - - TimeChanged (); -} - void Selection::clear_playlists () { @@ -185,6 +221,8 @@ Selection::clear_markers () void Selection::toggle (boost::shared_ptr pl) { + clear_time(); //enforce object/range exclusivity + PlaylistSelection::iterator i; if ((i = find (playlists.begin(), playlists.end(), pl)) == playlists.end()) { @@ -198,9 +236,9 @@ Selection::toggle (boost::shared_ptr pl) } void -Selection::toggle (const list& track_list) +Selection::toggle (const TrackViewList& track_list) { - for (list::const_iterator i = track_list.begin(); i != track_list.end(); ++i) { + for (TrackViewList::const_iterator i = track_list.begin(); i != track_list.end(); ++i) { toggle ((*i)); } } @@ -209,21 +247,23 @@ void Selection::toggle (TimeAxisView* track) { TrackSelection::iterator i; - + if ((i = find (tracks.begin(), tracks.end(), track)) == tracks.end()) { - void (Selection::*pmf)(TimeAxisView*) = &Selection::remove; - track->GoingAway.connect (sigc::bind (mem_fun (*this, pmf), track)); tracks.push_back (track); } else { tracks.erase (i); } - TracksChanged(); + if (!_no_tracks_changed) { + TracksChanged(); + } } void Selection::toggle (const MidiNoteSelection& midi_note_list) { + clear_time(); //enforce object/range exclusivity + for (MidiNoteSelection::const_iterator i = midi_note_list.begin(); i != midi_note_list.end(); ++i) { toggle ((*i)); } @@ -233,7 +273,7 @@ void Selection::toggle (MidiCutBuffer* midi) { MidiNoteSelection::iterator i; - + if ((i = find (midi_notes.begin(), midi_notes.end(), midi)) == midi_notes.end()) { midi_notes.push_back (midi); } else { @@ -241,7 +281,7 @@ Selection::toggle (MidiCutBuffer* midi) delete *i; midi_notes.erase (i); } - + MidiNotesChanged(); } @@ -249,6 +289,8 @@ Selection::toggle (MidiCutBuffer* midi) void Selection::toggle (RegionView* r) { + clear_time(); //enforce object/range exclusivity + RegionSelection::iterator i; if ((i = find (regions.begin(), regions.end(), r)) == regions.end()) { @@ -263,6 +305,8 @@ Selection::toggle (RegionView* r) void Selection::toggle (MidiRegionView* mrv) { + clear_time(); //enforce object/range exclusivity + MidiRegionSelection::iterator i; if ((i = find (midi_regions.begin(), midi_regions.end(), mrv)) == midi_regions.end()) { @@ -277,6 +321,8 @@ Selection::toggle (MidiRegionView* mrv) void Selection::toggle (vector& r) { + clear_time(); //enforce object/range exclusivity + RegionSelection::iterator i; for (vector::iterator x = r.begin(); x != r.end(); ++x) { @@ -291,24 +337,28 @@ Selection::toggle (vector& r) } long -Selection::toggle (nframes_t start, nframes_t end) +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 + if (find (playlists.begin(), playlists.end(), pl) == playlists.end()) { pl->use (); playlists.push_back(pl); @@ -319,6 +369,8 @@ Selection::add (boost::shared_ptr pl) void Selection::add (const list >& pllist) { + clear_time(); //enforce object/range exclusivity + bool changed = false; for (list >::const_iterator i = pllist.begin(); i != pllist.end(); ++i) { @@ -328,41 +380,37 @@ Selection::add (const list >& pllist) changed = true; } } - + if (changed) { PlaylistsChanged (); } } void -Selection::add (const list& track_list) +Selection::add (const TrackViewList& track_list) { - list added = tracks.add (track_list); + TrackViewList added = tracks.add (track_list); - for (list::const_iterator i = added.begin(); i != added.end(); ++i) { - void (Selection::*pmf)(TimeAxisView*) = &Selection::remove; - (*i)->GoingAway.connect (sigc::bind (mem_fun (*this, pmf), (*i))); - } - if (!added.empty()) { - TracksChanged (); + if (!_no_tracks_changed) { + TracksChanged (); + } } } void Selection::add (TimeAxisView* track) { - if (find (tracks.begin(), tracks.end(), track) == tracks.end()) { - void (Selection::*pmf)(TimeAxisView*) = &Selection::remove; - track->GoingAway.connect (sigc::bind (mem_fun (*this, pmf), track)); - tracks.push_back (track); - TracksChanged(); - } + TrackViewList tr; + tr.push_back (track); + add (tr); } void Selection::add (const MidiNoteSelection& midi_list) { + clear_time(); //enforce object/range exclusivity + const MidiNoteSelection::const_iterator b = midi_list.begin(); const MidiNoteSelection::const_iterator e = midi_list.end(); @@ -386,16 +434,18 @@ Selection::add (MidiCutBuffer* midi) void Selection::add (vector& v) { + clear_time(); //enforce object/range exclusivity + /* XXX This method or the add (const RegionSelection&) needs to go */ bool changed = false; - + 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_trackview()); + add (&(*i)->get_time_axis_view()); } } } @@ -408,20 +458,22 @@ Selection::add (vector& v) void Selection::add (const RegionSelection& rs) { + clear_time(); //enforce object/range exclusivity + /* XXX This method or the add (const vector&) needs to go */ bool changed = false; - + 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_trackview()); + add (&(*i)->get_time_axis_view()); } } } - + if (changed) { RegionsChanged (); } @@ -430,24 +482,30 @@ Selection::add (const RegionSelection& rs) void Selection::add (RegionView* r) { + clear_time(); //enforce object/range exclusivity + if (find (regions.begin(), regions.end(), r) == regions.end()) { - regions.add (r); - if (Config->get_link_region_and_track_selection()) { - add (&r->get_trackview()); - } - RegionsChanged (); + bool changed = regions.add (r); + if (Config->get_link_region_and_track_selection() && changed) { + add (&r->get_time_axis_view()); + } + if (changed) { + RegionsChanged (); + } } } void Selection::add (MidiRegionView* mrv) { + clear_time(); //enforce object/range 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_trackview()); + add (&mrv->get_time_axis_view()); } #endif MidiRegionsChanged (); @@ -455,24 +513,43 @@ Selection::add (MidiRegionView* mrv) } long -Selection::add (nframes_t start, nframes_t end) +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::replace (uint32_t sid, nframes_t start, nframes_t end) +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); @@ -493,12 +570,13 @@ Selection::replace (uint32_t sid, nframes_t start, nframes_t end) void Selection::add (boost::shared_ptr cl) { + clear_time(); //enforce object/range exclusivity + boost::shared_ptr al = boost::dynamic_pointer_cast(cl); if (!al) { warning << "Programming error: Selected list is not an ARDOUR::AutomationList" << endmsg; return; - return; } if (find (lines.begin(), lines.end(), al) == lines.end()) { lines.push_back (al); @@ -512,27 +590,39 @@ Selection::remove (TimeAxisView* track) list::iterator i; if ((i = find (tracks.begin(), tracks.end(), track)) != tracks.end()) { tracks.erase (i); - TracksChanged(); + if (!_no_tracks_changed) { + TracksChanged(); + } } } void -Selection::remove (const list& track_list) +Selection::remove (ControlPoint* p) { - bool changed = false; + PointSelection::iterator i = find (points.begin(), points.end(), p); + if (i != points.end ()) { + points.erase (i); + } +} - for (list::const_iterator i = track_list.begin(); i != track_list.end(); ++i) { +void +Selection::remove (const TrackViewList& track_list) +{ + bool changed = false; - list::iterator x; + for (TrackViewList::const_iterator i = track_list.begin(); i != track_list.end(); ++i) { - if ((x = find (tracks.begin(), tracks.end(), (*i))) != tracks.end()) { + TrackViewList::iterator x = find (tracks.begin(), tracks.end(), *i); + if (x != tracks.end()) { tracks.erase (x); changed = true; } } if (changed) { - TracksChanged(); + if (!_no_tracks_changed) { + TracksChanged(); + } } } @@ -560,7 +650,7 @@ void Selection::remove (MidiCutBuffer* midi) { MidiNoteSelection::iterator x; - + if ((x = find (midi_notes.begin(), midi_notes.end(), midi)) != midi_notes.end()) { /* remember that we own the MCB */ delete *x; @@ -606,8 +696,8 @@ Selection::remove (RegionView* r) RegionsChanged (); } - if (Config->get_link_region_and_track_selection() && !regions.involves (r->get_trackview())) { - remove (&r->get_trackview()); + if (Config->get_link_region_and_track_selection() && !regions.involves (r->get_time_axis_view())) { + remove (&r->get_time_axis_view()); } } @@ -623,8 +713,8 @@ Selection::remove (MidiRegionView* mrv) #if 0 /* XXX fix this up ? */ - if (Config->get_link_region_and_track_selection() && !regions.involves (r->get_trackview())) { - remove (&r->get_trackview()); + if (Config->get_link_region_and_track_selection() && !regions.involves (r->get_time_axis_view())) { + remove (&r->get_time_axis_view()); } #endif } @@ -640,7 +730,7 @@ Selection::remove (uint32_t selection_id) for (list::iterator i = time.begin(); i != time.end(); ++i) { if ((*i).id == selection_id) { time.erase (i); - + TimeChanged (); break; } @@ -648,7 +738,7 @@ Selection::remove (uint32_t selection_id) } void -Selection::remove (nframes_t /*start*/, nframes_t /*end*/) +Selection::remove (framepos_t /*start*/, framepos_t /*end*/) { } @@ -670,7 +760,7 @@ Selection::set (TimeAxisView* track) } void -Selection::set (const list& track_list) +Selection::set (const TrackViewList& track_list) { clear_tracks (); add (track_list); @@ -679,44 +769,53 @@ Selection::set (const list& track_list) void Selection::set (const MidiNoteSelection& midi_list) { - clear_midi_notes (); + clear_time (); //enforce region/object exclusivity + clear_objects (); add (midi_list); } void Selection::set (boost::shared_ptr playlist) { - clear_playlists (); + clear_time (); //enforce region/object 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_objects(); regions = rs; RegionsChanged(); /* EMIT SIGNAL */ } void -Selection::set (MidiRegionView* mrv) +Selection::set (MidiRegionView* mrv) { - clear_midi_regions (); + clear_time(); //enforce region/object exclusivity + clear_objects (); add (mrv); } void Selection::set (RegionView* r, bool also_clear_tracks) { - clear_regions (); - if (also_clear_tracks) { + clear_time(); //enforce region/object 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); @@ -725,24 +824,41 @@ Selection::set (RegionView* r, bool also_clear_tracks) void Selection::set (vector& v) { - clear_regions (); + bool had_regions = !regions.empty(); + + clear_time(); //enforce region/object exclusivity + clear_objects(); + if (Config->get_link_region_and_track_selection()) { - clear_tracks (); - // make sure to deselect any automation selections - clear_points(); + 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); } +/** Set the start and end time of the time selection, without changing + * the list of tracks it applies to. + */ long -Selection::set (TimeAxisView* track, nframes_t start, nframes_t end) +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 */ @@ -753,25 +869,49 @@ Selection::set (TimeAxisView* track, nframes_t start, nframes_t end) time.front().end = end; } - if (track) { - time.track = track; - time.group = track->route_group(); + time.consolidate (); + + TimeChanged (); + + return time.front().id; +} + +/** Set the start and end of the range selection. If more than one range + * is currently selected, the start of the earliest range and the end of the + * latest range are set. If no range is currently selected, this method + * selects a single range from start to end. + * + * @param start New start time. + * @param end New end time. + */ +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)); } else { - time.track = 0; - time.group = 0; + time.sort (AudioRangeComparator ()); + time.front().start = start; + time.back().end = end; } time.consolidate (); TimeChanged (); - - return time.front().id; } void Selection::set (boost::shared_ptr ac) { - lines.clear(); + clear_time(); //enforce region/object exclusivity + clear_objects(); + add (ac); } @@ -793,13 +933,19 @@ Selection::selected (RegionView* rv) return find (regions.begin(), regions.end(), rv) != regions.end(); } +bool +Selection::selected (ControlPoint* cp) +{ + return find (points.begin(), points.end(), cp) != points.end(); +} + bool Selection::empty (bool internal_selection) { bool object_level_empty = regions.empty () && tracks.empty () && - points.empty () && - playlists.empty () && + points.empty () && + playlists.empty () && lines.empty () && time.empty () && playlists.empty () && @@ -819,34 +965,46 @@ Selection::empty (bool internal_selection) } void -Selection::toggle (const vector& autos) +Selection::toggle (ControlPoint* cp) { - for (vector::const_iterator x = autos.begin(); x != autos.end(); ++x) { - if ((*x)->get_selected()) { - points.remove (**x); - } else { - points.push_back (**x); - } + clear_time(); //enforce region/object exclusivity - delete *x; + cp->set_selected (!cp->get_selected ()); + PointSelection::iterator i = find (points.begin(), points.end(), cp); + if (i == points.end()) { + points.push_back (cp); + } else { + points.erase (i); } PointsChanged (); /* EMIT SIGNAL */ } void -Selection::toggle (list& selectables) +Selection::toggle (vector const & cps) { + clear_time(); //enforce region/object exclusivity + + for (vector::const_iterator i = cps.begin(); i != cps.end(); ++i) { + toggle (*i); + } +} + +void +Selection::toggle (list const & selectables) +{ + clear_time(); //enforce region/object exclusivity + RegionView* rv; - AutomationSelectable* as; + ControlPoint* cp; vector rvs; - vector autos; + vector cps; - for (std::list::iterator i = selectables.begin(); i != selectables.end(); ++i) { + for (std::list::const_iterator i = selectables.begin(); i != selectables.end(); ++i) { if ((rv = dynamic_cast (*i)) != 0) { rvs.push_back (rv); - } else if ((as = dynamic_cast (*i)) != 0) { - autos.push_back (as); + } else if ((cp = dynamic_cast (*i)) != 0) { + cps.push_back (cp); } else { fatal << _("programming error: ") << X_("unknown selectable type passed to Selection::toggle()") @@ -857,35 +1015,51 @@ Selection::toggle (list& selectables) if (!rvs.empty()) { toggle (rvs); - } + } - if (!autos.empty()) { - toggle (autos); - } + if (!cps.empty()) { + toggle (cps); + } } void -Selection::set (list& selectables) +Selection::set (list const & selectables) { - clear_regions(); - clear_points (); + clear_time (); //enforce region/object exclusivity + clear_objects (); + + if (Config->get_link_region_and_track_selection ()) { + clear_tracks (); + } + add (selectables); } +void +Selection::add (PointSelection const & s) +{ + clear_time (); //enforce region/object exclusivity + + for (PointSelection::const_iterator i = s.begin(); i != s.end(); ++i) { + points.push_back (*i); + } +} void -Selection::add (list& selectables) +Selection::add (list const & selectables) { + clear_time (); //enforce region/object exclusivity + RegionView* rv; - AutomationSelectable* as; + ControlPoint* cp; vector rvs; - vector autos; + vector cps; - for (std::list::iterator i = selectables.begin(); i != selectables.end(); ++i) { + for (std::list::const_iterator i = selectables.begin(); i != selectables.end(); ++i) { if ((rv = dynamic_cast (*i)) != 0) { rvs.push_back (rv); - } else if ((as = dynamic_cast (*i)) != 0) { - autos.push_back (as); + } else if ((cp = dynamic_cast (*i)) != 0) { + cps.push_back (cp); } else { fatal << _("programming error: ") << X_("unknown selectable type passed to Selection::add()") @@ -896,11 +1070,11 @@ Selection::add (list& selectables) if (!rvs.empty()) { add (rvs); - } + } - if (!autos.empty()) { - add (autos); - } + if (!cps.empty()) { + add (cps); + } } void @@ -913,19 +1087,50 @@ Selection::clear_points () } void -Selection::add (vector& autos) +Selection::add (ControlPoint* cp) +{ + clear_time (); //enforce region/object exclusivity + + cp->set_selected (true); + points.push_back (cp); + PointsChanged (); /* EMIT SIGNAL */ +} + +void +Selection::add (vector const & cps) +{ + clear_time (); //enforce region/object exclusivity + + for (vector::const_iterator i = cps.begin(); i != cps.end(); ++i) { + (*i)->set_selected (true); + points.push_back (*i); + } + PointsChanged (); /* EMIT SIGNAL */ +} + +void +Selection::set (ControlPoint* cp) { - for (vector::iterator i = autos.begin(); i != autos.end(); ++i) { - points.push_back (**i); + clear_time (); //enforce region/object exclusivity + + if (cp->get_selected()) { + return; } - PointsChanged (); + for (uint32_t i = 0; i < cp->line().npoints(); ++i) { + cp->line().nth (i)->set_selected (false); + } + + clear_objects (); + add (cp); } void Selection::set (Marker* m) { - clear_markers (); + clear_time (); //enforce region/object exclusivity + markers.clear (); + add (m); } @@ -933,7 +1138,7 @@ void Selection::toggle (Marker* m) { MarkerSelection::iterator i; - + if ((i = find (markers.begin(), markers.end(), m)) == markers.end()) { add (m); } else { @@ -955,14 +1160,9 @@ Selection::remove (Marker* m) void Selection::add (Marker* m) { - if (find (markers.begin(), markers.end(), m) == markers.end()) { - - /* disambiguate which remove() for the compiler */ - - void (Selection::*pmf)(Marker*) = &Selection::remove; - - m->GoingAway.connect (bind (mem_fun (*this, pmf), m)); + clear_time (); //enforce region/object exclusivity + if (find (markers.begin(), markers.end(), m) == markers.end()) { markers.push_back (m); MarkersChanged(); } @@ -971,21 +1171,26 @@ Selection::add (Marker* m) void Selection::add (const list& m) { + clear_time (); //enforce region/object exclusivity + markers.insert (markers.end(), m.begin(), m.end()); + markers.sort (); + markers.unique (); + MarkersChanged (); } void -MarkerSelection::range (nframes64_t& s, nframes64_t& e) +MarkerSelection::range (framepos_t& s, framepos_t& e) { - s = max_frames; + s = max_framepos; e = 0; for (MarkerSelection::iterator i = begin(); i != end(); ++i) { if ((*i)->position() < s) { s = (*i)->position(); - } + } if ((*i)->position() > e) { e = (*i)->position(); @@ -995,3 +1200,123 @@ MarkerSelection::range (nframes64_t& s, nframes64_t& e) s = std::min (s, e); e = std::max (s, e); } + +XMLNode& +Selection::get_state () const +{ + /* XXX: not complete; just sufficient to get track selection state + so that re-opening plugin windows for editor mixer strips works + */ + + XMLNode* node = new XMLNode (X_("Selection")); + + for (TrackSelection::const_iterator i = tracks.begin(); i != tracks.end(); ++i) { + RouteTimeAxisView* rtv = dynamic_cast (*i); + AutomationTimeAxisView* atv = dynamic_cast (*i); + if (rtv) { + XMLNode* t = node->add_child (X_("RouteView")); + t->add_property (X_("id"), atoi (rtv->route()->id().to_s().c_str())); + } else if (atv) { + XMLNode* t = node->add_child (X_("AutomationView")); + t->add_property (X_("id"), atoi (atv->parent_route()->id().to_s().c_str())); + t->add_property (X_("parameter"), EventTypeMap::instance().to_symbol (atv->parameter ())); + } + } + + for (MarkerSelection::const_iterator i = markers.begin(); i != markers.end(); ++i) { + XMLNode* t = node->add_child (X_("Marker")); + + bool is_start; + Location* loc = editor->find_location_from_marker (*i, is_start); + + t->add_property (X_("id"), atoi (loc->id().to_s().c_str())); + t->add_property (X_("start"), is_start ? X_("yes") : X_("no")); + } + + return *node; +} + +int +Selection::set_state (XMLNode const & node, int) +{ + if (node.name() != X_("Selection")) { + return -1; + } + + 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")); + assert (prop_id); + PBD::ID id (prop_id->value ()); + RouteTimeAxisView* rtv = editor->get_route_view_by_route_id (id); + if (rtv) { + add (rtv); + } + + } else if ((*i)->name() == X_("AutomationView")) { + + XMLProperty* prop_id = (*i)->property (X_("id")); + XMLProperty* prop_parameter = (*i)->property (X_("parameter")); + + assert (prop_id); + assert (prop_parameter); + + PBD::ID id (prop_id->value ()); + 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 ())); + + /* the automation could be for an entity that was never saved + in the session file. Don't freak out if we can't find + it. + */ + + if (atv) { + add (atv.get()); + } + } + + } else if ((*i)->name() == X_("Marker")) { + + XMLProperty* prop_id = (*i)->property (X_("id")); + XMLProperty* 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 ())); + if (m) { + add (m); + } + + } + + } + + return 0; +} + +void +Selection::remove_regions (TimeAxisView* t) +{ + RegionSelection::iterator i = regions.begin(); + while (i != regions.end ()) { + RegionSelection::iterator tmp = i; + ++tmp; + + if (&(*i)->get_time_axis_view() == t) { + remove (*i); + } + + i = tmp; + } +} + +void +Selection::block_tracks_changed (bool yn) +{ + _no_tracks_changed = yn; +}