modified fix from carl for region copy-moves-original-to-start bug; change verbose...
[ardour.git] / gtk2_ardour / region_selection.cc
index 2483961b8840fdbc63a4be4126de631df12f14f0..7ac7763773a6848aa90d871d4e0df8d09de27ab0 100644 (file)
@@ -1,51 +1,62 @@
+/*
+    Copyright (C) 2006 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
 #include <algorithm>
 
-#include <ardour/audioregion.h>
+#include <ardour/region.h>
 
-#include "regionview.h"
+#include "region_view.h"
 #include "region_selection.h"
+#include "time_axis_view.h"
 
 using namespace ARDOUR;
+using namespace PBD;
 using namespace sigc;
 
 
-bool 
-AudioRegionComparator::operator() (const AudioRegionView* a, const AudioRegionView* b) const
+RegionSelection::RegionSelection ()
 {
-       if (a == b) {
-               return false;
-       } else {
-               return a < b;
-       }
-}
+       RegionView::RegionViewGoingAway.connect (mem_fun(*this, &RegionSelection::remove_it));
 
-AudioRegionSelection::AudioRegionSelection ()
-{
        _current_start = 0;
        _current_end = 0;
 }
 
-AudioRegionSelection::AudioRegionSelection (const AudioRegionSelection& other)
+RegionSelection::RegionSelection (const RegionSelection& other)
 {
+       RegionView::RegionViewGoingAway.connect (mem_fun(*this, &RegionSelection::remove_it));
 
-       for (AudioRegionSelection::const_iterator i = other.begin(); i != other.end(); ++i) {
-               add (*i, false);
+       for (RegionSelection::const_iterator i = other.begin(); i != other.end(); ++i) {
+               add (*i);
        }
        _current_start = other._current_start;
        _current_end = other._current_end;
 }
 
-
-
-AudioRegionSelection&
-AudioRegionSelection::operator= (const AudioRegionSelection& other)
+RegionSelection&
+RegionSelection::operator= (const RegionSelection& other)
 {
        if (this != &other) {
 
                clear_all();
                
-               for (AudioRegionSelection::const_iterator i = other.begin(); i != other.end(); ++i) {
-                       add (*i, false);
+               for (RegionSelection::const_iterator i = other.begin(); i != other.end(); ++i) {
+                       add (*i);
                }
 
                _current_start = other._current_start;
@@ -56,60 +67,56 @@ AudioRegionSelection::operator= (const AudioRegionSelection& other)
 }
 
 void
-AudioRegionSelection::clear_all()
+RegionSelection::clear_all()
 {
        clear();
        _bylayer.clear();
+       _current_start = 0;
+       _current_end = 0;
 }
 
-bool AudioRegionSelection::contains (AudioRegionView* rv)
+bool RegionSelection::contains (RegionView* rv) const
 {
-       if (this->find (rv) != end()) {
-               return true;
-       }
-       else {
-               return false;
-       }
-       
+       return find (begin(), end(), rv) != end();
 }
 
-void
-AudioRegionSelection::add (AudioRegionView* rv, bool dosort)
+bool
+RegionSelection::add (RegionView* rv)
 {
-       if (this->find (rv) != end()) {
+       if (contains (rv)) {
                /* we already have it */
-               return;
+               return false;
        }
 
