X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fselection.cc;h=146d9a65c50f9c2da169a66bdc44b8a7988e0aac;hb=f4cf283f2683f7883f799a8ef6cd58084e610bb7;hp=ea74a6b9198e7f6580cf990c33924db6e3ea2053;hpb=5f750624b00a976ac9baa1b400164c170a9277ed;p=ardour.git diff --git a/gtk2_ardour/selection.cc b/gtk2_ardour/selection.cc index ea74a6b919..146d9a65c5 100644 --- a/gtk2_ardour/selection.cc +++ b/gtk2_ardour/selection.cc @@ -58,10 +58,13 @@ Selection::Selection (const PublicEditor* e) /* 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()); + 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, ui_bind (marker_remove, this, _1), gui_context()); + 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 @@ -104,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 @@ -128,17 +162,6 @@ Selection::clear_regions () } } -void -Selection::clear_tracks () -{ - if (!tracks.empty()) { - tracks.clear (); - if (!_no_tracks_changed) { - TracksChanged(); - } - } -} - void Selection::clear_midi_notes () { @@ -160,14 +183,6 @@ Selection::clear_midi_regions () } } -void -Selection::clear_time () -{ - time.clear(); - - TimeChanged (); -} - void Selection::clear_playlists () { @@ -206,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()) { @@ -245,6 +262,8 @@ Selection::toggle (TimeAxisView* track) 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)); } @@ -270,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()) { @@ -284,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()) { @@ -298,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) { @@ -314,22 +339,26 @@ 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 + if (find (playlists.begin(), playlists.end(), pl) == playlists.end()) { pl->use (); playlists.push_back(pl); @@ -340,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) { @@ -378,6 +409,8 @@ Selection::add (TimeAxisView* track) 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(); @@ -401,6 +434,8 @@ 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 */ @@ -423,6 +458,8 @@ 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 */ @@ -445,6 +482,8 @@ 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()) { bool changed = regions.add (r); if (Config->get_link_region_and_track_selection() && changed) { @@ -459,6 +498,8 @@ Selection::add (RegionView* r) 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? */ @@ -474,22 +515,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); @@ -510,12 +570,13 @@ Selection::replace (uint32_t sid, framepos_t start, framepos_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); @@ -535,6 +596,15 @@ Selection::remove (TimeAxisView* track) } } +void +Selection::remove (ControlPoint* p) +{ + PointSelection::iterator i = find (points.begin(), points.end(), p); + if (i != points.end ()) { + points.erase (i); + } +} + void Selection::remove (const TrackViewList& track_list) { @@ -699,28 +769,32 @@ Selection::set (const TrackViewList& 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 */ } @@ -728,14 +802,16 @@ Selection::set (const RegionSelection& rs) void 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 (); + 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 @@ -748,11 +824,22 @@ 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); } @@ -763,12 +850,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 */ @@ -797,12 +887,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; @@ -817,7 +909,9 @@ 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_objects(); + add (ac); } @@ -839,6 +933,12 @@ 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) { @@ -867,23 +967,34 @@ Selection::empty (bool internal_selection) void Selection::toggle (ControlPoint* cp) { + clear_time(); //enforce region/object exclusivity + cp->set_selected (!cp->get_selected ()); - set_point_selection_from_line (cp->line ()); + 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 (vector const & cps) { + clear_time(); //enforce region/object exclusivity + for (vector::const_iterator i = cps.begin(); i != cps.end(); ++i) { - (*i)->set_selected (!(*i)->get_selected ()); + toggle (*i); } - - set_point_selection_from_line (cps.front()->line ()); } void Selection::toggle (list const & selectables) { + clear_time(); //enforce region/object exclusivity + RegionView* rv; ControlPoint* cp; vector rvs; @@ -914,8 +1025,8 @@ Selection::toggle (list const & selectables) void 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 (); @@ -924,10 +1035,21 @@ Selection::set (list const & selectables) 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 const & selectables) { + clear_time (); //enforce region/object exclusivity + RegionView* rv; ControlPoint* cp; vector rvs; @@ -967,45 +1089,48 @@ Selection::clear_points () void Selection::add (ControlPoint* cp) { + clear_time (); //enforce region/object exclusivity + cp->set_selected (true); - set_point_selection_from_line (cp->line ()); + 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); } - - set_point_selection_from_line (cps.front()->line ()); + PointsChanged (); /* EMIT SIGNAL */ } void Selection::set (ControlPoint* cp) { + clear_time (); //enforce region/object exclusivity + if (cp->get_selected()) { return; } - /* 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); + clear_objects (); + add (cp); } void Selection::set (Marker* m) { - clear_markers (); + clear_time (); //enforce region/object exclusivity + markers.clear (); + add (m); } @@ -1035,6 +1160,8 @@ Selection::remove (Marker* m) void Selection::add (Marker* m) { + clear_time (); //enforce region/object exclusivity + if (find (markers.begin(), markers.end(), m) == markers.end()) { markers.push_back (m); MarkersChanged(); @@ -1044,6 +1171,8 @@ 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 (); @@ -1072,73 +1201,6 @@ MarkerSelection::range (framepos_t& s, framepos_t& 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 = max (0.0, x - x_size / 2); - double const x2 = x + x_size / 2; - double const y1 = max (0.0, 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 {