X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fselection.cc;h=395ceda1696ad95aa00b814d292bca6bb473653f;hb=082461f108b0778327dec9d92704c15622ac3a86;hp=c9d12f0694d177ee40099804117f567ab9453755;hpb=579fcb70e2b3b0a1ef2af9fc88edebff6d7e6dd3;p=ardour.git diff --git a/gtk2_ardour/selection.cc b/gtk2_ardour/selection.cc index c9d12f0694..395ceda169 100644 --- a/gtk2_ardour/selection.cc +++ b/gtk2_ardour/selection.cc @@ -50,18 +50,22 @@ struct AudioRangeComparator { Selection::Selection (const PublicEditor* e) : tracks (e) , editor (e) - , next_time_id (0) + , 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, 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 Selection& @@ -103,6 +107,38 @@ 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 (); + clear_markers (); +} + +void +Selection::clear_tracks () +{ + if (!tracks.empty()) { + tracks.clear (); + if (!_no_tracks_changed) { + TracksChanged(); + } + } +} + +void +Selection::clear_time () +{ + time.clear(); + + TimeChanged (); } void @@ -121,15 +157,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 (); + } } } @@ -154,14 +184,6 @@ Selection::clear_midi_regions () } } -void -Selection::clear_time () -{ - time.clear(); - - TimeChanged (); -} - void Selection::clear_playlists () { @@ -200,6 +222,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()) { @@ -231,12 +255,16 @@ Selection::toggle (TimeAxisView* track) 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)); } @@ -262,6 +290,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()) { @@ -276,6 +306,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()) { @@ -290,6 +322,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) { @@ -304,8 +338,10 @@ 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 */ @@ -322,6 +358,8 @@ Selection::toggle (nframes_t start, nframes_t end) 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); @@ -332,6 +370,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) { @@ -353,7 +393,9 @@ Selection::add (const TrackViewList& track_list) TrackViewList added = tracks.add (track_list); if (!added.empty()) { - TracksChanged (); + if (!_no_tracks_changed) { + TracksChanged (); + } } } @@ -368,6 +410,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(); @@ -391,6 +435,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 */ @@ -400,7 +446,7 @@ Selection::add (vector& v) 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()); } } } @@ -413,6 +459,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 */ @@ -422,7 +470,7 @@ Selection::add (const RegionSelection& rs) 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()); } } } @@ -435,24 +483,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 (); @@ -460,8 +514,10 @@ 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 */ @@ -476,8 +532,10 @@ Selection::add (nframes_t start, nframes_t end) } void -Selection::replace (uint32_t sid, nframes_t start, nframes_t end) +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); @@ -498,12 +556,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); @@ -517,7 +576,18 @@ 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 (ControlPoint* p) +{ + PointSelection::iterator i = find (points.begin(), points.end(), p); + if (i != points.end ()) { + points.erase (i); } } @@ -536,7 +606,9 @@ Selection::remove (const TrackViewList& track_list) } if (changed) { - TracksChanged(); + if (!_no_tracks_changed) { + TracksChanged(); + } } } @@ -610,8 +682,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()); } } @@ -627,8 +699,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 } @@ -652,7 +724,7 @@ Selection::remove (uint32_t selection_id) } void -Selection::remove (nframes_t /*start*/, nframes_t /*end*/) +Selection::remove (framepos_t /*start*/, framepos_t /*end*/) { } @@ -683,28 +755,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 */ } @@ -712,15 +788,20 @@ 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 (); - 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); @@ -729,11 +810,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); } @@ -742,8 +834,11 @@ Selection::set (vector& v) * the list of tracks it applies to. */ long -Selection::set (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; } @@ -767,10 +862,42 @@ Selection::set (nframes_t start, nframes_t end) 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.sort (AudioRangeComparator ()); + time.front().start = start; + time.back().end = end; + } + + time.consolidate (); + + TimeChanged (); +} + void Selection::set (boost::shared_ptr ac) { - lines.clear(); + clear_time(); //enforce region/object exclusivity + clear_objects(); + add (ac); } @@ -792,6 +919,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) { @@ -820,23 +953,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; @@ -867,15 +1011,31 @@ 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 (); + } + 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; @@ -915,43 +1075,56 @@ 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; } - points.clear (); - vector cps; - cps.push_back (cp); - add (cps); + 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 + clear_objects(); + add (m); } void Selection::toggle (Marker* m) { + clear_time (); //enforce region/object exclusivity + MarkerSelection::iterator i; if ((i = find (markers.begin(), markers.end(), m)) == markers.end()) { @@ -975,6 +1148,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(); @@ -984,14 +1159,19 @@ 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) { @@ -1009,80 +1189,13 @@ MarkerSelection::range (nframes64_t& s, nframes64_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 = 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) { @@ -1094,10 +1207,20 @@ Selection::get_state () const } 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->control()->parameter ())); + 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; } @@ -1107,20 +1230,21 @@ 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); - assert (rtv); - add (rtv); - + if (rtv) { + add (rtv); + } + } else if ((*i)->name() == X_("AutomationView")) { - + XMLProperty* prop_id = (*i)->property (X_("id")); XMLProperty* prop_parameter = (*i)->property (X_("parameter")); @@ -1129,14 +1253,58 @@ Selection::set_state (XMLNode const & node, int) PBD::ID id (prop_id->value ()); RouteTimeAxisView* rtv = editor->get_route_view_by_route_id (id); - assert (rtv); - - boost::shared_ptr atv = rtv->automation_child (EventTypeMap::instance().new_parameter (prop_parameter->value ())); - assert (atv); + + 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); + } - 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; + } +} + +void +Selection::block_tracks_changed (bool yn) +{ + _no_tracks_changed = yn; +}