-       rv->AudioRegionViewGoingAway.connect (slot (*this, &AudioRegionSelection::remove_it));
-
-       if (rv->region.first_frame() < _current_start || empty()) {
-               _current_start = rv->region.first_frame();
+       if (rv->region()->first_frame() < _current_start || empty()) {
+               _current_start = rv->region()->first_frame();
        }
        
-       if (rv->region.last_frame() > _current_end || empty()) {
-               _current_end = rv->region.last_frame();
+       if (rv->region()->last_frame() > _current_end || empty()) {
+               _current_end = rv->region()->last_frame();
        }
        
-       insert (rv);
+       push_back (rv);
 
        // add to layer sorted list
+
        add_to_layer (rv);
-       
+
+       return true;
 }
 
 void
-AudioRegionSelection::remove_it (AudioRegionView *rv)
+RegionSelection::remove_it (RegionView *rv)
 {
        remove (rv);
 }
 
 bool
-AudioRegionSelection::remove (AudioRegionView* rv)
+RegionSelection::remove (RegionView* rv)
 {
-       AudioRegionSelection::iterator i;
+       RegionSelection::iterator i;
 
-       if ((i = this->find (rv)) != end()) {
+       if ((i = find (begin(), end(), rv)) != end()) {
 
                erase (i);
 
@@ -123,17 +130,17 @@ AudioRegionSelection::remove (AudioRegionView* rv)
 
                } else {
                        
-                       AudioRegion& region ((*i)->region);
+                       boost::shared_ptr<Region> region ((*i)->region());
 
-                       if (region.first_frame() == _current_start) {
+                       if (region->first_frame() == _current_start) {
                                
                                /* reset current start */
                                
-                               jack_nframes_t ref = max_frames;
+                               nframes_t ref = max_frames;
                                
                                for (i = begin (); i != end(); ++i) {
-                                       if (region.first_frame() < ref) {
-                                               ref = region.first_frame();
+                                       if (region->first_frame() < ref) {
+                                               ref = region->first_frame();
                                        }
                                }
                                
@@ -141,15 +148,15 @@ AudioRegionSelection::remove (AudioRegionView* rv)
                                
                        }
                        
-                       if (region.last_frame() == _current_end) {
+                       if (region->last_frame() == _current_end) {
 
                                /* reset current end */
                                
-                               jack_nframes_t ref = 0;
+                               nframes_t ref = 0;
                                
                                for (i = begin (); i != end(); ++i) {
-                                       if (region.first_frame() > ref) {
-                                               ref = region.first_frame();
+                                       if (region->first_frame() > ref) {
+                                               ref = region->first_frame();
                                        }
                                }
                                
@@ -164,15 +171,15 @@ AudioRegionSelection::remove (AudioRegionView* rv)
 }
 
 void
-AudioRegionSelection::add_to_layer (AudioRegionView * rv)
+RegionSelection::add_to_layer (RegionView * rv)
 {
        // insert it into layer sorted position
 
-       list<AudioRegionView*>::iterator i;
+       list<RegionView*>::iterator i;
 
        for (i = _bylayer.begin(); i != _bylayer.end(); ++i)
        {
-               if (rv->region.layer() < (*i)->region.layer()) {
+               if (rv->region()->layer() < (*i)->region()->layer()) {
                        _bylayer.insert(i, rv);
                        return;
                }
@@ -183,16 +190,16 @@ AudioRegionSelection::add_to_layer (AudioRegionView * rv)
 }
 
 struct RegionSortByTime {
-    bool operator() (const AudioRegionView* a, const AudioRegionView* b) {
-           return a->region.position() < b->region.position();
+    bool operator() (const RegionView* a, const RegionView* b) const {
+           return a->region()->position() < b->region()->position();
     }
 };
 
 
 void
-AudioRegionSelection::by_position (list<AudioRegionView*>& foo) const
+RegionSelection::by_position (list<RegionView*>& foo) const
 {
-       list<AudioRegionView*>::const_iterator i;
+       list<RegionView*>::const_iterator i;
        RegionSortByTime sorter;
 
        for (i = _bylayer.begin(); i != _bylayer.end(); ++i) {
@@ -202,3 +209,49 @@ AudioRegionSelection::by_position (list<AudioRegionView*>& foo) const
        foo.sort (sorter);
        return;
 }
+
+struct RegionSortByTrack {
+    bool operator() (const RegionView* a, const RegionView* b) const {
+           
+           /* really, track and position */
+
+           if (a->get_trackview().order == b->get_trackview().order) {
+                   return a->region()->position() < b->region()->position();
+           } else {
+                   return a->get_trackview().order < b->get_trackview().order;
+           }
+    }
+};
+       
+void
+RegionSelection::by_track (list<RegionView*>& foo) const
+{
+       list<RegionView*>::const_iterator i;
+       RegionSortByTrack sorter;
+
+       for (i = _bylayer.begin(); i != _bylayer.end(); ++i) {
+               foo.push_back (*i);
+       }
+
+       foo.sort (sorter);
+       return;
+}
+
+void
+RegionSelection::sort_by_position_and_track ()
+{
+       RegionSortByTrack sorter;
+       sort (sorter);
+}
+
+bool
+RegionSelection::involves (const TimeAxisView& tv) const
+{
+       for (RegionSelection::const_iterator i = begin(); i != end(); ++i) {
+               if (&(*i)->get_trackview() == &tv) {
+                       return true;
+               }
+       }
+       return false;
+}
+