non-copy region drag now creates a new track when a region is dragged to the drop...

[ardour.git] / gtk2_ardour / selection.cc

diff --git a/gtk2_ardour/selection.cc b/gtk2_ardour/selection.cc
index 395ceda1696ad95aa00b814d292bca6bb473653f..6465bb4d44592d1ecd2748c71bdf6d9ddddc7bd7 100644 (file)
--- a/gtk2_ardour/selection.cc
+++ b/gtk2_ardour/selection.cc
@@ -19,6 +19,7 @@
 
 #include <algorithm>
 #include <sigc++/bind.h>
+
 #include "pbd/error.h"
 #include "pbd/stacktrace.h"
 
@@ -119,13 +120,15 @@ Selection::clear_objects ()
        clear_playlists ();
        clear_midi_notes ();
        clear_midi_regions ();
-       clear_markers ();
 }
 
 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();
@@ -250,8 +253,10 @@ 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);
        }
 
@@ -346,13 +351,13 @@ Selection::toggle (framepos_t start, framepos_t end)
 
        /* 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
@@ -393,6 +398,9 @@ Selection::add (const TrackViewList& track_list)
        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 ();
                }
@@ -403,6 +411,7 @@ void
 Selection::add (TimeAxisView* track)
 {
        TrackViewList tr;
+       track->set_selected (true);
        tr.push_back (track);
        add (tr);
 }
@@ -522,13 +531,28 @@ Selection::add (framepos_t start, framepos_t end)
 
        /* XXX this implementation is incorrect */
 
-       time.push_back (AudioRange (start, end, next_time_id++));
+       time.push_back (AudioRange (start, end, ++next_time_id));
        time.consolidate ();
        time.sort (cmp);
 
        TimeChanged ();
 
-       return next_time_id - 1;
+       return next_time_id;
+}
+
+void
+Selection::move_time (framecnt_t distance)
+{
+       if (distance == 0) {
+               return;
+       }
+
+       for (list<AudioRange>::iterator i = time.begin(); i != time.end(); ++i) {
+               (*i).start += distance;
+               (*i).end += distance;
+       }
+
+       TimeChanged ();
 }
 
 void
@@ -575,6 +599,7 @@ 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();
@@ -582,15 +607,6 @@ Selection::remove (TimeAxisView* track)
        }
 }
 
-void
-Selection::remove (ControlPoint* p)
-{
-       PointSelection::iterator i = find (points.begin(), points.end(), p);
-       if (i != points.end ()) {
-               points.erase (i);
-       }
-}
-
 void
 Selection::remove (const TrackViewList& track_list)
 {
@@ -600,6 +616,7 @@ Selection::remove (const TrackViewList& track_list)
 
                TrackViewList::iterator x = find (tracks.begin(), tracks.end(), *i);
                if (x != tracks.end()) {
+                       (*i)->set_selected (false);
                        tracks.erase (x);
                        changed = true;
                }
@@ -612,6 +629,15 @@ Selection::remove (const TrackViewList& track_list)
        }
 }
 
+void
+Selection::remove (ControlPoint* p)
+{
+       PointSelection::iterator i = find (points.begin(), points.end(), p);
+       if (i != points.end ()) {
+               points.erase (i);
+       }
+}
+
 void
 Selection::remove (const MidiNoteSelection& midi_list)
 {
@@ -844,7 +870,7 @@ Selection::set (framepos_t start, framepos_t end)
        }
 
        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 */
 
@@ -880,7 +906,7 @@ Selection::set_preserving_all_ranges (framepos_t start, framepos_t end)
        }
 
        if (time.empty ()) {
-               time.push_back (AudioRange (start, end, next_time_id++));
+               time.push_back (AudioRange (start, end, ++next_time_id));
        } else {
                time.sort (AudioRangeComparator ());
                time.front().start = start;
@@ -910,7 +936,7 @@ Selection::selected (Marker* m)
 bool
 Selection::selected (TimeAxisView* tv)
 {
-       return find (tracks.begin(), tracks.end(), tv) != tracks.end();
+       return tv->get_selected ();
 }
 
 bool
@@ -1115,7 +1141,7 @@ void
 Selection::set (Marker* m)
 {
        clear_time ();  //enforce region/object exclusivity
-       clear_objects();
+       markers.clear ();
 
        add (m);
 }
@@ -1123,8 +1149,6 @@ Selection::set (Marker* m)
 void
 Selection::toggle (Marker* m)
 {
-       clear_time ();  //enforce region/object exclusivity
-
        MarkerSelection::iterator i;
 
        if ((i = find (markers.begin(), markers.end(), m)) == markers.end()) {