diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2008-01-10 14:40:42 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-01-10 14:40:42 +0000 |
| commit | aa45017cdca5d2429f503c660dad41f486a4fa05 (patch) | |
| tree | caea20362b23d3c82b99075d367873d8e1db7ea2 /gtk2_ardour/editor_timefx.cc | |
| parent | ea98e56b1ce5341875bea765e7d72cf50a5203ce (diff) | |
finish merge of vamp-sdk into source tree; write OSC URL to file in ~/.ardour2 ; change stretch button name; fix bad handling of cancel-in-progress during stretch/pitch operation
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2870 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_timefx.cc')
| -rw-r--r-- | gtk2_ardour/editor_timefx.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk2_ardour/editor_timefx.cc b/gtk2_ardour/editor_timefx.cc index d00c7a1e05..5b2b750746 100644 --- a/gtk2_ardour/editor_timefx.cc +++ b/gtk2_ardour/editor_timefx.cc @@ -71,7 +71,7 @@ Editor::TimeFXDialog::TimeFXDialog (Editor& e, bool pitch) quick_button (_("Quick but Ugly")), antialias_button (_("Skip Anti-aliasing")), stretch_opts_label (_("Contents:")), - precise_button (_("Correct Onset")) + precise_button (_("Strict Linear")) { set_modal (true); set_position (Gtk::WIN_POS_MOUSE); @@ -332,7 +332,7 @@ Editor::time_fx (RegionSelection& regions, float val, bool pitching) sigc::connection c = Glib::signal_timeout().connect (mem_fun (current_timefx, &TimeFXDialog::update_progress), 100); - while (!current_timefx->request.done) { + while (!current_timefx->request.done && !current_timefx->request.cancel) { gtk_main_iteration (); } |