r228@gwythaint (orig r768): fugalh | 2006-08-09 08:14:55 -0600

[ardour.git] / gtk2_ardour / editor_timefx.cc

diff --git a/gtk2_ardour/editor_timefx.cc b/gtk2_ardour/editor_timefx.cc
index ecb2f5ba4bf7f165d005c8d04c63d9e0965048bd..3fe0023d07701cc326c5d769f1ef5757674ae275 100644 (file)
--- a/gtk2_ardour/editor_timefx.cc
+++ b/gtk2_ardour/editor_timefx.cc
@@ -25,10 +25,11 @@
 
 #include <pbd/error.h>
 #include <pbd/pthread_utils.h>
+#include <pbd/memento_command.h>
 
 #include "editor.h"
 #include "audio_time_axis.h"
-#include "regionview.h"
+#include "audio_region_view.h"
 #include "region_selection.h"
 
 #include <ardour/session.h>
@@ -41,6 +42,7 @@
 #include "i18n.h"
 
 using namespace ARDOUR;
+using namespace PBD;
 using namespace sigc;
 using namespace Gtk;
 
@@ -99,7 +101,7 @@ Editor::TimeStretchDialog::delete_timestretch_in_progress (GdkEventAny* ev)
 }
 
 int
-Editor::run_timestretch (AudioRegionSelection& regions, float fraction)
+Editor::run_timestretch (RegionSelection& regions, float fraction)
 {
        pthread_t thread;
 
@@ -156,39 +158,42 @@ Editor::run_timestretch (AudioRegionSelection& regions, float fraction)
 void
 Editor::do_timestretch (TimeStretchDialog& dialog)
 {
-       AudioTrack* at;
+       Track*    t;
        Playlist* playlist;
-       AudioRegion* new_region;
+       Region*   new_region;
 
 
-       for (AudioRegionSelection::iterator i = dialog.regions.begin(); i != dialog.regions.end(); ) {
+       for (RegionSelection::iterator i = dialog.regions.begin(); i != dialog.regions.end(); ) {
+               AudioRegionView* arv = dynamic_cast<AudioRegionView*>(*i);
+               if (!arv)
+                       continue;
 
-               AudioRegion& aregion ((*i)->region);
-               TimeAxisView* tv = &(*i)->get_time_axis_view();
-               AudioTimeAxisView* atv;
-               AudioRegionSelection::iterator tmp;
+               AudioRegion& region (arv->audio_region());
+               TimeAxisView* tv = &(arv->get_time_axis_view());
+               RouteTimeAxisView* rtv;
+               RegionSelection::iterator tmp;
                
-               cerr << "stretch " << aregion.name() << endl;
+               cerr << "stretch " << region.name() << endl;
 
                tmp = i;
                ++tmp;
 
-               if ((atv = dynamic_cast<AudioTimeAxisView*> (tv)) == 0) {
+               if ((rtv = dynamic_cast<RouteTimeAxisView*> (tv)) == 0) {
                        i = tmp;
                        continue;
                }
 
-               if ((at = dynamic_cast<AudioTrack*> (&atv->route())) == 0) {
+               if ((t = dynamic_cast<Track*> (rtv->route().get())) == 0) {
                        i = tmp;
                        continue;
                }
        
-               if ((playlist = at->disk_stream().playlist()) == 0) {
+               if ((playlist = t->diskstream().playlist()) == 0) {
                        i = tmp;
                        continue;
                }
 
-               dialog.request.region = &aregion;
+               dialog.request.region = &region;
 
                if (!dialog.request.running) {
                        /* we were cancelled */
@@ -202,9 +207,10 @@ Editor::do_timestretch (TimeStretchDialog& dialog)
                        return;
                }
 
-               session->add_undo (playlist->get_memento());
-               playlist->replace_region (aregion, *new_region, aregion.position());
-               session->add_redo_no_execute (playlist->get_memento());
+               XMLNode &before = playlist->get_state();
+               playlist->replace_region (region, *new_region, region.position());
+               XMLNode &after = playlist->get_state();
+               session->add_command (new MementoCommand<Playlist>(*playlist, before, after));
 
                i = tmp;
        }