X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fselection.cc;h=d0b2cab5c7749a67ff763e3574886bf56c54aff8;hb=ad942b104a80c74c689e0c1b5c016d1870850830;hp=da0047eefc36da4949f83f81141aeee12817b148;hpb=e0aaed6d65f160c328cb8b56d7c6552ee15d65e2;p=ardour.git diff --git a/gtk2_ardour/selection.cc b/gtk2_ardour/selection.cc index da0047eefc..d0b2cab5c7 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 @@ -23,19 +23,23 @@ #include "pbd/stacktrace.h" #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" #include "selection_templates.h" #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) { @@ -43,6 +47,23 @@ struct AudioRangeComparator { } }; +Selection::Selection (const PublicEditor* e) + : tracks (e) + , editor (e) + , next_time_id (0) +{ + clear (); + + /* we have disambiguate which remove() for the compiler */ + + void (Selection::*track_remove)(TimeAxisView*) = &Selection::remove; + TimeAxisView::CatchDeletion.connect (*this, MISSING_INVALIDATOR, ui_bind (track_remove, this, _1), gui_context()); + + void (Selection::*marker_remove)(Marker*) = &Selection::remove; + Marker::CatchDeletion.connect (*this, MISSING_INVALIDATOR, ui_bind (marker_remove, this, _1), gui_context()); +} + +#if 0 Selection& Selection::operator= (const Selection& other) { @@ -51,20 +72,23 @@ Selection::operator= (const Selection& other) tracks = other.tracks; time = other.time; lines = other.lines; + midi_regions = other.midi_regions; + midi_notes = other.midi_notes; } 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; + a.playlists == b.playlists && + a.midi_notes == b.midi_notes && + a.midi_regions == b.midi_regions; } /** Clear everything from the Selection */ @@ -77,6 +101,8 @@ Selection::clear () clear_lines(); clear_time (); clear_playlists (); + clear_midi_notes (); + clear_midi_regions (); } void @@ -107,11 +133,30 @@ Selection::clear_tracks () } } +void +Selection::clear_midi_notes () +{ + if (!midi_notes.empty()) { + for (MidiNoteSelection::iterator x = midi_notes.begin(); x != midi_notes.end(); ++x) { + delete *x; + } + midi_notes.clear (); + MidiNotesChanged (); + } +} + +void +Selection::clear_midi_regions () +{ + if (!midi_regions.empty()) { + midi_regions.clear (); + MidiRegionsChanged (); + } +} + void Selection::clear_time () { - time.track = 0; - time.group = 0; time.clear(); TimeChanged (); @@ -168,10 +213,10 @@ 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) { - toggle ( (*i) ); + for (TrackViewList::const_iterator i = track_list.begin(); i != track_list.end(); ++i) { + toggle ((*i)); } } @@ -179,10 +224,8 @@ 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); @@ -191,6 +234,31 @@ Selection::toggle (TimeAxisView* track) TracksChanged(); } +void +Selection::toggle (const MidiNoteSelection& midi_note_list) +{ + for (MidiNoteSelection::const_iterator i = midi_note_list.begin(); i != midi_note_list.end(); ++i) { + toggle ((*i)); + } +} + +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 { + /* remember that we own the MCB */ + delete *i; + midi_notes.erase (i); + } + + MidiNotesChanged(); +} + + void Selection::toggle (RegionView* r) { @@ -205,6 +273,20 @@ Selection::toggle (RegionView* r) RegionsChanged (); } +void +Selection::toggle (MidiRegionView* mrv) +{ + MidiRegionSelection::iterator i; + + if ((i = find (midi_regions.begin(), midi_regions.end(), mrv)) == midi_regions.end()) { + add (mrv); + } else { + midi_regions.erase (i); + } + + MidiRegionsChanged (); +} + void Selection::toggle (vector& r) { @@ -222,7 +304,7 @@ Selection::toggle (vector& r) } long -Selection::toggle (nframes_t start, nframes_t end) +Selection::toggle (framepos_t start, framepos_t end) { AudioRangeComparator cmp; @@ -231,7 +313,7 @@ Selection::toggle (nframes_t start, nframes_t end) time.push_back (AudioRange (start, end, next_time_id++)); time.consolidate (); time.sort (cmp); - + TimeChanged (); return next_time_id - 1; @@ -259,27 +341,18 @@ Selection::add (const list >& pllist) changed = true; } } - + if (changed) { PlaylistsChanged (); } } void -Selection::add (const list& track_list) +Selection::add (const TrackViewList& track_list) { - bool changed = false; + TrackViewList added = tracks.add (track_list); - for (list::const_iterator i = track_list.begin(); i != track_list.end(); ++i) { - if (find (tracks.begin(), tracks.end(), (*i)) == tracks.end()) { - void (Selection::*pmf)(TimeAxisView*) = &Selection::remove; - (*i)->GoingAway.connect (sigc::bind (mem_fun (*this, pmf), (*i))); - tracks.push_back (*i); - changed = true; - } - } - - if (changed) { + if (!added.empty()) { TracksChanged (); } } @@ -287,11 +360,31 @@ Selection::add (const list& track_list) 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) +{ + const MidiNoteSelection::const_iterator b = midi_list.begin(); + const MidiNoteSelection::const_iterator e = midi_list.end(); + + if (!midi_list.empty()) { + midi_notes.insert (midi_notes.end(), b, e); + MidiNotesChanged (); + } +} + +void +Selection::add (MidiCutBuffer* midi) +{ + /* we take ownership of the MCB */ + + if (find (midi_notes.begin(), midi_notes.end(), midi) == midi_notes.end()) { + midi_notes.push_back (midi); + MidiNotesChanged (); } } @@ -302,12 +395,12 @@ Selection::add (vector& v) */ 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()); } } } @@ -324,18 +417,17 @@ Selection::add (const RegionSelection& rs) */ 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) { - select_edit_group_regions (); RegionsChanged (); } } @@ -344,16 +436,33 @@ void Selection::add (RegionView* r) { if (find (regions.begin(), regions.end(), r) == regions.end()) { - regions.add (r); + 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) +{ + 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 (&r->get_trackview()); + add (&mrv->get_time_axis_view()); } - RegionsChanged (); +#endif + MidiRegionsChanged (); } } long -Selection::add (nframes_t start, nframes_t end) +Selection::add (framepos_t start, framepos_t end) { AudioRangeComparator cmp; @@ -362,14 +471,14 @@ Selection::add (nframes_t start, nframes_t end) time.push_back (AudioRange (start, end, next_time_id++)); time.consolidate (); time.sort (cmp); - + TimeChanged (); return next_time_id - 1; } void -Selection::replace (uint32_t sid, nframes_t start, nframes_t end) +Selection::replace (uint32_t sid, framepos_t start, framepos_t end) { for (list::iterator i = time.begin(); i != time.end(); ++i) { if ((*i).id == sid) { @@ -415,15 +524,14 @@ Selection::remove (TimeAxisView* track) } void -Selection::remove (const list& track_list) +Selection::remove (const TrackViewList& track_list) { bool changed = false; - 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) { - list::iterator x; - - 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; } @@ -434,6 +542,39 @@ Selection::remove (const list& track_list) } } +void +Selection::remove (const MidiNoteSelection& midi_list) +{ + bool changed = false; + + for (MidiNoteSelection::const_iterator i = midi_list.begin(); i != midi_list.end(); ++i) { + + MidiNoteSelection::iterator x; + + if ((x = find (midi_notes.begin(), midi_notes.end(), (*i))) != midi_notes.end()) { + midi_notes.erase (x); + changed = true; + } + } + + if (changed) { + MidiNotesChanged(); + } +} + +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; + midi_notes.erase (x); + MidiNotesChanged (); + } +} + void Selection::remove (boost::shared_ptr track) { @@ -471,11 +612,29 @@ 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()); } } +void +Selection::remove (MidiRegionView* 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) @@ -487,7 +646,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; } @@ -495,7 +654,7 @@ Selection::remove (uint32_t selection_id) } void -Selection::remove (nframes_t start, nframes_t end) +Selection::remove (framepos_t /*start*/, framepos_t /*end*/) { } @@ -517,12 +676,19 @@ Selection::set (TimeAxisView* track) } void -Selection::set (const list& track_list) +Selection::set (const TrackViewList& track_list) { clear_tracks (); add (track_list); } +void +Selection::set (const MidiNoteSelection& midi_list) +{ + clear_midi_notes (); + add (midi_list); +} + void Selection::set (boost::shared_ptr playlist) { @@ -545,6 +711,13 @@ Selection::set (const RegionSelection& rs) RegionsChanged(); /* EMIT SIGNAL */ } +void +Selection::set (MidiRegionView* mrv) +{ + clear_midi_regions (); + add (mrv); +} + void Selection::set (RegionView* r, bool also_clear_tracks) { @@ -567,8 +740,11 @@ Selection::set (vector& v) 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) { if ((start == 0 && end == 0) || end < start) { return 0; @@ -586,14 +762,6 @@ Selection::set (TimeAxisView* track, nframes_t start, nframes_t end) time.front().end = end; } - if (track) { - time.track = track; - time.group = track->edit_group(); - } else { - time.track = 0; - time.group = 0; - } - time.consolidate (); TimeChanged (); @@ -627,48 +795,60 @@ Selection::selected (RegionView* rv) } bool -Selection::empty () +Selection::empty (bool internal_selection) { - return regions.empty () && + bool object_level_empty = regions.empty () && tracks.empty () && - points.empty () && - playlists.empty () && + points.empty () && + playlists.empty () && lines.empty () && time.empty () && playlists.empty () && - markers.empty() + markers.empty() && + midi_regions.empty() ; + + if (!internal_selection) { + return object_level_empty; + } + + /* this is intended to really only apply when using a Selection + as a cut buffer. + */ + + return object_level_empty && midi_notes.empty(); } 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); - } + cp->set_selected (!cp->get_selected ()); + set_point_selection_from_line (cp->line ()); +} - delete *x; +void +Selection::toggle (vector const & cps) +{ + for (vector::const_iterator i = cps.begin(); i != cps.end(); ++i) { + (*i)->set_selected (!(*i)->get_selected ()); } - PointsChanged (); /* EMIT SIGNAL */ + set_point_selection_from_line (cps.front()->line ()); } void -Selection::toggle (list& selectables) +Selection::toggle (list const & selectables) { 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()") @@ -679,35 +859,40 @@ 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 (); + + if (Config->get_link_region_and_track_selection ()) { + clear_tracks (); + } + add (selectables); } void -Selection::add (list& selectables) +Selection::add (list const & selectables) { 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()") @@ -718,11 +903,11 @@ Selection::add (list& selectables) if (!rvs.empty()) { add (rvs); - } + } - if (!autos.empty()) { - add (autos); - } + if (!cps.empty()) { + add (cps); + } } void @@ -735,31 +920,41 @@ Selection::clear_points () } void -Selection::add (vector& autos) +Selection::add (ControlPoint* cp) +{ + cp->set_selected (true); + set_point_selection_from_line (cp->line ()); +} + +void +Selection::add (vector const & cps) { - for (vector::iterator i = autos.begin(); i != autos.end(); ++i) { - points.push_back (**i); + for (vector::const_iterator i = cps.begin(); i != cps.end(); ++i) { + (*i)->set_selected (true); } - PointsChanged (); + set_point_selection_from_line (cps.front()->line ()); } void -Selection::select_edit_group_regions () +Selection::set (ControlPoint* cp) { - 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); - } + if (cp->get_selected()) { + return; } - for (std::set::iterator i = regions_to_add.begin(); i != regions_to_add.end(); ++i) { - add (*i); + /* We're going to set up the PointSelection from the selected ControlPoints + on this point's line, so we need to deselect all ControlPoints before + we re-add this one. + */ + + for (uint32_t i = 0; i < cp->line().npoints(); ++i) { + cp->line().nth (i)->set_selected (false); } + + vector cps; + cps.push_back (cp); + add (cps); } void @@ -773,7 +968,7 @@ void Selection::toggle (Marker* m) { MarkerSelection::iterator i; - + if ((i = find (markers.begin(), markers.end(), m)) == markers.end()) { add (m); } else { @@ -796,13 +991,6 @@ 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(); } @@ -816,16 +1004,16 @@ Selection::add (const list& m) } 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(); @@ -835,3 +1023,159 @@ MarkerSelection::range (nframes64_t& s, nframes64_t& e) s = std::min (s, e); e = std::max (s, e); } + +/** Automation control point selection is mostly manipulated using the selected state + * of the ControlPoints themselves. For example, to add a point to a selection, its + * ControlPoint is marked as selected and then this method is called. It sets up + * our PointSelection from the selected ControlPoints of a given AutomationLine. + * + * We can't use ControlPoints directly in the selection, as we need to express a + * selection of not just a visible ControlPoint but also (possibly) some invisible + * points nearby. Hence the selection stores AutomationRanges, and these are synced + * with ControlPoint selection state using AutomationLine::set_selected_points. + */ + +void +Selection::set_point_selection_from_line (AutomationLine const & line) +{ + points.clear (); + + AutomationRange current (DBL_MAX, 0, 1, 0, &line.trackview); + + for (uint32_t i = 0; i < line.npoints(); ++i) { + ControlPoint const * cp = line.nth (i); + + if (cp->get_selected()) { + /* x and y position of this control point in coordinates suitable for + an AutomationRange (ie model time and fraction of track height) + */ + double const x = (*(cp->model()))->when; + double const y = 1 - (cp->get_y() / line.trackview.current_height ()); + + /* work out the position of a rectangle the size of a control point centred + on this point + */ + + double const size = cp->size (); + double const x_size = line.time_converter().from (line.trackview.editor().pixel_to_frame (size)); + double const y_size = size / line.trackview.current_height (); + + double const x1 = x - x_size / 2; + double const x2 = x + x_size / 2; + double const y1 = y - y_size / 2; + double const y2 = y + y_size / 2; + + /* extend the current AutomationRange to put this point in */ + current.start = min (current.start, x1); + current.end = max (current.end, x2); + current.low_fract = min (current.low_fract, y1); + current.high_fract = max (current.high_fract, y2); + + } else { + /* this point isn't selected; if the current AutomationRange has some + stuff in it, push it onto the list and make a new one + */ + if (current.start < DBL_MAX) { + points.push_back (current); + current = AutomationRange (DBL_MAX, 0, 1, 0, &line.trackview); + } + } + } + + /* Maybe push the current AutomationRange, as above */ + if (current.start < DBL_MAX) { + points.push_back (current); + current = AutomationRange (DBL_MAX, 0, 1, 0, &line.trackview); + } + + PointsChanged (); /* EMIT SIGNAL */ +} + +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 ())); + } + } + + 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()); + } + } + } + } + + 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; + } +}