ardour/livetrax
13
0
Fork 0
Code

Remove unnecessary dialog argument to do_timefx; use current_timefx instead.

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@11403 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2012-01-31 21:24:23 +00:00
parent 44283453bc
commit cf73ffdfe2
2 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gtk2_ardour/editor.h
View File

@ -1823,12 +1823,9 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
*/ */
bool mouse_frame (framepos_t&, bool& in_track_canvas) const; bool mouse_frame (framepos_t&, bool& in_track_canvas) const;
/* "whats mine is yours" */
TimeFXDialog* current_timefx; TimeFXDialog* current_timefx;
static void* timefx_thread (void *arg); static void* timefx_thread (void *arg);
void do_timefx (TimeFXDialog&); void do_timefx ();
int time_stretch (RegionSelection&, float fraction); int time_stretch (RegionSelection&, float fraction);
int pitch_shift (RegionSelection&, float cents); int pitch_shift (RegionSelection&, float cents);

32
gtk2_ardour/editor_timefx.cc
View File

@ -157,7 +157,7 @@ Editor::time_fx (RegionList& regions, float val, bool pitching)
if (i == regions.end ()) { if (i == regions.end ()) {
/* No audio regions; we can just do the timefx without a dialogue */ /* No audio regions; we can just do the timefx without a dialogue */
do_timefx (*current_timefx); do_timefx ();
return 0; return 0;
} }
@ -315,15 +315,15 @@ Editor::time_fx (RegionList& regions, float val, bool pitching)
} }
void void
Editor::do_timefx (TimeFXDialog& dialog) Editor::do_timefx ()
{ {
boost::shared_ptr<Playlist> playlist; boost::shared_ptr<Playlist> playlist;
boost::shared_ptr<Region> new_region; boost::shared_ptr<Region> new_region;
set<boost::shared_ptr<Playlist> > playlists_affected; 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(); boost::shared_ptr<Playlist> playlist = (*i)->playlist();
if (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); boost::shared_ptr<AudioRegion> region = boost::dynamic_pointer_cast<AudioRegion> (*i);
@ -339,30 +339,30 @@ Editor::do_timefx (TimeFXDialog& dialog)
continue; continue;
} }
if (dialog.request.cancel) { if (current_timefx->request.cancel) {
/* we were cancelled */ /* we were cancelled */
/* XXX what to do about playlists already affected ? */ /* XXX what to do about playlists already affected ? */
dialog.status = 1; current_timefx->status = 1;
return; return;
} }
Filter* fx; Filter* fx;
if (dialog.pitching) { if (current_timefx->pitching) {
fx = new Pitch (*_session, dialog.request); fx = new Pitch (*_session, current_timefx->request);
} else { } else {
#ifdef USE_RUBBERBAND #ifdef USE_RUBBERBAND
fx = new RBStretch (*_session, dialog.request); fx = new RBStretch (*_session, current_timefx->request);
#else #else
fx = new STStretch (*_session, dialog.request); fx = new STStretch (*_session, current_timefx->request);
#endif #endif
} }
current_timefx->descend (1.0 / N); current_timefx->descend (1.0 / N);
if (fx->run (region, current_timefx)) { if (fx->run (region, current_timefx)) {
dialog.status = -1; current_timefx->status = -1;
dialog.request.done = true; current_timefx->request.done = true;
delete fx; delete fx;
return; return;
} }
@ -382,8 +382,8 @@ Editor::do_timefx (TimeFXDialog& dialog)
_session->add_command (new StatefulDiffCommand (*p)); _session->add_command (new StatefulDiffCommand (*p));
} }
dialog.status = 0; current_timefx->status = 0;
dialog.request.done = true; current_timefx->request.done = true;
} }
void* void*
@ -395,7 +395,7 @@ Editor::timefx_thread (void *arg)
pthread_setcanceltype (PTHREAD_CANCEL_ASYNCHRONOUS, 0); 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 /* 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 event loop doesn't die before any changes we made are processed