X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fregion_selection.cc;h=57ab59fd6864cb7e5a9b0f0bb7d879f2317efa67;hb=90ea64d1fc9e64347aca9df8c64ff0aeb674410d;hp=c10888a0864c129e1f4500d2345ef8080f762329;hpb=3254468526441d82134d49fd8c01305c4c362851;p=ardour.git diff --git a/gtk2_ardour/region_selection.cc b/gtk2_ardour/region_selection.cc index c10888a086..57ab59fd68 100644 --- a/gtk2_ardour/region_selection.cc +++ b/gtk2_ardour/region_selection.cc @@ -33,10 +33,7 @@ using namespace PBD; */ RegionSelection::RegionSelection () { - RegionView::RegionViewGoingAway.connect (death_connection, MISSING_INVALIDATOR, ui_bind (&RegionSelection::remove_it, this, _1), gui_context()); - - _current_start = 0; - _current_end = 0; + RegionView::RegionViewGoingAway.connect (death_connection, MISSING_INVALIDATOR, boost::bind (&RegionSelection::remove_it, this, _1), gui_context()); } /** Copy constructor. @@ -45,10 +42,7 @@ RegionSelection::RegionSelection () RegionSelection::RegionSelection (const RegionSelection& other) : std::list() { - RegionView::RegionViewGoingAway.connect (death_connection, MISSING_INVALIDATOR, ui_bind (&RegionSelection::remove_it, this, _1), gui_context()); - - _current_start = other._current_start; - _current_end = other._current_end; + RegionView::RegionViewGoingAway.connect (death_connection, MISSING_INVALIDATOR, boost::bind (&RegionSelection::remove_it, this, _1), gui_context()); for (RegionSelection::const_iterator i = other.begin(); i != other.end(); ++i) { add (*i); @@ -65,9 +59,6 @@ RegionSelection::operator= (const RegionSelection& other) clear_all(); - _current_start = other._current_start; - _current_end = other._current_end; - for (RegionSelection::const_iterator i = other.begin(); i != other.end(); ++i) { add (*i); } @@ -83,8 +74,6 @@ RegionSelection::clear_all() { clear(); _bylayer.clear(); - _current_start = 0; - _current_end = 0; } /** @@ -98,7 +87,7 @@ bool RegionSelection::contains (RegionView* rv) const /** Add a region to the selection. * @param rv Region to add. - * @return false if we already had the region or if it cannot be added, + * @return false if we already had the region or if it cannot be added, * otherwise true. */ bool @@ -117,14 +106,6 @@ RegionSelection::add (RegionView* rv) return false; } - if (rv->region()->first_frame() < _current_start || empty()) { - _current_start = rv->region()->first_frame(); - } - - if (rv->region()->last_frame() > _current_end || empty()) { - _current_end = rv->region()->last_frame(); - } - push_back (rv); /* add to layer sorted list */ @@ -157,53 +138,7 @@ RegionSelection::remove (RegionView* rv) // remove from layer sorted list _bylayer.remove (rv); - if (size() == 1) { - - /* this is the last one, so when we delete it - we will be empty. - */ - - _current_start = 0; - _current_end = 0; - - } else { - - boost::shared_ptr region ((*r)->region()); - - if (region->first_frame() == _current_start) { - - /* reset current start */ - - nframes_t ref = max_frames; - - for (RegionSelection::iterator i = begin (); i != end(); ++i) { - if (region->first_frame() < ref) { - ref = region->first_frame(); - } - } - - _current_start = ref; - - } - - if (region->last_frame() == _current_end) { - - /* reset current end */ - - nframes_t ref = 0; - - for (RegionSelection::iterator i = begin (); i != end(); ++i) { - if (region->first_frame() > ref) { - ref = region->first_frame(); - } - } - - _current_end = ref; - } - } - erase (r); - return true; } @@ -314,3 +249,40 @@ RegionSelection::involves (const TimeAxisView& tv) const return false; } +framepos_t +RegionSelection::start () const +{ + framepos_t s = max_framepos; + for (RegionSelection::const_iterator i = begin(); i != end(); ++i) { + s = min (s, (*i)->region()->position ()); + } + + if (s == max_framepos) { + return 0; + } + + return s; +} + +framepos_t +RegionSelection::end_frame () const +{ + framepos_t e = 0; + for (RegionSelection::const_iterator i = begin(); i != end(); ++i) { + e = max (e, (*i)->region()->last_frame ()); + } + + return e; +} + +/** @return the playlists that the regions in the selection are on */ +set > +RegionSelection::playlists () const +{ + set > pl; + for (RegionSelection::const_iterator i = begin(); i != end(); ++i) { + pl.insert ((*i)->region()->playlist ()); + } + + return pl; +}