X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Fselection.cc;h=fa0df40336de07f16e800c6a041008bf8f371ed1;hb=91e6c1b176d93f43bab6713574c590ea97801bdc;hp=d2f1a674764b3942cd1723ce2aaf5b807e207e30;hpb=f6fdd8dcbf41f864e9f0cc32dabe81fe3533ddfe;p=ardour.git diff --git a/gtk2_ardour/selection.cc b/gtk2_ardour/selection.cc index d2f1a67476..fa0df40336 100644 --- a/gtk2_ardour/selection.cc +++ b/gtk2_ardour/selection.cc @@ -25,6 +25,7 @@ #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" @@ -32,6 +33,7 @@ #include "time_axis_view.h" #include "automation_time_axis.h" #include "public_editor.h" +#include "control_point.h" #include "i18n.h" @@ -45,6 +47,22 @@ 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) @@ -208,8 +226,6 @@ 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 (boost::bind (pmf, this, track)); tracks.push_back (track); } else { tracks.erase (i); @@ -288,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; @@ -336,11 +352,6 @@ Selection::add (const TrackViewList& track_list) { TrackViewList added = tracks.add (track_list); - for (list::const_iterator i = added.begin(); i != added.end(); ++i) { - void (Selection::*pmf)(TimeAxisView*) = &Selection::remove; - scoped_connect ((*i)->GoingAway, boost::bind (pmf, this, (*i))); - } - if (!added.empty()) { TracksChanged (); } @@ -389,7 +400,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()); } } } @@ -411,7 +422,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()); } } } @@ -425,11 +436,13 @@ 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 (); + bool changed = regions.add (r); + if (Config->get_link_region_and_track_selection() && changed) { + add (&r->get_time_axis_view()); + } + if (changed) { + RegionsChanged (); + } } } @@ -441,7 +454,7 @@ Selection::add (MidiRegionView* 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 (); @@ -449,7 +462,7 @@ Selection::add (MidiRegionView* mrv) } long -Selection::add (nframes_t start, nframes_t end) +Selection::add (framepos_t start, framepos_t end) { AudioRangeComparator cmp; @@ -465,7 +478,7 @@ 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) { for (list::iterator i = time.begin(); i != time.end(); ++i) { if ((*i).id == sid) { @@ -599,8 +612,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()); } } @@ -616,8 +629,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 } @@ -641,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*/) { } @@ -731,7 +744,7 @@ 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) { if ((start == 0 && end == 0) || end < start) { return 0; @@ -807,34 +820,35 @@ Selection::empty (bool internal_selection) } 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()") @@ -847,33 +861,38 @@ Selection::toggle (list& selectables) 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()") @@ -886,8 +905,8 @@ Selection::add (list& selectables) add (rvs); } - if (!autos.empty()) { - add (autos); + if (!cps.empty()) { + add (cps); } } @@ -901,13 +920,41 @@ Selection::clear_points () } void -Selection::add (vector& autos) +Selection::add (ControlPoint* cp) { - for (vector::iterator i = autos.begin(); i != autos.end(); ++i) { - points.push_back (**i); + cp->set_selected (true); + set_point_selection_from_line (cp->line ()); +} + +void +Selection::add (vector const & cps) +{ + 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::set (ControlPoint* cp) +{ + 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); } void @@ -944,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; - - scoped_connect (m->GoingAway, boost::bind (pmf, this, m)); - markers.push_back (m); MarkersChanged(); } @@ -964,9 +1004,9 @@ 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) { @@ -983,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->control()->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; + } +}