Fix ExportFormatSpecification copy-c'tor
[ardour.git] / gtk2_ardour / selection.cc
index d0b2cab5c7749a67ff763e3574886bf56c54aff8..df8b359f7294706ba8b7fc2c716e854d91a41464 100644 (file)
 
 #include <algorithm>
 #include <sigc++/bind.h>
+
 #include "pbd/error.h"
 #include "pbd/stacktrace.h"
+#include "pbd/types_convert.h"
 
+#include "ardour/evoral_types_convert.h"
 #include "ardour/playlist.h"
 #include "ardour/rc_configuration.h"
+#include "ardour/selection.h"
+
+#include "control_protocol/control_protocol.h"
 
+#include "audio_region_view.h"
+#include "debug.h"
 #include "gui_thread.h"
 #include "midi_cut_buffer.h"
+#include "region_gain_line.h"
 #include "region_view.h"
 #include "selection.h"
 #include "selection_templates.h"
 #include "automation_time_axis.h"
 #include "public_editor.h"
 #include "control_point.h"
+#include "vca_time_axis.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 
 struct AudioRangeComparator {
-    bool operator()(AudioRange a, AudioRange b) {
-           return a.start < b.start;
-    }
+       bool operator()(AudioRange a, AudioRange b) {
+               return a.start < b.start;
+       }
 };
 
-Selection::Selection (const PublicEditor* e)
+Selection::Selection (const PublicEditor* e, bool mls)
        : tracks (e)
        , editor (e)
-       , next_time_id (0) 
+       , next_time_id (0)
+       , manage_libardour_selection (mls)
 {
        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)(ArdourMarker*) = &Selection::remove;
+       ArdourMarker::CatchDeletion.connect (*this, MISSING_INVALIDATOR, boost::bind (marker_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());
-}      
+       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 +114,28 @@ Selection::clear ()
        clear_playlists ();
        clear_midi_notes ();
        clear_midi_regions ();
+       clear_markers ();
+       pending_midi_note_selection.clear();
+}
+
+void
+Selection::clear_objects (bool with_signal)
+{
+       clear_regions (with_signal);
+       clear_points (with_signal);
+       clear_lines(with_signal);
+       clear_playlists (with_signal);
+       clear_midi_notes (with_signal);
+       clear_midi_regions (with_signal);
+}
+
+void
+Selection::clear_time (bool with_signal)
+{
+       time.clear();
+       if (with_signal) {
+               TimeChanged ();
+       }
 }
 
 void
@@ -116,54 +149,56 @@ Selection::dump_region_layers()
 
 
 void
-Selection::clear_regions ()
+Selection::clear_regions (bool with_signal)
 {
        if (!regions.empty()) {
                regions.clear_all ();
-               RegionsChanged();
-       }
-}
-
-void
-Selection::clear_tracks ()
-{
-       if (!tracks.empty()) {
-               tracks.clear ();
-               TracksChanged();
+               if (with_signal) {
+                       RegionsChanged();
+               }
        }
 }
 
 void
-Selection::clear_midi_notes ()
+Selection::clear_midi_notes (bool with_signal)
 {
        if (!midi_notes.empty()) {
                for (MidiNoteSelection::iterator x = midi_notes.begin(); x != midi_notes.end(); ++x) {
                        delete *x;
                }
                midi_notes.clear ();
-               MidiNotesChanged ();
+               if (with_signal) {
+                       MidiNotesChanged ();
+               }
+       }
+
+       // clear note selections for MRV's that have note selections
+       // this will cause the MRV to be removed from the list
+       for (MidiRegionSelection::iterator i = midi_regions.begin();
+            i != midi_regions.end();) {
+               MidiRegionSelection::iterator tmp = i;
+               ++tmp;
+               MidiRegionView* mrv = dynamic_cast<MidiRegionView*>(*i);
+               if (mrv) {
+                       mrv->clear_selection();
+               }
+               i = tmp;
        }
 }
 
 void
-Selection::clear_midi_regions ()
+Selection::clear_midi_regions (bool with_signal)
 {
        if (!midi_regions.empty()) {
                midi_regions.clear ();
-               MidiRegionsChanged ();
+               if (with_signal) {
+                       MidiRegionsChanged ();
+               }
        }
 }
 
 void
-Selection::clear_time ()
-{
-       time.clear();
-
-       TimeChanged ();
-}
-
-void
-Selection::clear_playlists ()
+Selection::clear_playlists (bool with_signal)
 {
        /* Selections own their playlists */
 
@@ -175,31 +210,40 @@ Selection::clear_playlists ()
 
        if (!playlists.empty()) {
                playlists.clear ();
-               PlaylistsChanged();
+               if (with_signal) {
+                       PlaylistsChanged();
+               }
        }
 }
 
 void
-Selection::clear_lines ()
+Selection::clear_lines (bool with_signal)
 {
        if (!lines.empty()) {
                lines.clear ();
-               LinesChanged();
+               if (with_signal) {
+                       LinesChanged();
+               }
        }
 }
 
 void
