#include "audio_region_view.h"
#include "region_selection.h"
-#include "ardour/session.h"
-#include "ardour/region.h"
-#include "ardour/audioplaylist.h"
-#include "ardour/audio_track.h"
-#include "ardour/audioregion.h"
-#include "ardour/stretch.h"
-#include "ardour/midi_stretch.h"
-#include "ardour/pitch.h"
-
#ifdef USE_RUBBERBAND
-#include "rubberband/RubberBandStretcher.h"
+#include <rubberband/RubberBandStretcher.h>
using namespace RubberBand;
#endif
, quick_button (_("Quick but Ugly"))
, antialias_button (_("Skip Anti-aliasing"))
, stretch_opts_label (_("Contents:"))
- , precise_button (_("Strict Linear"))
+ , precise_button (_("Minimize time distortion"))
, preserve_formants_button(_("Preserve Formants"))
{
set_modal (true);
set_skip_taskbar_hint (true);
set_resizable (false);
- set_position (Gtk::WIN_POS_MOUSE);
set_name (N_("TimeFXDialog"));
if (pitching) {
- set_title (_("Pitch Shift"));
+ set_title (_("Pitch Shift Audio"));
} else {
- set_title (_("Time Stretch"));
+ set_title (_("Time Stretch Audio"));
}
cancel_button = add_button (Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
l = manage (new Label (_("Octaves:"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
table->attach (*l, 1, 2, 0, 1, Gtk::FILL, Gtk::EXPAND, 0, 0);
table->attach (pitch_octave_spinner, 2, 3, 0, 1, Gtk::FILL, Gtk::EXPAND & Gtk::FILL, 0, 0);
+ pitch_octave_spinner.set_activates_default ();
l = manage (new Label (_("Semitones:"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
table->attach (*l, 1, 2, 1, 2, Gtk::FILL, Gtk::EXPAND, 0, 0);
table->attach (pitch_semitone_spinner, 2, 3, 1, 2, Gtk::FILL, Gtk::EXPAND & Gtk::FILL, 0, 0);
+ pitch_semitone_spinner.set_activates_default ();
l = manage (new Label (_("Cents:"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
pitch_cent_spinner.set_digits (1);
table->attach (*l, 1, 2, 2, 3, Gtk::FILL, Gtk::EXPAND, 0, 0);
table->attach (pitch_cent_spinner, 2, 3, 2, 3, Gtk::FILL, Gtk::EXPAND & Gtk::FILL, 0, 0);
+ pitch_cent_spinner.set_activates_default ();
table->attach (preserve_formants_button, 1, 3, 3, 4, Gtk::FILL, Gtk::EXPAND, 0, 0);
-
- add_button (_("Shift"), Gtk::RESPONSE_ACCEPT);
+ add_button (S_("Time|Shift"), Gtk::RESPONSE_ACCEPT);
upper_button_box.pack_start (*table, false, true);
} else {
upper_button_box.pack_start (*table, false, true);
}
+ set_default_response (Gtk::RESPONSE_ACCEPT);
+
VBox* progress_box = manage (new VBox);
progress_box->set_spacing (6);
get_vbox()->pack_start (*vbox, false, false);
-
show_all_children ();
}
-gint
-TimeFXDialog::update_progress ()
+void
+TimeFXDialog::update_progress_gui (float p)
{
- progress_bar.set_fraction (request.progress);
- return !request.done;
+ progress_bar.set_fraction (p);
}
void