/*
- Copyright (C) 2000-2009 Paul Davis
+ Copyright (C) 2000-2009 Paul Davis
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include "pbd/pthread_utils.h"
#include "pbd/memento_command.h"
-#include <gtkmm2ext/window_title.h>
#include <gtkmm2ext/utils.h>
#include "editor.h"
#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/audio_diskstream.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
using namespace std;
using namespace ARDOUR;
using namespace PBD;
-using namespace sigc;
using namespace Gtk;
using namespace Gtkmm2ext;
, 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_position (Gtk::WIN_POS_MOUSE);
+ set_skip_taskbar_hint (true);
+ set_resizable (false);
set_name (N_("TimeFXDialog"));
- WindowTitle title(Glib::get_application_name());
if (pitching) {
- title += _("Pitch Shift");
+ set_title (_("Pitch Shift Audio"));
} else {
- title += _("Time Stretch");
+ set_title (_("Time Stretch Audio"));
}
- set_title(title.get_string());
- cancel_button = add_button (_("Cancel"), Gtk::RESPONSE_CANCEL);
+ cancel_button = add_button (Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
- get_vbox()->set_spacing (5);
- get_vbox()->set_border_width (12);
+ VBox* vbox = manage (new VBox);
+ Gtk::Label* l;
- if (pitching) {
+ get_vbox()->set_spacing (4);
- upper_button_box.set_spacing (5);
- upper_button_box.set_border_width (5);
-
- Gtk::Label* l;
+ vbox->set_spacing (18);
+ vbox->set_border_width (5);
- l = manage (new Label (_("Octaves")));
- upper_button_box.pack_start (*l, false, false);
- upper_button_box.pack_start (pitch_octave_spinner, false, false);
+ upper_button_box.set_spacing (6);
- l = manage (new Label (_("Semitones (12TET)")));
- upper_button_box.pack_start (*l, false, false);
- upper_button_box.pack_start (pitch_semitone_spinner, false, false);
+ l = manage (new Label (_("<b>Options</b>"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false ));
+ l->set_use_markup ();
- l = manage (new Label (_("Cents")));
- upper_button_box.pack_start (*l, false, false);
- upper_button_box.pack_start (pitch_cent_spinner, false, false);
+ upper_button_box.pack_start (*l, false, false);
+ if (pitching) {
+ Table* table = manage (new Table (4, 3, false));
+ table->set_row_spacings (6);
+ table->set_col_spacing (1, 6);
+ l = manage (new Label ("", Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false )); //Common gnome way for padding
+ l->set_padding (8, 0);
+ table->attach (*l, 0, 1, 0, 4, Gtk::FILL, Gtk::FILL, 0, 0);
+
+ 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 ();
- upper_button_box.pack_start (preserve_formants_button, false, false);
-
-
- add_button (_("Shift"), Gtk::RESPONSE_ACCEPT);
+ table->attach (preserve_formants_button, 1, 3, 3, 4, Gtk::FILL, Gtk::EXPAND, 0, 0);
- get_vbox()->pack_start (upper_button_box, false, false);
+ add_button (S_("Time|Shift"), Gtk::RESPONSE_ACCEPT);
+ upper_button_box.pack_start (*table, false, true);
} else {
+ Table* table = manage (new Table (2, 3, false));
+ table->set_row_spacings (6);
+ table->set_col_spacing (1, 6);
+ l = manage (new Label ("", Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false ));
+ l->set_padding (8, 0);
+ table->attach (*l, 0, 1, 0, 2, Gtk::FILL, Gtk::FILL, 0, 0);
#ifdef USE_RUBBERBAND
- opts_box.set_spacing (5);
- opts_box.set_border_width (5);
vector<string> strings;
+ table->attach (stretch_opts_label, 1, 2, 0, 1, Gtk::FILL, Gtk::EXPAND, 0, 0);
+
set_popdown_strings (stretch_opts_selector, editor.rb_opt_strings);
/* set default */
- stretch_opts_selector.set_active_text (editor.rb_opt_strings[4]);
-
- opts_box.pack_start (precise_button, false, false);
- opts_box.pack_start (stretch_opts_label, false, false);
- opts_box.pack_start (stretch_opts_selector, false, false);
+ stretch_opts_selector.set_active_text (editor.rb_opt_strings[editor.rb_current_opt]);
+ table->attach (stretch_opts_selector, 2, 3, 0, 1, Gtk::FILL, Gtk::EXPAND & Gtk::FILL, 0, 0);
- get_vbox()->pack_start (opts_box, false, false);
+ table->attach (precise_button, 1, 3, 1, 2, Gtk::FILL, Gtk::EXPAND, 0, 0);
#else
- upper_button_box.set_homogeneous (true);
- upper_button_box.set_spacing (5);
- upper_button_box.set_border_width (5);
-
- upper_button_box.pack_start (quick_button, true, true);
- upper_button_box.pack_start (antialias_button, true, true);
-
quick_button.set_name (N_("TimeFXButton"));
+ table->attach (quick_button, 1, 3, 0, 1, Gtk::FILL, Gtk::EXPAND, 0, 0);
+
antialias_button.set_name (N_("TimeFXButton"));
+ table->attach (antialias_button, 1, 3, 1, 2, Gtk::FILL, Gtk::EXPAND, 0, 0);
- get_vbox()->pack_start (upper_button_box, false, false);
+#endif
-#endif
add_button (_("Stretch/Shrink"), Gtk::RESPONSE_ACCEPT);
+
+ upper_button_box.pack_start (*table, false, true);
}
- get_vbox()->pack_start (progress_bar);
+ set_default_response (Gtk::RESPONSE_ACCEPT);
+
+ VBox* progress_box = manage (new VBox);
+ progress_box->set_spacing (6);
+
+ l = manage (new Label (_("<b>Progress</b>"), Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
+ l->set_use_markup ();
+
+ progress_box->pack_start (*l, false, false);
+ progress_box->pack_start (progress_bar, false, true);
- progress_bar.set_name (N_("TimeFXProgress"));
+
+ vbox->pack_start (upper_button_box, false, true);
+ vbox->pack_start (*progress_box, false, true);
+
+ 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
}
gint
-TimeFXDialog::delete_in_progress (GdkEventAny* ev)
+TimeFXDialog::delete_in_progress (GdkEventAny*)
{
status = -2;
request.cancel = true;
projects / ardour.git / blobdiff