-Selection::clear_markers ()
+Selection::clear_markers (bool with_signal)
 {
        if (!markers.empty()) {
                markers.clear ();
-               MarkersChanged();
+               if (with_signal) {
+                       MarkersChanged();
+               }
        }
 }
 
 void
 Selection::toggle (boost::shared_ptr<Playlist> pl)
 {
+       clear_time(); // enforce object/range exclusivity
+       clear_tracks(); // enforce object/track exclusivity
+
        PlaylistSelection::iterator i;
 
        if ((i = find (playlists.begin(), playlists.end(), pl)) == playlists.end()) {
@@ -212,31 +256,12 @@ Selection::toggle (boost::shared_ptr<Playlist> pl)
        PlaylistsChanged ();
 }
 
-void
-Selection::toggle (const TrackViewList& track_list)
-{
-       for (TrackViewList::const_iterator i = track_list.begin(); i != track_list.end(); ++i) {
-               toggle ((*i));
-       }
-}
-
-void
-Selection::toggle (TimeAxisView* track)
-{
-       TrackSelection::iterator i;
-
-       if ((i = find (tracks.begin(), tracks.end(), track)) == tracks.end()) {
-               tracks.push_back (track);
-       } else {
-               tracks.erase (i);
-       }
-
-       TracksChanged();
-}
-
 void
 Selection::toggle (const MidiNoteSelection& midi_note_list)
 {
+       clear_time(); // enforce object/range exclusivity
+       clear_tracks(); // enforce object/track exclusivity
+
        for (MidiNoteSelection::const_iterator i = midi_note_list.begin(); i != midi_note_list.end(); ++i) {
                toggle ((*i));
        }
@@ -262,6 +287,9 @@ Selection::toggle (MidiCutBuffer* midi)
 void
 Selection::toggle (RegionView* r)
 {
+       clear_time(); // enforce object/range exclusivity
+       clear_tracks(); // enforce object/track exclusivity
+
        RegionSelection::iterator i;
 
        if ((i = find (regions.begin(), regions.end(), r)) == regions.end()) {
@@ -276,6 +304,9 @@ Selection::toggle (RegionView* r)
 void
 Selection::toggle (MidiRegionView* mrv)
 {
+       clear_time(); // enforce object/range exclusivity
+       clear_tracks(); // enforce object/track exclusivity
+
        MidiRegionSelection::iterator i;
 
        if ((i = find (midi_regions.begin(), midi_regions.end(), mrv)) == midi_regions.end()) {
@@ -290,6 +321,9 @@ Selection::toggle (MidiRegionView* mrv)
 void
 Selection::toggle (vector<RegionView*>& r)
 {
+       clear_time(); // enforce object/range exclusivity
+       clear_tracks(); // enforce object/track exclusivity
+
        RegionSelection::iterator i;
 
        for (vector<RegionView*>::iterator x = r.begin(); x != r.end(); ++x) {
@@ -304,25 +338,30 @@ Selection::toggle (vector<RegionView*>& r)
 }
 
 long
-Selection::toggle (framepos_t start, framepos_t end)
+Selection::toggle (samplepos_t start, samplepos_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<Playlist> pl)
 {
+
        if (find (playlists.begin(), playlists.end(), pl) == playlists.end()) {
+               clear_time(); // enforce object/range exclusivity
+               clear_tracks(); // enforce object/track exclusivity
                pl->use ();
                playlists.push_back(pl);
                PlaylistsChanged ();
@@ -343,28 +382,12 @@ Selection::add (const list<boost::shared_ptr<Playlist> >& pllist)
        }
 
        if (changed) {
+               clear_time(); // enforce object/range exclusivity
+               clear_tracks(); // enforce object/track exclusivity
                PlaylistsChanged ();
        }
 }
 
-void
-Selection::add (const TrackViewList& track_list)
-{
-       TrackViewList added = tracks.add (track_list);
-
-       if (!added.empty()) {
-               TracksChanged ();
-       }
-}
-
-void
-Selection::add (TimeAxisView* track)
-{
-       TrackViewList tr;
-       tr.push_back (track);
-       add (tr);
-}
-
 void
 Selection::add (const MidiNoteSelection& midi_list)
 {
@@ -372,6 +395,8 @@ Selection::add (const MidiNoteSelection& midi_list)
        const MidiNoteSelection::const_iterator e = midi_list.end();
 
        if (!midi_list.empty()) {
+               clear_time(); // enforce object/range exclusivity
+               clear_tracks(); // enforce object/track exclusivity
                midi_notes.insert (midi_notes.end(), b, e);
                MidiNotesChanged ();
        }
@@ -399,13 +424,12 @@ Selection::add (vector<RegionView*>& v)
        for (vector<RegionView*>::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_time_axis_view());
-                       }
                }
        }
 
        if (changed) {
+               clear_time(); // enforce object/range exclusivity
+               clear_tracks(); // enforce object/track exclusivity
                RegionsChanged ();
        }
 }
@@ -421,13 +445,12 @@ Selection::add (const RegionSelection& rs)
        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_time_axis_view());
-                       }
                }
        }
 
        if (changed) {
+               clear_time(); // enforce object/range exclusivity
+               clear_tracks(); // enforce object/track exclusivity
                RegionsChanged ();
        }
 }
@@ -437,49 +460,67 @@ Selection::add (RegionView* r)
 {
        if (find (regions.begin(), regions.end(), r) == regions.end()) {
                bool changed = regions.add (r);
-                if (Config->get_link_region_and_track_selection() && changed) {
-                        add (&r->get_time_axis_view());
-                }
-                if (changed) {
-                        RegionsChanged ();
-                }
+               if (changed) {
+                       clear_time(); // enforce object/range exclusivity
+                       clear_tracks(); // enforce object/track exclusivity
+                       RegionsChanged ();
+               }
        }
 }
 
 void
 Selection::add (MidiRegionView* mrv)
 {
+       DEBUG_TRACE(DEBUG::Selection, string_compose("Selection::add MRV %1\n", mrv));
+
+       clear_time(); // enforce object/range exclusivity
+       clear_tracks(); // enforce object/track 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_time_axis_view());
-               }
-#endif
                MidiRegionsChanged ();
        }
 }
 
 long
