Remove unnecessary dialog argument to do_timefx; use current_timefx instead.

git-svn-id: svn://localhost/ardour2/branches/3.0@11403 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index 7c681cfaf3250dc0b277fa8b47ab62fa76981da7..e0cbf8351706525246e5053edef6d349ae4a269a 100644 (file)
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -1823,12 +1823,9 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
         */
        bool mouse_frame (framepos_t&, bool& in_track_canvas) const;
 
-       /* "whats mine is yours" */
-
        TimeFXDialog* current_timefx;
-
        static void* timefx_thread (void *arg);
-       void do_timefx (TimeFXDialog&);
+       void do_timefx ();
 
        int time_stretch (RegionSelection&, float fraction);
        int pitch_shift (RegionSelection&, float cents);

diff --git a/gtk2_ardour/editor_timefx.cc b/gtk2_ardour/editor_timefx.cc
index 0b400f933ba9fe6f50fa9dc2339ded5a92b94b21..34c974e102c1b8407eb9ed80b1dde12df4bcccab 100644 (file)
--- a/gtk2_ardour/editor_timefx.cc
+++ b/gtk2_ardour/editor_timefx.cc
@@ -157,7 +157,7 @@ Editor::time_fx (RegionList& regions, float val, bool pitching)
 
        if (i == regions.end ()) {
                /* No audio regions; we can just do the timefx without a dialogue */
-               do_timefx (*current_timefx);
+               do_timefx ();
                return 0;
        }
        
@@ -315,15 +315,15 @@ Editor::time_fx (RegionList& regions, float val, bool pitching)
 }
 
 void
-Editor::do_timefx (TimeFXDialog& dialog)
+Editor::do_timefx ()
 {
        boost::shared_ptr<Playlist> playlist;
        boost::shared_ptr<Region>   new_region;
        set<boost::shared_ptr<Playlist> > playlists_affected;
 
-       uint32_t const N = dialog.regions.size ();
+       uint32_t const N = current_timefx->regions.size ();
 
-       for (RegionList::iterator i = dialog.regions.begin(); i != dialog.regions.end(); ++i) {
+       for (RegionList::iterator i = current_timefx->regions.begin(); i != current_timefx->regions.end(); ++i) {
                boost::shared_ptr<Playlist> playlist = (*i)->playlist();
 
                if (playlist) {
@@ -331,7 +331,7 @@ Editor::do_timefx (TimeFXDialog& dialog)
                }
        }
 
-       for (RegionList::iterator i = dialog.regions.begin(); i != dialog.regions.end(); ++i) {
+       for (RegionList::iterator i = current_timefx->regions.begin(); i != current_timefx->regions.end(); ++i) {
 
                boost::shared_ptr<AudioRegion> region = boost::dynamic_pointer_cast<AudioRegion> (*i);
 
@@ -339,30 +339,30 @@ Editor::do_timefx (TimeFXDialog& dialog)
                        continue;
                }
 
-               if (dialog.request.cancel) {
+               if (current_timefx->request.cancel) {
                        /* we were cancelled */
                        /* XXX what to do about playlists already affected ? */
-                       dialog.status = 1;
+                       current_timefx->status = 1;
                        return;
                }
 
                Filter* fx;
 
-               if (dialog.pitching) {
-                       fx = new Pitch (*_session, dialog.request);
+               if (current_timefx->pitching) {
+                       fx = new Pitch (*_session, current_timefx->request);
                } else {
 #ifdef USE_RUBBERBAND
-                       fx = new RBStretch (*_session, dialog.request);
+                       fx = new RBStretch (*_session, current_timefx->request);
 #else
-                       fx = new STStretch (*_session, dialog.request);
+                       fx = new STStretch (*_session, current_timefx->request);
 #endif
                }
 
                current_timefx->descend (1.0 / N);
 
                if (fx->run (region, current_timefx)) {
-                       dialog.status = -1;
-                       dialog.request.done = true;
+                       current_timefx->status = -1;
+                       current_timefx->request.done = true;
                        delete fx;
                        return;
                }
@@ -382,8 +382,8 @@ Editor::do_timefx (TimeFXDialog& dialog)
                _session->add_command (new StatefulDiffCommand (*p));
        }
 
-       dialog.status = 0;
-       dialog.request.done = true;
+       current_timefx->status = 0;
+       current_timefx->request.done = true;
 }
 
 void*
@@ -395,7 +395,7 @@ Editor::timefx_thread (void *arg)
 
        pthread_setcanceltype (PTHREAD_CANCEL_ASYNCHRONOUS, 0);
 
-       tsd->editor.do_timefx (*tsd);
+       tsd->editor.do_timefx ();
 
         /* GACK! HACK! sleep for a bit so that our request buffer for the GUI
            event loop doesn't die before any changes we made are processed