Merge libs/ardour and gtk2_ardour with 2.0-ongoing R2837.

git-svn-id: svn://localhost/ardour2/trunk@2883 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 24 insertions, 9 deletions

diff --git a/libs/ardour/ardour/stretch.h b/libs/ardour/ardour/stretch.h
index 4d00c9b17b..020d03270d 100644
--- a/libs/ardour/ardour/stretch.h
+++ b/libs/ardour/ardour/stretch.h
@@ -21,31 +21,46 @@
 #define __ardour_stretch_h__
 
 #include <ardour/filter.h>
-#include <soundtouch/SoundTouch.h>
 
 namespace ARDOUR {
+	class AudioRegion;
+}
+
+#ifdef USE_RUBBERBAND
 
-class AudioRegion;
+#include <ardour/rb_effect.h>
+
+namespace ARDOUR {
 
-struct TimeStretchRequest : public InterThreadInfo {
-    float                fraction;   
-    bool                 quick_seek; 
-    bool                 antialias;  
+class Stretch : public RBEffect {
+  public:
+	Stretch (ARDOUR::Session&, TimeFXRequest&);
+	~Stretch() {}
 };
 
+} /* namespace */
+
+#else
+
+#include <soundtouch/SoundTouch.h>
+
+namespace ARDOUR {
+
 class Stretch : public Filter {
   public:
-	Stretch (ARDOUR::Session&, TimeStretchRequest&);
+	Stretch (ARDOUR::Session&, TimeFXRequest&);
 	~Stretch ();
 
 	int run (boost::shared_ptr<ARDOUR::Region>);
 
   private:
-	TimeStretchRequest& tsr;
-	soundtouch::SoundTouch st;
+	TimeFXRequest& tsr;
 
+	soundtouch::SoundTouch st;
 };
 
 } /* namespace */
 
+#endif
+
 #endif /* __ardour_stretch_h__ */