ardour/livetrax
13
0
Fork 0
Code

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

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@4697 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard 2009-02-27 00:59:30 +00:00
parent 60b0022d75
commit 9f77cd9e19
4 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gtk2_ardour/editor_timefx.cc
View File

@ -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)) {

12
libs/ardour/ardour/stretch.h
View File

@ -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>);

2
libs/ardour/rb_effect.cc
View File

@ -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)
{
}

6
libs/ardour/st_stretch.cc
View File

@ -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;