-Selection::add (framepos_t start, framepos_t end)
+Selection::add (samplepos_t start, samplepos_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::replace (uint32_t sid, framepos_t start, framepos_t end)
+Selection::move_time (samplecnt_t distance)
 {
+       if (distance == 0) {
+               return;
+       }
+
+       for (list<AudioRange>::iterator i = time.begin(); i != time.end(); ++i) {
+               (*i).start += distance;
+               (*i).end += distance;
+       }
+
+       TimeChanged ();
+}
+
+void
+Selection::replace (uint32_t sid, samplepos_t start, samplepos_t end)
+{
+       clear_objects(); // enforce object/range exclusivity
+
        for (list<AudioRange>::iterator i = time.begin(); i != time.end(); ++i) {
                if ((*i).id == sid) {
                        time.erase (i);
@@ -500,45 +541,33 @@ Selection::replace (uint32_t sid, framepos_t start, framepos_t end)
 void
 Selection::add (boost::shared_ptr<Evoral::ControlList> cl)
 {
-       boost::shared_ptr<ARDOUR::AutomationList> al
-               = boost::dynamic_pointer_cast<ARDOUR::AutomationList>(cl);
+       boost::shared_ptr<ARDOUR::AutomationList> al = boost::dynamic_pointer_cast<ARDOUR::AutomationList>(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);
-               LinesChanged();
-       }
-}
 
-void
-Selection::remove (TimeAxisView* track)
-{
-       list<TimeAxisView*>::iterator i;
-       if ((i = find (tracks.begin(), tracks.end(), track)) != tracks.end()) {
-               tracks.erase (i);
-               TracksChanged();
+       if (!cl->empty()) {
+               clear_time(); // enforce object/range exclusivity
+               clear_tracks(); // enforce object/track exclusivity
        }
+
+       /* The original may change so we must store a copy (not a pointer) here.
+        * e.g AutomationLine rewrites the list with gain mapping.
+        * the downside is that we can't perfom duplicate checks.
+        * This code was changed in response to #6842
+        */
+       lines.push_back (boost::shared_ptr<ARDOUR::AutomationList> (new ARDOUR::AutomationList(*al)));
+       LinesChanged();
 }
 
 void
-Selection::remove (const TrackViewList& track_list)
+Selection::remove (ControlPoint* p)
 {
-       bool changed = false;
-
-       for (TrackViewList::const_iterator i = track_list.begin(); i != track_list.end(); ++i) {
-
-               TrackViewList::iterator x = find (tracks.begin(), tracks.end(), *i);
-               if (x != tracks.end()) {
-                       tracks.erase (x);
-                       changed = true;
-               }
-       }
-
-       if (changed) {
-               TracksChanged();
+       PointSelection::iterator i = find (points.begin(), points.end(), p);
+       if (i != points.end ()) {
+               points.erase (i);
        }
 }
 
@@ -611,31 +640,21 @@ Selection::remove (RegionView* r)
        if (regions.remove (r)) {
                RegionsChanged ();
        }
-
-       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)
 {
+       DEBUG_TRACE(DEBUG::Selection, string_compose("Selection::remove MRV %1\n", 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)
 {
@@ -654,7 +673,7 @@ Selection::remove (uint32_t selection_id)
 }
 
 void
-Selection::remove (framepos_t /*start*/, framepos_t /*end*/)
+Selection::remove (samplepos_t /*start*/, samplepos_t /*end*/)
 {
 }
 
@@ -668,45 +687,46 @@ Selection::remove (boost::shared_ptr<ARDOUR::AutomationList> ac)
        }
 }
 
-void
-Selection::set (TimeAxisView* track)
-{
-       clear_tracks ();
-       add (track);
-}
-
-void
-Selection::set (const TrackViewList& track_list)
-{
-       clear_tracks ();
-       add (track_list);
-}
-
 void
 Selection::set (const MidiNoteSelection& midi_list)
 {
-       clear_midi_notes ();
+       if (!midi_list.empty()) {
+               clear_time (); // enforce region/object exclusivity
+               clear_tracks(); // enforce object/track exclusivity
+       }
+       clear_objects ();
        add (midi_list);
 }
 
 void
 Selection::set (boost::shared_ptr<Playlist> playlist)
 {
-       clear_playlists ();
+       if (playlist) {
+               clear_time (); // enforce region/object exclusivity
+               clear_tracks(); // enforce object/track exclusivity
+       }
+       clear_objects ();
        add (playlist);
 }
 
 void
 Selection::set (const list<boost::shared_ptr<Playlist> >& pllist)
 {
-       clear_playlists ();
+       if (!pllist.empty()) {
+               clear_time(); // enforce region/object exclusivity
+       }
+       clear_objects ();
        add (pllist);
 }
 
 void
 Selection::set (const RegionSelection& rs)
 {
-       clear_regions();
+       if (!rs.empty()) {
+               clear_time(); // enforce region/object exclusivity
+               clear_tracks(); // enforce object/track exclusivity
+       }
+       clear_objects();
        regions = rs;
        RegionsChanged(); /* EMIT SIGNAL */
 }
@@ -714,29 +734,35 @@ Selection::set (const RegionSelection& rs)
 void
 Selection::set (MidiRegionView* mrv)
 {
-       clear_midi_regions ();
+       if (mrv) {
+               clear_time(); // enforce region/object exclusivity
+               clear_tracks(); // enforce object/track exclusivity
+       }
+       clear_objects ();
        add (mrv);
 }
 
 void
-Selection::set (RegionView* r, bool also_clear_tracks)
+Selection::set (RegionView* r, bool /*also_clear_tracks*/)
 {
-       clear_regions ();
-       if (also_clear_tracks) {
-               clear_tracks ();
+       if (r) {
+               clear_time(); // enforce region/object exclusivity
+               clear_tracks(); // enforce object/track exclusivity
        }
+       clear_objects ();
        add (r);
 }
 
 void
 Selection::set (vector<RegionView*>& v)
 {
-       clear_regions ();
-       if (Config->get_link_region_and_track_selection()) {
-               clear_tracks ();
-               // make sure to deselect any automation selections
-               clear_points();
+       if (!v.empty()) {
+               clear_time(); // enforce region/object exclusivity
+               clear_tracks(); // enforce object/track exclusivity
        }
+
+       clear_objects();
+
        add (v);
 }
 
@@ -744,14 +770,17 @@ Selection::set (vector<RegionView*>& v)
  *  the list of tracks it applies to.
  */
 long
-Selection::set (framepos_t start, framepos_t end)
+Selection::set (samplepos_t start, samplepos_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 */
 
@@ -769,35 +798,68 @@ Selection::set (framepos_t start, framepos_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 (samplepos_t start, samplepos_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<Evoral::ControlList> ac)
 {
-       lines.clear();
+       clear_time(); // enforce region/object exclusivity
+       clear_tracks(); // enforce object/track exclusivity
+       clear_objects();
+
        add (ac);
 }
 
 bool
-Selection::selected (Marker* m)
+Selection::selected (ArdourMarker* m) const
 {
        return find (markers.begin(), markers.end(), m) != markers.end();
 }
 
 bool
-Selection::selected (TimeAxisView* tv)
+Selection::selected (RegionView* rv) const
 {
-       return find (tracks.begin(), tracks.end(), tv) != tracks.end();
+       return find (regions.begin(), regions.end(), rv) != regions.end();
 }
 
 bool
-Selection::selected (RegionView* rv)
+Selection::selected (ControlPoint* cp) const
 {
-       return find (regions.begin(), regions.end(), rv) != regions.end();
+       return find (points.begin(), points.end(), cp) != points.end();
 }
 
 bool
 Selection::empty (bool internal_selection)
 {
-       bool object_level_empty =  regions.empty () &&
+       bool object_level_empty = regions.empty () &&
                tracks.empty () &&
                points.empty () &&
                playlists.empty () &&
@@ -816,29 +878,43 @@ Selection::empty (bool internal_selection)
           as a cut buffer.
        */
 
-       return object_level_empty && midi_notes.empty();
+       return object_level_empty && midi_notes.empty() && points.empty();
 }
 
 void
 Selection::toggle (ControlPoint* cp)
 {
-       cp->set_selected (!cp->get_selected ());
-       set_point_selection_from_line (cp->line ());
+       clear_time(); // enforce region/object exclusivity
+       clear_tracks(); // enforce object/track exclusivity
+
+       cp->set_selected (!cp->selected ());
+       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<ControlPoint*> const & cps)
 {
+       clear_time(); // enforce region/object exclusivity
+       clear_tracks(); // enforce object/track exclusivity
+
        for (vector<ControlPoint*>::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<Selectable*> const & selectables)
 {
+       clear_time(); // enforce region/object exclusivity
+       clear_tracks(); // enforce object/track exclusivity
+
        RegionView* rv;
        ControlPoint* cp;
        vector<RegionView*> rvs;
@@ -853,7 +929,7 @@ Selection::toggle (list<Selectable*> const & selectables)
                        fatal << _("programming error: ")
                              << X_("unknown selectable type passed to Selection::toggle()")
                              << endmsg;
-                       /*NOTREACHED*/
+                       abort(); /*NOTREACHED*/
                }
        }
 
@@ -869,20 +945,30 @@ Selection::toggle (list<Selectable*> const & selectables)
 void
 Selection::set (list<Selectable*> const & selectables)
 {
-       clear_regions();
-       clear_points ();
+       clear_time (); // enforce region/object exclusivity
+       clear_tracks(); // enforce object/track 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
+       clear_tracks(); // enforce object/track exclusivity
+
+       for (PointSelection::const_iterator i = s.begin(); i != s.end(); ++i) {
+               points.push_back (*i);
+       }
+}
 
 void
 Selection::add (list<Selectable*> const & selectables)
 {
+       clear_time (); // enforce region/object exclusivity
+       clear_tracks(); // enforce object/track exclusivity
+
        RegionView* rv;
        ControlPoint* cp;
        vector<RegionView*> rvs;
@@ -897,7 +983,7 @@ Selection::add (list<Selectable*> const & selectables)
                        fatal << _("programming error: ")
                              << X_("unknown selectable type passed to Selection::add()")
                              << endmsg;
-                       /*NOTREACHED*/
+                       abort(); /*NOTREACHED*/
                }
        }
 
@@ -911,61 +997,70 @@ Selection::add (list<Selectable*> const & selectables)
 }
 
 void
-Selection::clear_points ()
+Selection::clear_points (bool with_signal)
 {
        if (!points.empty()) {
                points.clear ();
-               PointsChanged ();
+               if (with_signal) {
+                       PointsChanged ();
+               }
        }
 }
 
 void
 Selection::add (ControlPoint* cp)
 {
+       clear_time (); // enforce region/object exclusivity
+       clear_tracks(); // enforce object/track exclusivity
+
        cp->set_selected (true);
-       set_point_selection_from_line (cp->line ());
+       points.push_back (cp);
+       PointsChanged (); /* EMIT SIGNAL */
 }
 
 void
 Selection::add (vector<ControlPoint*> const & cps)
 {
+       clear_time (); // enforce region/object exclusivity
+       clear_tracks(); // enforce object/track exclusivity
+
        for (vector<ControlPoint*>::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)
 {
-       if (cp->get_selected()) {
+       clear_time (); // enforce region/object exclusivity
+       clear_tracks(); // enforce object/track exclusivity
+
+       if (cp->selected () && points.size () == 1) {
                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<ControlPoint*> cps;
-       cps.push_back (cp);
-       add (cps);
+       clear_objects ();
+       add (cp);
 }
 
 void
-Selection::set (Marker* m)
+Selection::set (ArdourMarker* m)
 {
-       clear_markers ();
+       clear_time ();  // enforce region/object exclusivity
+       clear_tracks();  // enforce object/track exclusivity
+       markers.clear ();
+
        add (m);
 }
 
 void
-Selection::toggle (Marker* m)
+Selection::toggle (ArdourMarker* m)
 {
        MarkerSelection::iterator i;
 
@@ -977,7 +1072,7 @@ Selection::toggle (Marker* m)
 }
 
 void
-Selection::remove (Marker* m)
+Selection::remove (ArdourMarker* m)
 {
        MarkerSelection::iterator i;
 
@@ -988,8 +1083,11 @@ Selection::remove (Marker* m)
 }
 
 void
-Selection::add (Marker* m)
+Selection::add (ArdourMarker* m)
 {
+       clear_time (); //enforce region/object exclusivity
+       clear_tracks(); //enforce object/track exclusivity
+
        if (find (markers.begin(), markers.end(), m) == markers.end()) {
                markers.push_back (m);
                MarkersChanged();
@@ -997,16 +1095,22 @@ Selection::add (Marker* m)
 }
 
 void
-Selection::add (const list<Marker*>& m)
+Selection::add (const list<ArdourMarker*>& m)
 {
+       clear_time (); // enforce region/object exclusivity
+       clear_tracks(); // enforce object/track exclusivity
+
        markers.insert (markers.end(), m.begin(), m.end());
+       markers.sort ();
+       markers.unique ();
+
        MarkersChanged ();
 }
 
 void
-MarkerSelection::range (framepos_t& s, framepos_t& e)
+MarkerSelection::range (samplepos_t& s, samplepos_t& e)
 {
-       s = max_framepos;
+       s = max_samplepos;
        e = 0;
 
        for (MarkerSelection::iterator i = begin(); i != end(); ++i) {
@@ -1024,93 +1128,88 @@ 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)
+XMLNode&
+Selection::get_state () const
 {
-       points.clear ();
-       
-       AutomationRange current (DBL_MAX, 0, 1, 0, &line.trackview);
+       /* 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) {
+               StripableTimeAxisView* stv = dynamic_cast<StripableTimeAxisView*> (*i);
+               AutomationTimeAxisView* atv = dynamic_cast<AutomationTimeAxisView*> (*i);
+               if (stv) {
+                       XMLNode* t = node->add_child (X_("StripableView"));
+                       t->set_property (X_("id"), stv->stripable()->id ());
+               } else if (atv) {
+                       XMLNode* t = node->add_child (X_("AutomationView"));
+                       t->set_property (X_("id"), atv->parent_stripable()->id ());
+                       t->set_property (X_("parameter"), EventTypeMap::instance().to_symbol (atv->parameter ()));
+               }
+       }
+
+       if (!regions.empty()) {
+               XMLNode* parent = node->add_child (X_("Regions"));
+               for (RegionSelection::const_iterator i = regions.begin(); i != regions.end(); ++i) {
+                       XMLNode* r = parent->add_child (X_("Region"));
+                       r->set_property (X_("id"), (*i)->region ()->id ());
+               }
+       }
 
-       for (uint32_t i = 0; i < line.npoints(); ++i) {
-               ControlPoint const * cp = line.nth (i);
+       /* midi region views have thir own internal selection. */
+       list<pair<PBD::ID, std::set<boost::shared_ptr<Evoral::Note<Temporal::Beats> > > > > rid_notes;
+       editor->get_per_region_note_selection (rid_notes);
 
-               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 ());
+       list<pair<PBD::ID, std::set<boost::shared_ptr<Evoral::Note<Temporal::Beats> > > > >::iterator rn_it;
+       for (rn_it = rid_notes.begin(); rn_it != rid_notes.end(); ++rn_it) {
+               XMLNode* n = node->add_child (X_("MIDINotes"));
+               n->set_property (X_("region-id"), (*rn_it).first);
 
-                       /* work out the position of a rectangle the size of a control point centred
-                          on this point
-                       */
+               for (std::set<boost::shared_ptr<Evoral::Note<Temporal::Beats> > >::iterator i = (*rn_it).second.begin(); i != (*rn_it).second.end(); ++i) {
+                       XMLNode* nc = n->add_child(X_("note"));
+                       nc->set_property(X_("note-id"), (*i)->id());
+               }
+       }
 
-                       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;
+       for (PointSelection::const_iterator i = points.begin(); i != points.end(); ++i) {
+               AutomationTimeAxisView* atv = dynamic_cast<AutomationTimeAxisView*> (&(*i)->line().trackview);
+               if (atv) {
 
-                       /* 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);
+                       XMLNode* r = node->add_child (X_("ControlPoint"));
+                       r->set_property (X_("type"), "track");
+                       r->set_property (X_("route-id"), atv->parent_stripable()->id ());
+                       r->set_property (X_("automation-list-id"), (*i)->line().the_list()->id ());
+                       r->set_property (X_("parameter"), EventTypeMap::instance().to_symbol ((*i)->line().the_list()->parameter ()));
+                       r->set_property (X_("view-index"), (*i)->view_index());
+                       continue;
+               }
 
-               } 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);
-                       }
+               AudioRegionGainLine* argl = dynamic_cast<AudioRegionGainLine*> (&(*i)->line());
+               if (argl) {
+                       XMLNode* r = node->add_child (X_("ControlPoint"));
+                       r->set_property (X_("type"), "region");
+                       r->set_property (X_("region-id"), argl->region_view ().region ()->id ());
+                       r->set_property (X_("view-index"), (*i)->view_index());
                }
+
        }
 
-       /* 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);
+       for (TimeSelection::const_iterator i = time.begin(); i != time.end(); ++i) {
+               XMLNode* t = node->add_child (X_("AudioRange"));
+               t->set_property (X_("start"), (*i).start);
+               t->set_property (X_("end"), (*i).end);
        }
 
-       PointsChanged (); /* EMIT SIGNAL */
-}
+       for (MarkerSelection::const_iterator i = markers.begin(); i != markers.end(); ++i) {
+               XMLNode* t = node->add_child (X_("Marker"));
 
-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"));
+               bool is_start;
+               Location* loc = editor->find_location_from_marker (*i, is_start);
 
-       for (TrackSelection::const_iterator i = tracks.begin(); i != tracks.end(); ++i) {
-               RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*> (*i);
-               AutomationTimeAxisView* atv = dynamic_cast<AutomationTimeAxisView*> (*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 ()));
-               }
+               t->set_property (X_("id"), loc->id());
+               t->set_property (X_("start"), is_start);
        }
 
        return *node;
@@ -1122,43 +1221,201 @@ Selection::set_state (XMLNode const & node, int)
        if (node.name() != X_("Selection")) {
                return -1;
        }
-       
+
+       clear_regions ();
+       clear_midi_notes ();
+       clear_points ();
+       clear_time ();
+       clear_markers ();
+
+       /* NOTE: stripable/time-axis-view selection is saved/restored by
+        * ARDOUR::CoreSelection, not this Selection object
+        */
+
+       PBD::ID id;
        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);
+               if ((*i)->name() == X_("Regions")) {
+                       RegionSelection selected_regions;
+                       XMLNodeList children = (*i)->children ();
+                       for (XMLNodeList::const_iterator ci = children.begin(); ci != children.end(); ++ci) {
+                               PBD::ID id;
+
+                               if (!(*ci)->get_property (X_("id"), id)) {
+                                       continue;
+                               }
+
+                               RegionSelection rs;
+                               editor->get_regionviews_by_id (id, rs);
+
+                               if (!rs.empty ()) {
+                                       for (RegionSelection::const_iterator i = rs.begin(); i != rs.end(); ++i) {
+                                               selected_regions.push_back (*i);
+                                       }
+                               } else {
+                                       /*
+                                         regionviews haven't been constructed - stash the region IDs
+                                         so we can identify them in Editor::region_view_added ()
+                                       */
+                                       regions.pending.push_back (id);
+                               }
+                       }
+
+                       if (!selected_regions.empty()) {
+                               add (selected_regions);
+                       }
+
+               } else if ((*i)->name() == X_("MIDINotes")) {
+
+                       if (!(*i)->get_property (X_("region-id"), id)) {
+                               assert (false);
+                       }
+
+                       RegionSelection rs;
+
+                       editor->get_regionviews_by_id (id, rs); // there could be more than one
+
+                       std::list<Evoral::event_id_t> notes;
+                       XMLNodeList children = (*i)->children ();
+
+                       for (XMLNodeList::const_iterator ci = children.begin(); ci != children.end(); ++ci) {
+                               Evoral::event_id_t id;
+                               if ((*ci)->get_property (X_ ("note-id"), id)) {
+                                       notes.push_back (id);
+                               }
+                       }
+
+                       for (RegionSelection::iterator rsi = rs.begin(); rsi != rs.end(); ++rsi) {
+                               MidiRegionView* mrv = dynamic_cast<MidiRegionView*> (*rsi);
+                               if (mrv) {
+                                       mrv->select_notes(notes);
+                               }
+                       }
+
+                       if (rs.empty()) {
+                               /* regionviews containing these notes don't yet exist on the canvas.*/
+                               pending_midi_note_selection.push_back (make_pair (id, notes));
+                       }
+
+               } else if ((*i)->name() == X_("ControlPoint")) {
+                       XMLProperty const * prop_type = (*i)->property (X_("type"));
+
+                       assert(prop_type);
+
+                       if (prop_type->value () == "track") {
+
+                               PBD::ID route_id;
+                               PBD::ID alist_id;
+                               std::string param;
+                               uint32_t view_index;
+
+                               if (!(*i)->get_property (X_("route-id"), route_id) ||
+                                   !(*i)->get_property (X_("automation-list-id"), alist_id) ||
+                                   !(*i)->get_property (X_("parameter"), param) ||
+                                   !(*i)->get_property (X_("view-index"), view_index)) {
+                                       assert(false);
+                               }
+
+                               StripableTimeAxisView* stv = editor->get_stripable_time_axis_by_id (route_id);
+                               vector <ControlPoint *> cps;
+
+                               if (stv) {
+                                       boost::shared_ptr<AutomationTimeAxisView> atv = stv->automation_child (EventTypeMap::instance().from_symbol (param));
+                                       if (atv) {
+                                               list<boost::shared_ptr<AutomationLine> > lines = atv->lines();
+                                               for (list<boost::shared_ptr<AutomationLine> > ::iterator li = lines.begin(); li != lines.end(); ++li) {
+                                                       if ((*li)->the_list()->id() == alist_id) {
+                                                               ControlPoint* cp = (*li)->nth(view_index);
+                                                               if (cp) {
+                                                                       cps.push_back (cp);
+                                                                       cp->show();
+                                                               }
+                                                       }
+                                               }
+                                       }
+                               }
+                               if (!cps.empty()) {
+                                       add (cps);
+                               }
+                       } else if (prop_type->value () == "region") {
+
+                               PBD::ID region_id;
+                               uint32_t view_index;
+                               if (!(*i)->get_property (X_("region-id"), region_id) ||
+                                   !(*i)->get_property (X_("view-index"), view_index)) {
+                                       continue;
+                               }
+
+                               RegionSelection rs;
+                               editor->get_regionviews_by_id (region_id, rs);
+
+                               if (!rs.empty ()) {
+                                       vector <ControlPoint *> cps;
+                                       for (RegionSelection::iterator rsi = rs.begin(); rsi != rs.end(); ++rsi) {
+                                               AudioRegionView* arv = dynamic_cast<AudioRegionView*> (*rsi);
+                                               if (arv) {
+                                                       boost::shared_ptr<AudioRegionGainLine> gl = arv->get_gain_line ();
+                                                       ControlPoint* cp = gl->nth(view_index);
+                                                       if (cp) {
+                                                               cps.push_back (cp);
+                                                               cp->show();
+                                                       }
+                                               }
+                                       }
+                                       if (!cps.empty()) {
+                                               add (cps);
+                                       }
+                               }
                        }
-                       
+
+               } else if ((*i)->name() == X_("AudioRange")) {
+                       samplepos_t start;
+                       samplepos_t end;
+
+                       if (!(*i)->get_property (X_("start"), start) || !(*i)->get_property (X_("end"), end)) {
+                               assert(false);
+                       }
+
+                       add (start, end);
+
                } 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);
+                       std::string param;
+
+                       if (!(*i)->get_property (X_("id"), id) || !(*i)->get_property (X_("parameter"), param)) {
+                               assert (false);
+                       }
+
+                       StripableTimeAxisView* stv = editor->get_stripable_time_axis_by_id (id);
 
-                       PBD::ID id (prop_id->value ());
-                       RouteTimeAxisView* rtv = editor->get_route_view_by_route_id (id);
+                       if (stv) {
+                               boost::shared_ptr<AutomationTimeAxisView> atv = stv->automation_child (EventTypeMap::instance().from_symbol (param));
 
-                       if (rtv) {
-                               boost::shared_ptr<AutomationTimeAxisView> 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")) {
+
+                       bool is_start;
+                       if (!(*i)->get_property (X_("id"), id) || !(*i)->get_property (X_("start"), is_start)) {
+                               assert(false);
+                       }
+
+                       ArdourMarker* m = editor->find_marker_from_location_id (id, is_start);
+                       if (m) {
+                               add (m);
+                       }
+
                }
+
        }
 
        return 0;
@@ -1179,3 +1436,263 @@ Selection::remove_regions (TimeAxisView* t)
                i = tmp;
        }
 }
+
+/* TIME AXIS VIEW ... proxy for Stripable/Controllable
+ *
+ * public methods just modify the CoreSelection; PresentationInfo::Changed will
+ * trigger Selection::core_selection_changed() and we will update our own data
+ * structures there.
+ */
+
+void
+Selection::toggle (const TrackViewList& track_list)
+{
+       TrackViewList t = add_grouped_tracks (track_list);
+
+       CoreSelection& selection (editor->session()->selection());
+       PresentationInfo::ChangeSuspender cs;
+
+       for (TrackSelection::const_iterator i = t.begin(); i != t.end(); ++i) {
+               boost::shared_ptr<Stripable> s = (*i)->stripable ();
+               boost::shared_ptr<AutomationControl> c = (*i)->control ();
+               selection.toggle (s, c);
+       }
+}
+
+void
+Selection::toggle (TimeAxisView* track)
+{
+       TrackViewList tr;
+       tr.push_back (track);
+       toggle (tr);
+}
+
+void
+Selection::add (TrackViewList const & track_list)
+{
+       TrackViewList t = add_grouped_tracks (track_list);
+
+       CoreSelection& selection (editor->session()->selection());
+       PresentationInfo::ChangeSuspender cs;
+
+       for (TrackSelection::const_iterator i = t.begin(); i != t.end(); ++i) {
+               boost::shared_ptr<Stripable> s = (*i)->stripable ();
+               boost::shared_ptr<AutomationControl> c = (*i)->control ();
+               selection.add (s, c);
+       }
+}
+
+void
+Selection::add (TimeAxisView* track)
+{
+       TrackViewList tr;
+       tr.push_back (track);
+       add (tr);
+}
+
+void
+Selection::remove (TimeAxisView* track)
+{
+       TrackViewList tvl;
+       tvl.push_back (track);
+       remove (tvl);
+}
+
+void
+Selection::remove (const TrackViewList& t)
+{
+       CoreSelection& selection (editor->session()->selection());
+       PresentationInfo::ChangeSuspender cs;
+
+       for (TrackSelection::const_iterator i = t.begin(); i != t.end(); ++i) {
+               boost::shared_ptr<Stripable> s = (*i)->stripable ();
+               boost::shared_ptr<AutomationControl> c = (*i)->control ();
+               selection.remove (s, c);
+       }
+}
+
+void
+Selection::set (TimeAxisView* track)
+{
+       TrackViewList tvl;
+       tvl.push_back (track);
+       set (tvl);
+}
+
+void
+Selection::set (const TrackViewList& track_list)
+{
+       TrackViewList t = add_grouped_tracks (track_list);
+
+       CoreSelection& selection (editor->session()->selection());
+
+#if 1 // crazy optmization hack
+       /* check is the selection actually changed, ignore NO-OPs
+        *
+        * There are excessive calls from EditorRoutes::selection_changed():
+        * Every click calls selection_changed() even if it doesn't change.
+        * Also re-ordering tracks calls into this due to gtk's odd DnD signal
+        * messaging (row removed, re-added).
+        *
+        * Re-ordering a row results in at least 2 calls to selection_changed()
+        * without actual change. Calling selection.clear_stripables()
+        * and re-adding the same tracks every time in turn emits changed signals.
+        */
+       bool changed = false;
+       CoreSelection::StripableAutomationControls sac;
+       selection.get_stripables (sac);
+       for (TrackSelection::const_iterator i = t.begin(); i != t.end(); ++i) {
+               boost::shared_ptr<Stripable> s = (*i)->stripable ();
+               boost::shared_ptr<AutomationControl> c = (*i)->control ();
+               bool found = false;
+               for (CoreSelection::StripableAutomationControls::iterator j = sac.begin (); j != sac.end (); ++j) {
+                       if (j->stripable == s && j->controllable == c) {
+                               found = true;
+                               sac.erase (j);
+                               break;
+                       }
+               }
+               if (!found) {
+                       changed = true;
+                       break;
+               }
+       }
+       if (!changed && sac.size() == 0) {
+               return;
+       }
+#endif
+
+       PresentationInfo::ChangeSuspender cs;
+
+       selection.clear_stripables ();
+
+       for (TrackSelection::const_iterator i = t.begin(); i != t.end(); ++i) {
+               boost::shared_ptr<Stripable> s = (*i)->stripable ();
+               boost::shared_ptr<AutomationControl> c = (*i)->control ();
+               selection.add (s, c);
+       }
+}
+
+void
+Selection::clear_tracks (bool)
+{
+       if (!manage_libardour_selection) {
+               return;
+       }
+
+       Session* s = editor->session();
+       if (s) {
+               CoreSelection& selection (s->selection());
+               selection.clear_stripables ();
+       }
+}
+
+bool
+Selection::selected (TimeAxisView* tv) const
+{
+       Session* session = editor->session();
+
+       if (!session) {
+               return false;
+       }
+
+       CoreSelection& selection (session->selection());
+       boost::shared_ptr<Stripable> s = tv->stripable ();
+       boost::shared_ptr<AutomationControl> c = tv->control ();
+
+       if (c) {
+               return selection.selected (c);
+       }
+
+       return selection.selected (s);
+}
+
+TrackViewList
+Selection::add_grouped_tracks (TrackViewList const & t)
+{
+       TrackViewList added;
+
+       for (TrackSelection::const_iterator i = t.begin(); i != t.end(); ++i) {
+               if (dynamic_cast<VCATimeAxisView*> (*i)) {
+                       continue;
+               }
+
+               /* select anything in the same select-enabled route group */
+               ARDOUR::RouteGroup* rg = (*i)->route_group ();
+
+               if (rg && rg->is_active() && rg->is_select ()) {
+
+                       TrackViewList tr = editor->axis_views_from_routes (rg->route_list ());
+
+                       for (TrackViewList::iterator j = tr.begin(); j != tr.end(); ++j) {
+
+                               /* Do not add the trackview passed in as an
+                                * argument, because we want that to be on the
+                                * end of the list.
+                                */
+
+                               if (*j != *i) {
+                                       if (!added.contains (*j)) {
+                                               added.push_back (*j);
+                                       }
+                               }
+                       }
+               }
+       }
+
+       /* now add the the trackview's passed in as actual arguments */
+       added.insert (added.end(), t.begin(), t.end());
+
+       return added;
+}
+
+#if 0
+static void dump_tracks (Selection const & s)
+{
+       cerr << "--TRACKS [" << s.tracks.size() << ']' << ":\n";
+       for (TrackViewList::const_iterator x = s.tracks.begin(); x != s.tracks.end(); ++x) {
+               cerr << (*x)->name() << ' ' << (*x)->stripable() << " C = " << (*x)->control() << endl;
+       }
+       cerr << "///\n";
+}
+#endif
+
+void
+Selection::core_selection_changed (PropertyChange const & what_changed)
+{
+       PropertyChange pc;
+
+       pc.add (Properties::selected);
+
+       if (!what_changed.contains (pc)) {
+               return;
+       }
+
+       CoreSelection& selection (editor->session()->selection());
+
+       if (selection.selected()) {
+               clear_objects(); // enforce object/range exclusivity
+       }
+
+       tracks.clear (); // clear stage for whatever tracks are now selected (maybe none)
+
+       CoreSelection::StripableAutomationControls sac;
+       selection.get_stripables (sac);
+
+       for (CoreSelection::StripableAutomationControls::const_iterator i = sac.begin(); i != sac.end(); ++i) {
+               AxisView* av;
+               TimeAxisView* tav;
+               if ((*i).controllable) {
+                       av = editor->axis_view_by_control ((*i).controllable);
+               } else {
+                       av = editor->axis_view_by_stripable ((*i).stripable);
+               }
+
+               tav = dynamic_cast<TimeAxisView*>(av);
+               if (tav) {
+                       tracks.push_back (tav);
+               }
+       }
+
+       TracksChanged();
+}