Fix ExportFormatSpecification copy-c'tor
[ardour.git] / gtk2_ardour / selection.cc
index 0118c1c679b4f74d64fa2a572c33712ae60cad6b..df8b359f7294706ba8b7fc2c716e854d91a41464 100644 (file)
 
 #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"
@@ -35,8 +43,9 @@
 #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;
@@ -48,21 +57,18 @@ struct AudioRangeComparator {
        }
 };
 
-Selection::Selection (const PublicEditor* e)
+Selection::Selection (const PublicEditor* e, bool mls)
        : tracks (e)
        , editor (e)
        , next_time_id (0)
-       , _no_tracks_changed (false)
+       , 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, boost::bind (track_remove, this, _1), gui_context());
-
-       void (Selection::*marker_remove)(Marker*) = &Selection::remove;
-       Marker::CatchDeletion.connect (*this, MISSING_INVALIDATOR, boost::bind (marker_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::*point_remove)(ControlPoint*) = &Selection::remove;
        ControlPoint::CatchDeletion.connect (*this, MISSING_INVALIDATOR, boost::bind (point_remove, this, _1), gui_context());
@@ -113,36 +119,23 @@ Selection::clear ()
 }
 
 void
-Selection::clear_objects ()
+Selection::clear_objects (bool with_signal)
 {
-       clear_regions ();
-       clear_points ();
-       clear_lines();
-       clear_playlists ();
-       clear_midi_notes ();
-       clear_midi_regions ();
+       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_tracks ()
-{
-       if (!tracks.empty()) {
-               for (TrackViewList::iterator x = tracks.begin(); x != tracks.end(); ++x) {
-                       (*x)->set_selected (false);
-               }
-               tracks.clear ();
-               if (!_no_tracks_changed) {
-                       TracksChanged();
-               }
-       }
-}
-
-void
-Selection::clear_time ()
+Selection::clear_time (bool with_signal)
 {
        time.clear();
-
-       TimeChanged ();
+       if (with_signal) {
+               TimeChanged ();
+       }
 }
 
 void
@@ -156,41 +149,56 @@ Selection::dump_region_layers()
 
 
 void
-Selection::clear_regions ()
+Selection::clear_regions (bool with_signal)
 {
        if (!regions.empty()) {
                regions.clear_all ();
-               RegionsChanged();
+               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 ();
+               }
        }
 
-       /* The note selection is actually stored in MidiRegionView, emit signal to
-          tell them to clear their selection. */
-       ClearMidiNoteSelection();  /* EMIT SIGNAL */
+       // 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_playlists ()
+Selection::clear_playlists (bool with_signal)
 {
        /* Selections own their playlists */
 
@@ -202,33 +210,39 @@ 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
+       clear_time(); // enforce object/range exclusivity
+       clear_tracks(); // enforce object/track exclusivity
 
        PlaylistSelection::iterator i;
 
@@ -242,37 +256,11 @@ 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()) {
-               track->set_selected (true);
-               tracks.push_back (track);
-       } else {
-               track->set_selected (false);
-               tracks.erase (i);
-       }
-
-       if (!_no_tracks_changed) {
-               TracksChanged();
-       }
-}
-
 void
 Selection::toggle (const MidiNoteSelection& midi_note_list)
 {
-       clear_time();  //enforce object/range exclusivity
-       clear_tracks();  //enforce object/track exclusivity
+       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));
@@ -299,8 +287,8 @@ Selection::toggle (MidiCutBuffer* midi)
 void
 Selection::toggle (RegionView* r)
 {
-       clear_time();  //enforce object/range exclusivity
-       clear_tracks();  //enforce object/track exclusivity
+       clear_time(); // enforce object/range exclusivity
+       clear_tracks(); // enforce object/track exclusivity
 
        RegionSelection::iterator i;
 
@@ -316,8 +304,8 @@ Selection::toggle (RegionView* r)
 void
 Selection::toggle (MidiRegionView* mrv)
 {
-       clear_time();   //enforce object/range exclusivity
-       clear_tracks();  //enforce object/track exclusivity
+       clear_time(); // enforce object/range exclusivity
+       clear_tracks(); // enforce object/track exclusivity
 
        MidiRegionSelection::iterator i;
 
@@ -333,8 +321,8 @@ Selection::toggle (MidiRegionView* mrv)
 void
 Selection::toggle (vector<RegionView*>& r)
 {
-       clear_time();  //enforce object/range exclusivity
-       clear_tracks();  //enforce object/track exclusivity
+       clear_time(); // enforce object/range exclusivity
+       clear_tracks(); // enforce object/track exclusivity
 
        RegionSelection::iterator i;
 
@@ -350,9 +338,9 @@ 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
+       clear_objects(); // enforce object/range exclusivity
 
        AudioRangeComparator cmp;
 
@@ -370,10 +358,10 @@ Selection::toggle (framepos_t start, framepos_t end)
 void
 Selection::add (boost::shared_ptr<Playlist> pl)
 {
-       clear_time();  //enforce object/range exclusivity
-       clear_tracks();  //enforce object/track exclusivity
 
        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 ();
@@ -383,9 +371,6 @@ Selection::add (boost::shared_ptr<Playlist> pl)
 void
 Selection::add (const list<boost::shared_ptr<Playlist> >& pllist)
 {
-       clear_time();  //enforce object/range exclusivity
-       clear_tracks();  //enforce object/track exclusivity
-
        bool changed = false;
 
        for (list<boost::shared_ptr<Playlist> >::const_iterator i = pllist.begin(); i != pllist.end(); ++i) {
@@ -397,48 +382,21 @@ 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)
-{
-       clear_objects();  //enforce object/range exclusivity
-
-       TrackViewList added = tracks.add (track_list);
-
-       if (!added.empty()) {
-               for (TrackViewList::iterator x = added.begin(); x != added.end(); ++x) {
-                       (*x)->set_selected (true);
-               }
-               if (!_no_tracks_changed) {
-                       TracksChanged ();
-               }
-       }
-}
-
-void
-Selection::add (TimeAxisView* track)
-{
-       clear_objects();  //enforce object/range exclusivity
-
-       TrackViewList tr;
-       track->set_selected (true);
-       tr.push_back (track);
-       add (tr);
-}
-
 void
 Selection::add (const MidiNoteSelection& midi_list)
 {
-       clear_time();  //enforce object/range exclusivity
-       clear_tracks();  //enforce object/track exclusivity
-
        const MidiNoteSelection::const_iterator b = midi_list.begin();
        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 ();
        }
@@ -458,9 +416,6 @@ Selection::add (MidiCutBuffer* midi)
 void
 Selection::add (vector<RegionView*>& v)
 {
-       clear_time();  //enforce object/range exclusivity
-       clear_tracks();  //enforce object/track exclusivity
-
        /* XXX This method or the add (const RegionSelection&) needs to go
         */
 
@@ -473,6 +428,8 @@ Selection::add (vector<RegionView*>& v)
        }
 
        if (changed) {
+               clear_time(); // enforce object/range exclusivity
+               clear_tracks(); // enforce object/track exclusivity
                RegionsChanged ();
        }
 }
@@ -480,9 +437,6 @@ Selection::add (vector<RegionView*>& v)
 void
 Selection::add (const RegionSelection& rs)
 {
-       clear_time();  //enforce object/range exclusivity
-       clear_tracks();  //enforce object/track exclusivity
-
        /* XXX This method or the add (const vector<RegionView*>&) needs to go
         */
 
@@ -495,6 +449,8 @@ Selection::add (const RegionSelection& rs)
        }
 
        if (changed) {
+               clear_time(); // enforce object/range exclusivity
+               clear_tracks(); // enforce object/track exclusivity
                RegionsChanged ();
        }
 }
@@ -502,12 +458,11 @@ Selection::add (const RegionSelection& rs)
 void
 Selection::add (RegionView* r)
 {
-       clear_time();  //enforce object/range exclusivity
-       clear_tracks();  //enforce object/track exclusivity
-
        if (find (regions.begin(), regions.end(), r) == regions.end()) {
                bool changed = regions.add (r);
                if (changed) {
+                       clear_time(); // enforce object/range exclusivity
+                       clear_tracks(); // enforce object/track exclusivity
                        RegionsChanged ();
                }
        }
@@ -516,8 +471,10 @@ Selection::add (RegionView* r)
 void
 Selection::add (MidiRegionView* mrv)
 {
-       clear_time();  //enforce object/range exclusivity
-       clear_tracks();  //enforce object/track exclusivity
+       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);
@@ -527,9 +484,9 @@ Selection::add (MidiRegionView* mrv)
 }
 
 long
-Selection::add (framepos_t start, framepos_t end)
+Selection::add (samplepos_t start, samplepos_t end)
 {
-       clear_objects();  //enforce object/range exclusivity
+       clear_objects(); // enforce object/range exclusivity
 
        AudioRangeComparator cmp;
 
@@ -545,7 +502,7 @@ Selection::add (framepos_t start, framepos_t end)
 }
 
 void
-Selection::move_time (framecnt_t distance)
+Selection::move_time (samplecnt_t distance)
 {
        if (distance == 0) {
                return;
@@ -560,9 +517,9 @@ Selection::move_time (framecnt_t distance)
 }
 
 void
-Selection::replace (uint32_t sid, framepos_t start, framepos_t end)
+Selection::replace (uint32_t sid, samplepos_t start, samplepos_t end)
 {
-       clear_objects();  //enforce object/range exclusivity
+       clear_objects(); // enforce object/range exclusivity
 
        for (list<AudioRange>::iterator i = time.begin(); i != time.end(); ++i) {
                if ((*i).id == sid) {
@@ -584,54 +541,25 @@ Selection::replace (uint32_t sid, framepos_t start, framepos_t end)
 void
 Selection::add (boost::shared_ptr<Evoral::ControlList> cl)
 {
-       clear_time();  //enforce object/range exclusivity
-       clear_tracks();  //enforce object/track exclusivity
+       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;
        }
-       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()) {
-               track->set_selected (false);
-               tracks.erase (i);
-               if (!_no_tracks_changed) {
-                       TracksChanged();
-               }
+       if (!cl->empty()) {
+               clear_time(); // enforce object/range exclusivity
+               clear_tracks(); // enforce object/track exclusivity
        }
-}
 
-void
-Selection::remove (const TrackViewList& track_list)
-{
-       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()) {
-                       (*i)->set_selected (false);
-                       tracks.erase (x);
-                       changed = true;
-               }
-       }
-
-       if (changed) {
-               if (!_no_tracks_changed) {
-                       TracksChanged();
-               }
-       }
+       /* 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
@@ -717,6 +645,8 @@ Selection::remove (RegionView* r)
 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()) {
@@ -725,7 +655,6 @@ Selection::remove (MidiRegionView* mrv)
        }
 }
 
-
 void
 Selection::remove (uint32_t selection_id)
 {
@@ -744,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*/)
 {
 }
 
@@ -758,27 +687,13 @@ Selection::remove (boost::shared_ptr<ARDOUR::AutomationList> ac)
        }
 }
 
-void
-Selection::set (TimeAxisView* track)
-{
-       clear_objects();  //enforce object/range exclusivity
-       clear_tracks ();
-       add (track);
-}
-
-void
-Selection::set (const TrackViewList& track_list)
-{
-       clear_objects();  //enforce object/range exclusivity
-       clear_tracks ();
-       add (track_list);
-}
-
 void
 Selection::set (const MidiNoteSelection& midi_list)
 {
-       clear_time ();  //enforce region/object exclusivity
-       clear_tracks();  //enforce object/track exclusivity
+       if (!midi_list.empty()) {
+               clear_time (); // enforce region/object exclusivity
+               clear_tracks(); // enforce object/track exclusivity
+       }
        clear_objects ();
        add (midi_list);
 }
@@ -786,8 +701,10 @@ Selection::set (const MidiNoteSelection& midi_list)
 void
 Selection::set (boost::shared_ptr<Playlist> playlist)
 {
-       clear_time ();  //enforce region/object exclusivity
-       clear_tracks();  //enforce object/track exclusivity
+       if (playlist) {
+               clear_time (); // enforce region/object exclusivity
+               clear_tracks(); // enforce object/track exclusivity
+       }
        clear_objects ();
        add (playlist);
 }
@@ -795,7 +712,9 @@ Selection::set (boost::shared_ptr<Playlist> playlist)
 void
 Selection::set (const list<boost::shared_ptr<Playlist> >& pllist)
 {
-       clear_time();  //enforce region/object exclusivity
+       if (!pllist.empty()) {
+               clear_time(); // enforce region/object exclusivity
+       }
        clear_objects ();
        add (pllist);
 }
@@ -803,8 +722,10 @@ Selection::set (const list<boost::shared_ptr<Playlist> >& pllist)
 void
 Selection::set (const RegionSelection& rs)
 {
-       clear_time();  //enforce region/object exclusivity
-       clear_tracks();  //enforce object/track exclusivity
+       if (!rs.empty()) {
+               clear_time(); // enforce region/object exclusivity
+               clear_tracks(); // enforce object/track exclusivity
+       }
        clear_objects();
        regions = rs;
        RegionsChanged(); /* EMIT SIGNAL */
@@ -813,8 +734,10 @@ Selection::set (const RegionSelection& rs)
 void
 Selection::set (MidiRegionView* mrv)
 {
-       clear_time();  //enforce region/object exclusivity
-       clear_tracks();  //enforce object/track exclusivity
+       if (mrv) {
+               clear_time(); // enforce region/object exclusivity
+               clear_tracks(); // enforce object/track exclusivity
+       }
        clear_objects ();
        add (mrv);
 }
@@ -822,8 +745,10 @@ Selection::set (MidiRegionView* mrv)
 void
 Selection::set (RegionView* r, bool /*also_clear_tracks*/)
 {
-       clear_time();  //enforce region/object exclusivity
-       clear_tracks();  //enforce object/track exclusivity
+       if (r) {
+               clear_time(); // enforce region/object exclusivity
+               clear_tracks(); // enforce object/track exclusivity
+       }
        clear_objects ();
        add (r);
 }
@@ -831,8 +756,11 @@ Selection::set (RegionView* r, bool /*also_clear_tracks*/)
 void
 Selection::set (vector<RegionView*>& v)
 {
-       clear_time();  //enforce region/object exclusivity
-       clear_tracks();  //enforce object/track exclusivity
+       if (!v.empty()) {
+               clear_time(); // enforce region/object exclusivity
+               clear_tracks(); // enforce object/track exclusivity
+       }
+
        clear_objects();
 
        add (v);
@@ -842,9 +770,9 @@ 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_objects(); // enforce region/object exclusivity
        clear_time();
 
        if ((start == 0 && end == 0) || end < start) {
@@ -879,9 +807,9 @@ Selection::set (framepos_t start, framepos_t end)
  *  @param end New end time.
  */
 void
-Selection::set_preserving_all_ranges (framepos_t start, framepos_t end)
+Selection::set_preserving_all_ranges (samplepos_t start, samplepos_t end)
 {
-       clear_objects();  //enforce region/object exclusivity
+       clear_objects(); // enforce region/object exclusivity
 
        if ((start == 0 && end == 0) || (end < start)) {
                return;
@@ -903,33 +831,27 @@ Selection::set_preserving_all_ranges (framepos_t start, framepos_t end)
 void
 Selection::set (boost::shared_ptr<Evoral::ControlList> ac)
 {
-       clear_time();  //enforce region/object exclusivity
-       clear_tracks();  //enforce object/track exclusivity
+       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)
-{
-       return tv->get_selected ();
-}
-
-bool
-Selection::selected (RegionView* rv)
+Selection::selected (RegionView* rv) const
 {
        return find (regions.begin(), regions.end(), rv) != regions.end();
 }
 
 bool
-Selection::selected (ControlPoint* cp)
+Selection::selected (ControlPoint* cp) const
 {
        return find (points.begin(), points.end(), cp) != points.end();
 }
@@ -937,7 +859,7 @@ Selection::selected (ControlPoint* cp)
 bool
 Selection::empty (bool internal_selection)
 {
-       bool object_level_empty =  regions.empty () &&
+       bool object_level_empty = regions.empty () &&
                tracks.empty () &&
                points.empty () &&
                playlists.empty () &&
@@ -962,10 +884,10 @@ Selection::empty (bool internal_selection)
 void
 Selection::toggle (ControlPoint* cp)
 {
-       clear_time();  //enforce region/object exclusivity
-       clear_tracks();  //enforce object/track exclusivity
+       clear_time(); // enforce region/object exclusivity
+       clear_tracks(); // enforce object/track exclusivity
 
-       cp->set_selected (!cp->get_selected ());
+       cp->set_selected (!cp->selected ());
        PointSelection::iterator i = find (points.begin(), points.end(), cp);
        if (i == points.end()) {
                points.push_back (cp);
@@ -979,8 +901,8 @@ Selection::toggle (ControlPoint* cp)
 void
 Selection::toggle (vector<ControlPoint*> const & cps)
 {
-       clear_time();  //enforce region/object exclusivity
-       clear_tracks();  //enforce object/track exclusivity
+       clear_time(); // enforce region/object exclusivity
+       clear_tracks(); // enforce object/track exclusivity
 
        for (vector<ControlPoint*>::const_iterator i = cps.begin(); i != cps.end(); ++i) {
                toggle (*i);
@@ -990,8 +912,8 @@ Selection::toggle (vector<ControlPoint*> const & cps)
 void
 Selection::toggle (list<Selectable*> const & selectables)
 {
-       clear_time();  //enforce region/object exclusivity
-       clear_tracks();  //enforce object/track exclusivity
+       clear_time(); // enforce region/object exclusivity
+       clear_tracks(); // enforce object/track exclusivity
 
        RegionView* rv;
        ControlPoint* cp;
@@ -1023,8 +945,8 @@ Selection::toggle (list<Selectable*> const & selectables)
 void
 Selection::set (list<Selectable*> const & selectables)
 {
-       clear_time ();  //enforce region/object exclusivity
-       clear_tracks();  //enforce object/track exclusivity
+       clear_time (); // enforce region/object exclusivity
+       clear_tracks(); // enforce object/track exclusivity
        clear_objects ();
 
        add (selectables);
@@ -1033,8 +955,8 @@ Selection::set (list<Selectable*> const & selectables)
 void
 Selection::add (PointSelection const & s)
 {
-       clear_time ();  //enforce region/object exclusivity
-       clear_tracks();  //enforce object/track exclusivity
+       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);
@@ -1044,8 +966,8 @@ Selection::add (PointSelection const & s)
 void
 Selection::add (list<Selectable*> const & selectables)
 {
-       clear_time ();  //enforce region/object exclusivity
-       clear_tracks();  //enforce object/track exclusivity
+       clear_time (); // enforce region/object exclusivity
+       clear_tracks(); // enforce object/track exclusivity
 
        RegionView* rv;
        ControlPoint* cp;
@@ -1075,19 +997,21 @@ 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
+       clear_time (); // enforce region/object exclusivity
+       clear_tracks(); // enforce object/track exclusivity
 
        cp->set_selected (true);
        points.push_back (cp);
@@ -1097,8 +1021,8 @@ Selection::add (ControlPoint* cp)
 void
 Selection::add (vector<ControlPoint*> const & cps)
 {
-       clear_time ();  //enforce region/object exclusivity
-       clear_tracks();  //enforce object/track exclusivity
+       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);
@@ -1110,10 +1034,10 @@ Selection::add (vector<ControlPoint*> const & cps)
 void
 Selection::set (ControlPoint* cp)
 {
-       clear_time ();  //enforce region/object exclusivity
-       clear_tracks();  //enforce object/track exclusivity
+       clear_time (); // enforce region/object exclusivity
+       clear_tracks(); // enforce object/track exclusivity
 
-       if (cp->get_selected()) {
+       if (cp->selected () && points.size () == 1) {
                return;
        }
 
@@ -1126,17 +1050,17 @@ Selection::set (ControlPoint* cp)
 }
 
 void
-Selection::set (Marker* m)
+Selection::set (ArdourMarker* m)
 {
-       clear_time ();  //enforce region/object exclusivity
-       clear_tracks();  //enforce object/track exclusivity
+       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;
 
@@ -1148,7 +1072,7 @@ Selection::toggle (Marker* m)
 }
 
 void
-Selection::remove (Marker* m)
+Selection::remove (ArdourMarker* m)
 {
        MarkerSelection::iterator i;
 
@@ -1159,10 +1083,10 @@ 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
+       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);
@@ -1171,10 +1095,10 @@ 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
+       clear_time (); // enforce region/object exclusivity
+       clear_tracks(); // enforce object/track exclusivity
 
        markers.insert (markers.end(), m.begin(), m.end());
        markers.sort ();
@@ -1184,9 +1108,9 @@ Selection::add (const list<Marker*>& m)
 }
 
 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) {
@@ -1211,58 +1135,41 @@ Selection::get_state () const
           so that re-opening plugin windows for editor mixer strips works
        */
 
-       char buf[32];
        XMLNode* node = new XMLNode (X_("Selection"));
 
        for (TrackSelection::const_iterator i = tracks.begin(); i != tracks.end(); ++i) {
-               RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*> (*i);
+               StripableTimeAxisView* stv = dynamic_cast<StripableTimeAxisView*> (*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()));
+               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->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"), atv->parent_stripable()->id ());
+                       t->set_property (X_("parameter"), EventTypeMap::instance().to_symbol (atv->parameter ()));
                }
        }
 
-       for (RegionSelection::const_iterator i = regions.begin(); i != regions.end(); ++i) {
-               XMLNode* r = node->add_child (X_("Region"));
-               r->add_property (X_("id"), atoi ((*i)->region ()->id ().to_s ().c_str()));
+       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 ());
+               }
        }
 
        /* midi region views have thir own internal selection. */
-       XMLNode* n = NULL;
-       list<pair<PBD::ID, std::set<boost::shared_ptr<Evoral::Note<Evoral::Beats> > > > > rid_notes;
+       list<pair<PBD::ID, std::set<boost::shared_ptr<Evoral::Note<Temporal::Beats> > > > > rid_notes;
        editor->get_per_region_note_selection (rid_notes);
-       if (!rid_notes.empty()) {
-               n = node->add_child (X_("MIDINote"));
-       }
-       list<pair<PBD::ID, std::set<boost::shared_ptr<Evoral::Note<Evoral::Beats> > > > >::iterator rn_it;
+
+       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) {
-               assert(n); // hint for clang static analysis
-               n->add_property (X_("region_id"), atoi((*rn_it).first.to_s().c_str()));
+               XMLNode* n = node->add_child (X_("MIDINotes"));
+               n->set_property (X_("region-id"), (*rn_it).first);
 
-               for (std::set<boost::shared_ptr<Evoral::Note<Evoral::Beats> > >::iterator i = (*rn_it).second.begin(); i != (*rn_it).second.end(); ++i) {
+               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"));
-                       snprintf(buf, sizeof(buf), "%d", (*i)->channel());
-                       nc->add_property(X_("channel"), string(buf));
-
-                       snprintf(buf, sizeof(buf), "%f", (*i)->time().to_double());
-                       nc->add_property(X_("time"), string(buf));
-
-                       snprintf(buf, sizeof(buf), "%d", (*i)->note());
-                       nc->add_property(X_("note"), string(buf));
-
-                       snprintf(buf, sizeof(buf), "%f", (*i)->length().to_double());
-                       nc->add_property(X_("length"), string(buf));
-
-                       snprintf(buf, sizeof(buf), "%d", (*i)->velocity());
-                       nc->add_property(X_("velocity"), string(buf));
-
-                       snprintf(buf, sizeof(buf), "%d", (*i)->off_velocity());
-                       nc->add_property(X_("off-velocity"), string(buf));
+                       nc->set_property(X_("note-id"), (*i)->id());
                }
        }
 
@@ -1271,23 +1178,28 @@ Selection::get_state () const
                if (atv) {
 
                        XMLNode* r = node->add_child (X_("ControlPoint"));
-                       r->add_property (X_("type"), "track");
-                       r->add_property (X_("route-id"), atoi (atv->parent_route()->id ().to_s ().c_str()));
-                       r->add_property (X_("automation-list-id"), atoi ((*i)->line().the_list()->id ().to_s ().c_str()));
-                       r->add_property (X_("parameter"), EventTypeMap::instance().to_symbol ((*i)->line().the_list()->parameter ()));
-
-                       snprintf(buf, sizeof(buf), "%d", (*i)->view_index());
-                       r->add_property (X_("view-index"), string(buf));
+                       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;
+               }
 
+               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());
                }
+
        }
 
        for (TimeSelection::const_iterator i = time.begin(); i != time.end(); ++i) {
                XMLNode* t = node->add_child (X_("AudioRange"));
-               snprintf(buf, sizeof(buf), "%" PRId64, (*i).start);
-               t->add_property (X_("start"), string(buf));
-               snprintf(buf, sizeof(buf), "%" PRId64, (*i).end);
-               t->add_property (X_("end"), string(buf));
+               t->set_property (X_("start"), (*i).start);
+               t->set_property (X_("end"), (*i).end);
        }
 
        for (MarkerSelection::const_iterator i = markers.begin(); i != markers.end(); ++i) {
@@ -1296,8 +1208,8 @@ Selection::get_state () const
                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"));
+               t->set_property (X_("id"), loc->id());
+               t->set_property (X_("start"), is_start);
        }
 
        return *node;
@@ -1314,78 +1226,64 @@ Selection::set_state (XMLNode const & node, int)
        clear_midi_notes ();
        clear_points ();
        clear_time ();
-       clear_tracks ();
        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;
 
-               } else if ((*i)->name() == X_("Region")) {
-                       XMLProperty* prop_id = (*i)->property (X_("id"));
-                       assert (prop_id);
-                       PBD::ID id (prop_id->value ());
+                               if (!(*ci)->get_property (X_("id"), id)) {
+                                       continue;
+                               }
 
-                       RegionSelection rs;
-                       editor->get_regionviews_by_id (id, rs);
-
-                       if (!rs.empty ()) {
-                               add (rs);
-                       } 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);
+                               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);
+                               }
                        }
 
-               } else if ((*i)->name() == X_("MIDINote")) {
-                       XMLProperty* prop_region_id = (*i)->property (X_("region-id"));
+                       if (!selected_regions.empty()) {
+                               add (selected_regions);
+                       }
 
-                       assert (prop_region_id);
+               } else if ((*i)->name() == X_("MIDINotes")) {
+
+                       if (!(*i)->get_property (X_("region-id"), id)) {
+                               assert (false);
+                       }
 
-                       PBD::ID const id (prop_region_id->value ());
                        RegionSelection rs;
 
                        editor->get_regionviews_by_id (id, rs); // there could be more than one
 
-                       std::list<boost::shared_ptr<Evoral::Note<Evoral::Beats> > > notes;
+                       std::list<Evoral::event_id_t> notes;
                        XMLNodeList children = (*i)->children ();
 
                        for (XMLNodeList::const_iterator ci = children.begin(); ci != children.end(); ++ci) {
-                               XMLProperty* prop_channel = (*ci)->property (X_("channel"));
-                               XMLProperty* prop_time = (*ci)->property (X_("time"));
-                               XMLProperty* prop_note = (*ci)->property (X_("note"));
-                               XMLProperty* prop_length = (*ci)->property (X_("length"));
-                               XMLProperty* prop_velocity = (*ci)->property (X_("velocity"));
-                               XMLProperty* prop_off_velocity = (*ci)->property (X_("off-velocity"));
-
-                               assert (prop_channel);
-                               assert (prop_time);
-                               assert (prop_note);
-                               assert (prop_length);
-                               assert (prop_velocity);
-                               assert (prop_off_velocity);
-
-                               uint8_t channel = atoi(prop_channel->value());
-                               Evoral::Beats time (atof(prop_time->value()));
-                               Evoral::Beats length (atof(prop_length->value()));
-                               uint8_t note = atoi(prop_note->value());
-                               uint8_t velocity = atoi(prop_velocity->value());
-                               uint8_t off_velocity = atoi(prop_off_velocity->value());
-                               boost::shared_ptr<Evoral::Note<Evoral::Beats> > the_note
-                                       (new Evoral::Note<Evoral::Beats>  (channel, time, length, note, velocity));
-                               the_note->set_off_velocity (off_velocity);
-
-                               notes.push_back (the_note);
+                               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) {
@@ -1400,35 +1298,35 @@ Selection::set_state (XMLNode const & node, int)
                                pending_midi_note_selection.push_back (make_pair (id, notes));
                        }
 
-               } else if  ((*i)->name() == X_("ControlPoint")) {
-                       XMLProperty* prop_type = (*i)->property (X_("type"));
+               } else if ((*i)->name() == X_("ControlPoint")) {
+                       XMLProperty const * prop_type = (*i)->property (X_("type"));
 
                        assert(prop_type);
 
                        if (prop_type->value () == "track") {
 
-                               XMLProperty* prop_route_id = (*i)->property (X_("route-id"));
-                               XMLProperty* prop_alist_id = (*i)->property (X_("automation-list-id"));
-                               XMLProperty* prop_parameter = (*i)->property (X_("parameter"));
-                               XMLProperty* prop_view_index = (*i)->property (X_("view-index"));
+                               PBD::ID route_id;
+                               PBD::ID alist_id;
+                               std::string param;
+                               uint32_t view_index;
 
-                               assert (prop_type);
-                               assert (prop_route_id);
-                               assert (prop_alist_id);
-                               assert (prop_parameter);
-                               assert (prop_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);
+                               }
 
-                               PBD::ID route_id (prop_route_id->value ());
-                               RouteTimeAxisView* rtv = editor->get_route_view_by_route_id (route_id);
+                               StripableTimeAxisView* stv = editor->get_stripable_time_axis_by_id (route_id);
                                vector <ControlPoint *> cps;
 
-                               if (rtv) {
-                                       boost::shared_ptr<AutomationTimeAxisView> atv = rtv->automation_child (EventTypeMap::instance().from_symbol (prop_parameter->value ()));
+                               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() == prop_alist_id->value()) {
-                                                               ControlPoint* cp = (*li)->nth(atol(prop_view_index->value().c_str()));
+                                                       if ((*li)->the_list()->id() == alist_id) {
+                                                               ControlPoint* cp = (*li)->nth(view_index);
                                                                if (cp) {
                                                                        cps.push_back (cp);
                                                                        cp->show();
@@ -1440,33 +1338,59 @@ Selection::set_state (XMLNode const & node, int)
                                if (!cps.empty()) {
                                        add (cps);
                                }
-                       }
+                       } else if (prop_type->value () == "region") {
 
-               } else if  ((*i)->name() == X_("AudioRange")) {
-                       XMLProperty* prop_start = (*i)->property (X_("start"));
-                       XMLProperty* prop_end = (*i)->property (X_("end"));
+                               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;
+                               }
 
-                       assert (prop_start);
-                       assert (prop_end);
+                               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);
+                                       }
+                               }
+                       }
 
