diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2005-11-27 21:17:41 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2005-11-27 21:17:41 +0000 |
| commit | 1f16781c75205b43ac193596d1449de343693a6f (patch) | |
| tree | 68f8f9ddd2b7dbe57b0ac2e2caa6fe6e8b9ba96c /gtk2_ardour/editor_timefx.cc | |
| parent | aaa44a37aaf585b9bcd9268a9551a005e6269bdb (diff) | |
slowly fixing up ArdourDialog nonsense
git-svn-id: svn://localhost/trunk/ardour2@132 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_timefx.cc')
| -rw-r--r-- | gtk2_ardour/editor_timefx.cc | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/gtk2_ardour/editor_timefx.cc b/gtk2_ardour/editor_timefx.cc index 805c4e0b1d..aba6a13011 100644 --- a/gtk2_ardour/editor_timefx.cc +++ b/gtk2_ardour/editor_timefx.cc @@ -57,8 +57,6 @@ Editor::TimeStretchDialog::TimeStretchDialog (Editor& e) set_title (_("ardour: timestretch")); set_name (N_("TimeStretchDialog")); - set_hide_on_stop (false); - add (packer); packer.set_spacing (5); @@ -85,7 +83,8 @@ Editor::TimeStretchDialog::TimeStretchDialog (Editor& e) antialias_button.set_name (N_("TimeStretchButton")); progress_bar.set_name (N_("TimeStretchProgress")); - action_button.signal_clicked().connect (bind (mem_fun(*this, &ArdourDialog::stop), 1)); + // GTK2FIX + // action_button.signal_clicked().connect (bind (mem_fun(*this, &ArdourDialog::stop), 1)); } gint @@ -120,16 +119,16 @@ Editor::run_timestretch (AudioRegionSelection& regions, float fraction) } current_timestretch->progress_bar.set_fraction (0.0f); - current_timestretch->first_cancel = current_timestretch->cancel_button.signal_clicked().connect (bind (mem_fun (*current_timestretch, &ArdourDialog::stop), -1)); // GTK2FIX + // current_timestretch->first_cancel = current_timestretch->cancel_button.signal_clicked().connect (bind (mem_fun (*current_timestretch, &ArdourDialog::stop), -1)); // current_timestretch->first_delete = current_timestretch->signal_delete_event().connect (mem_fun (*current_timestretch, &ArdourDialog::wm_close_event)); - current_timestretch->run (); - - if (current_timestretch->run_status() != 1) { - // GTK2FIX - // current_timestretch->close (); - return 1; /* no error, but we did nothing */ + switch (current_timestretch->run ()) { + case RESPONSE_ACCEPT: + break; + default: + current_timestretch->hide (); + return 1; } current_timestretch->status = 0; @@ -165,8 +164,7 @@ Editor::run_timestretch (AudioRegionSelection& regions, float fraction) c.disconnect (); - // GTK2FIX - // current_timestretch->close (); + current_timestretch->hide (); return current_timestretch->status; } |