X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fselection.cc;h=3f6c282d3afbfd6f018fc7e721e670baa7af200c;hb=6f8cd634501efd70711b148b4ac0e0ce2aa5cc95;hp=638a621428bd3e49ef63a6f349d23d4b197b2771;hpb=90f3128d73bc32288d8ce99e81255ea02f54ffbc;p=ardour.git diff --git a/gtk2_ardour/selection.cc b/gtk2_ardour/selection.cc index 638a621428..3f6c282d3a 100644 --- a/gtk2_ardour/selection.cc +++ b/gtk2_ardour/selection.cc @@ -29,6 +29,7 @@ #include "selection_templates.h" #include "time_axis_view.h" #include "automation_time_axis.h" +#include "public_editor.h" #include "i18n.h" @@ -63,8 +64,7 @@ operator== (const Selection& a, const Selection& b) a.time.group == b.time.group && a.time == b.time && a.lines == b.lines && - a.playlists == b.playlists && - a.redirects == b.redirects; + a.playlists == b.playlists; } /** Clear everything from the Selection */ @@ -77,7 +77,6 @@ Selection::clear () clear_lines(); clear_time (); clear_playlists (); - clear_redirects (); } void @@ -90,15 +89,6 @@ Selection::dump_region_layers() } -void -Selection::clear_redirects () -{ - if (!redirects.empty()) { - redirects.clear (); - RedirectsChanged (); - } -} - void Selection::clear_regions () { @@ -154,17 +144,12 @@ Selection::clear_lines () } void -Selection::toggle (boost::shared_ptr r) +Selection::clear_markers () { - RedirectSelection::iterator i; - - if ((i = find (redirects.begin(), redirects.end(), r)) == redirects.end()) { - redirects.push_back (r); - } else { - redirects.erase (i); + if (!markers.empty()) { + markers.clear (); + MarkersChanged(); } - RedirectsChanged(); - } void @@ -252,16 +237,6 @@ Selection::toggle (nframes_t start, nframes_t end) return next_time_id - 1; } - -void -Selection::add (boost::shared_ptr r) -{ - if (find (redirects.begin(), redirects.end(), r) == redirects.end()) { - redirects.push_back (r); - RedirectsChanged(); - } -} - void Selection::add (boost::shared_ptr pl) { @@ -321,30 +296,58 @@ Selection::add (TimeAxisView* track) } void -Selection::add (RegionView* r) +Selection::add (vector& v) { - if (find (regions.begin(), regions.end(), r) == regions.end()) { - regions.add (r); - add (&r->get_trackview()); + /* 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()); + } + } + } + + if (changed) { RegionsChanged (); } } void -Selection::add (vector& v) +Selection::add (const RegionSelection& rs) { - bool changed = false; + /* XXX This method or the add (const vector&) needs to go + */ - for (vector::iterator i = v.begin(); i != v.end(); ++i) { + 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 (changed) { + if (Config->get_link_region_and_track_selection() && changed) { add (&(*i)->get_trackview()); } } } - + if (changed) { + select_edit_group_regions (); + RegionsChanged (); + } +} + +void +Selection::add (RegionView* r) +{ + 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 (); } } @@ -386,21 +389,18 @@ Selection::replace (uint32_t sid, nframes_t start, nframes_t end) } void -Selection::add (AutomationList* ac) +Selection::add (boost::shared_ptr cl) { - if (find (lines.begin(), lines.end(), ac) == lines.end()) { - lines.push_back (ac); - LinesChanged(); + boost::shared_ptr al + = boost::dynamic_pointer_cast(cl); + if (!al) { + warning << "Programming error: Selected list is not an ARDOUR::AutomationList" << endmsg; + return; + return; } -} - -void -Selection::remove (boost::shared_ptr r) -{ - RedirectSelection::iterator i; - if ((i = find (redirects.begin(), redirects.end(), r)) != redirects.end()) { - redirects.erase (i); - RedirectsChanged (); + if (find (lines.begin(), lines.end(), al) == lines.end()) { + lines.push_back (al); + LinesChanged(); } } @@ -471,7 +471,7 @@ Selection::remove (RegionView* r) RegionsChanged (); } - if (!regions.involves (r->get_trackview())) { + if (Config->get_link_region_and_track_selection() && !regions.involves (r->get_trackview())) { remove (&r->get_trackview()); } } @@ -500,22 +500,15 @@ Selection::remove (nframes_t start, nframes_t end) } void -Selection::remove (AutomationList *ac) +Selection::remove (boost::shared_ptr ac) { - list::iterator i; + AutomationSelection::iterator i; if ((i = find (lines.begin(), lines.end(), ac)) != lines.end()) { lines.erase (i); LinesChanged(); } } -void -Selection::set (boost::shared_ptr r) -{ - clear_redirects (); - add (r); -} - void Selection::set (TimeAxisView* track) { @@ -545,20 +538,32 @@ Selection::set (const list >& pllist) } void -Selection::set (RegionView* r) +Selection::set (const RegionSelection& rs) +{ + clear_regions(); + regions = rs; + RegionsChanged(); /* EMIT SIGNAL */ +} + +void +Selection::set (RegionView* r, bool also_clear_tracks) { clear_regions (); - clear_tracks (); + if (also_clear_tracks) { + clear_tracks (); + } add (r); } void Selection::set (vector& v) { - clear_tracks (); clear_regions (); - // make sure to deselect any automation selections - clear_points(); + if (Config->get_link_region_and_track_selection()) { + clear_tracks (); + // make sure to deselect any automation selections + clear_points(); + } add (v); } @@ -597,12 +602,18 @@ Selection::set (TimeAxisView* track, nframes_t start, nframes_t end) } void -Selection::set (AutomationList *ac) +Selection::set (boost::shared_ptr ac) { lines.clear(); add (ac); } +bool +Selection::selected (Marker* m) +{ + return find (markers.begin(), markers.end(), m) != markers.end(); +} + bool Selection::selected (TimeAxisView* tv) { @@ -625,7 +636,7 @@ Selection::empty () lines.empty () && time.empty () && playlists.empty () && - redirects.empty () + markers.empty() ; } @@ -732,3 +743,95 @@ Selection::add (vector& autos) PointsChanged (); } + +void +Selection::select_edit_group_regions () +{ + std::set regions_to_add; + + for (RegionSelection::iterator i = regions.begin(); i != regions.end(); ++i) { + vector e; + editor->get_equivalent_regions (*i, e); + for (vector::iterator j = e.begin(); j != e.end(); ++j) { + regions_to_add.insert(*j); + } + } + + for (std::set::iterator i = regions_to_add.begin(); i != regions_to_add.end(); ++i) { + add (*i); + } +} + +void +Selection::set (Marker* m) +{ + clear_markers (); + add (m); +} + +void +Selection::toggle (Marker* m) +{ + MarkerSelection::iterator i; + + if ((i = find (markers.begin(), markers.end(), m)) == markers.end()) { + add (m); + } else { + remove (m); + } +} + +void +Selection::remove (Marker* m) +{ + MarkerSelection::iterator i; + + if ((i = find (markers.begin(), markers.end(), m)) != markers.end()) { + markers.erase (i); + MarkersChanged(); + } +} + +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)); + + markers.push_back (m); + MarkersChanged(); + } +} + +void +Selection::add (const list& m) +{ + markers.insert (markers.end(), m.begin(), m.end()); + MarkersChanged (); +} + +void +MarkerSelection::range (nframes64_t& s, nframes64_t& e) +{ + s = max_frames; + e = 0; + + for (MarkerSelection::iterator i = begin(); i != end(); ++i) { + + if ((*i)->position() < s) { + s = (*i)->position(); + } + + if ((*i)->position() > e) { + e = (*i)->position(); + } + } + + s = std::min (s, e); + e = std::max (s, e); +}