Step towards having both rubberband and soundtouch compiled in at once.

git-svn-id: svn://localhost/ardour2/branches/3.0@4697 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/editor_timefx.cc b/gtk2_ardour/editor_timefx.cc
index 1f3221c7cc6119859544a604804fe65cc6fbe9b3..7552dfe8f7bdd5d5102cd6468f0b52a51dcc82dd 100644 (file)
--- 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 d0c05ac6d119a5107e2d932e407ec88aa38316c3..0b0de1be574c8df6d5fafd0729ee46a657bd579c 100644 (file)
--- 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 3cda2eb7064189ce319b57dd3ec34143b466946d..b61170da096b48c734e2783d287de6c22c0f6f72 100644 (file)
--- 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 ff46303eeeba5d30d4d65a076d4ce8dcace891ee..5adf8ad6d1fe2c4315ecfd4511da8f05778f2c9a 100644 (file)
--- 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;