diff options
| -rw-r--r-- | gtk2_ardour/editor_timefx.cc | 6 | ||||
| -rw-r--r-- | libs/ardour/ardour/stretch.h | 12 | ||||
| -rw-r--r-- | libs/ardour/rb_effect.cc | 2 | ||||
| -rw-r--r-- | libs/ardour/st_stretch.cc | 6 |
4 files changed, 15 insertions, 11 deletions
diff --git a/gtk2_ardour/editor_timefx.cc b/gtk2_ardour/editor_timefx.cc index 1f3221c7cc..7552dfe8f7 100644 --- a/gtk2_ardour/editor_timefx.cc +++ b/gtk2_ardour/editor_timefx.cc @@ -420,7 +420,11 @@ Editor::do_timefx (TimeFXDialog& dialog) if (dialog.pitching) { fx = new Pitch (*session, dialog.request); } else { - fx = new Stretch (*session, dialog.request); +#ifdef USE_RUBBERBAND + fx = new RBStretch (*session, dialog.request); +#else + fx = new STStretch (*session, dialog.request); +#endif } if (fx->run (region)) { diff --git a/libs/ardour/ardour/stretch.h b/libs/ardour/ardour/stretch.h index d0c05ac6d1..0b0de1be57 100644 --- a/libs/ardour/ardour/stretch.h +++ b/libs/ardour/ardour/stretch.h @@ -28,10 +28,10 @@ namespace ARDOUR { -class Stretch : public RBEffect { +class RBStretch : public RBEffect { public: - Stretch (ARDOUR::Session&, TimeFXRequest&); - ~Stretch() {} + RBStretch (ARDOUR::Session&, TimeFXRequest&); + ~RBStretch() {} }; } /* namespace */ @@ -42,10 +42,10 @@ class Stretch : public RBEffect { namespace ARDOUR { -class Stretch : public Filter { +class STStretch : public Filter { public: - Stretch (ARDOUR::Session&, TimeFXRequest&); - ~Stretch (); + STStretch (ARDOUR::Session&, TimeFXRequest&); + ~STStretch (); int run (boost::shared_ptr<ARDOUR::Region>); diff --git a/libs/ardour/rb_effect.cc b/libs/ardour/rb_effect.cc index 3cda2eb706..b61170da09 100644 --- a/libs/ardour/rb_effect.cc +++ b/libs/ardour/rb_effect.cc @@ -42,7 +42,7 @@ Pitch::Pitch (Session& s, TimeFXRequest& req) { } -Stretch::Stretch (Session& s, TimeFXRequest& req) +RBStretch::RBStretch (Session& s, TimeFXRequest& req) : RBEffect (s, req) { } diff --git a/libs/ardour/st_stretch.cc b/libs/ardour/st_stretch.cc index ff46303eee..5adf8ad6d1 100644 --- a/libs/ardour/st_stretch.cc +++ b/libs/ardour/st_stretch.cc @@ -35,7 +35,7 @@ using namespace ARDOUR; using namespace PBD; using namespace soundtouch; -Stretch::Stretch (Session& s, TimeFXRequest& req) +STStretch::STStretch (Session& s, TimeFXRequest& req) : Filter (s) , tsr (req) { @@ -59,12 +59,12 @@ Stretch::Stretch (Session& s, TimeFXRequest& req) tsr.progress = 0.0f; } -Stretch::~Stretch () +STStretch::~STStretch () { } int -Stretch::run (boost::shared_ptr<Region> a_region) +STStretch::run (boost::shared_ptr<Region> a_region) { SourceList nsrcs; nframes_t total_frames; |