projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add const_cast to avoid compiler warnings from apple gcc
[ardour.git]
/
gtk2_ardour
/
time_fx_dialog.cc
diff --git
a/gtk2_ardour/time_fx_dialog.cc
b/gtk2_ardour/time_fx_dialog.cc
index 18c5203ac6a32ae04f019a8e046d99c54b8d5df5..7efabc93ed7e6a1389dc2930bc9f9e035cb281cb 100644
(file)
--- a/
gtk2_ardour/time_fx_dialog.cc
+++ b/
gtk2_ardour/time_fx_dialog.cc
@@
-36,17
+36,8
@@
#include "audio_region_view.h"
#include "region_selection.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/stretch.h"
-#include "ardour/midi_stretch.h"
-#include "ardour/pitch.h"
-
#ifdef USE_RUBBERBAND
#ifdef USE_RUBBERBAND
-#include
"rubberband/RubberBandStretcher.h"
+#include
<rubberband/RubberBandStretcher.h>
using namespace RubberBand;
#endif
using namespace RubberBand;
#endif
@@
-71,13
+62,12
@@
TimeFXDialog::TimeFXDialog (Editor& e, bool pitch)
, quick_button (_("Quick but Ugly"))
, antialias_button (_("Skip Anti-aliasing"))
, stretch_opts_label (_("Contents:"))
, 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);
, 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_name (N_("TimeFXDialog"));
if (pitching) {
@@
-129,7
+119,7
@@
TimeFXDialog::TimeFXDialog (Editor& e, bool pitch)
table->attach (preserve_formants_button, 1, 3, 3, 4, Gtk::FILL, Gtk::EXPAND, 0, 0);
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);
} else {
@@
-167,7
+157,7
@@
TimeFXDialog::TimeFXDialog (Editor& e, bool pitch)
}
set_default_response (Gtk::RESPONSE_ACCEPT);
}
set_default_response (Gtk::RESPONSE_ACCEPT);
-
+
VBox* progress_box = manage (new VBox);
progress_box->set_spacing (6);
VBox* progress_box = manage (new VBox);
progress_box->set_spacing (6);
@@
-186,11
+176,10
@@
TimeFXDialog::TimeFXDialog (Editor& e, bool pitch)
show_all_children ();
}
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
}
void