-                       framepos_t s (atol (prop_start->value ().c_str()));
-                       framepos_t e (atol (prop_end->value ().c_str()));
+               } else if ((*i)->name() == X_("AudioRange")) {
+                       samplepos_t start;
+                       samplepos_t end;
 
-                       set_preserving_all_ranges (s, e);
+                       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"));
+                       std::string param;
 
-                       assert (prop_id);
-                       assert (prop_parameter);
+                       if (!(*i)->get_property (X_("id"), id) || !(*i)->get_property (X_("parameter"), param)) {
+                               assert (false);
+                       }
 
-                       PBD::ID id (prop_id->value ());
-                       RouteTimeAxisView* rtv = editor->get_route_view_by_route_id (id);
+                       StripableTimeAxisView* stv = editor->get_stripable_time_axis_by_id (id);
 
-                       if (rtv) {
-                               boost::shared_ptr<AutomationTimeAxisView> atv = rtv->automation_child (EventTypeMap::instance().from_symbol (prop_parameter->value ()));
+                       if (stv) {
+                               boost::shared_ptr<AutomationTimeAxisView> atv = stv->automation_child (EventTypeMap::instance().from_symbol (param));
 
                                /* the automation could be for an entity that was never saved
                                   in the session file. Don't freak out if we can't find
@@ -1480,13 +1404,12 @@ Selection::set_state (XMLNode const & node, int)
 
                } 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);
+                       bool is_start;
+                       if (!(*i)->get_property (X_("id"), id) || !(*i)->get_property (X_("start"), is_start)) {
+                               assert(false);
+                       }
 
-                       PBD::ID id (prop_id->value ());
-                       Marker* m = editor->find_marker_from_location_id (id, string_is_affirmative (prop_start->value ()));
+                       ArdourMarker* m = editor->find_marker_from_location_id (id, is_start);
                        if (m) {
                                add (m);
                        }
@@ -1514,8 +1437,262 @@ Selection::remove_regions (TimeAxisView* t)
        }
 }
 
+/* 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::block_tracks_changed (bool yn)
+Selection::clear_tracks (bool)
 {
-       _no_tracks_changed = yn;
+       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();
 }