summaryrefslogtreecommitdiff
path: root/libs/ardour/ardour
diff options
context:
space:
mode:
authorHans Baier <hansfbaier@googlemail.com>2009-06-23 09:50:17 +0000
committerHans Baier <hansfbaier@googlemail.com>2009-06-23 09:50:17 +0000
commit47e56905523cb9269a19300d2b468118dda3a161 (patch)
tree4bf586a28b11c98ba2bc55a09b416e1a3f87516f /libs/ardour/ardour
parent875568f01ff65f405f4246405dc48b166ed70138 (diff)
Interpolation -> LibSamplerateInterpolation, keep state per channel
git-svn-id: svn://localhost/ardour2/branches/3.0@5257 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour')
-rw-r--r--libs/ardour/ardour/audio_diskstream.h2
-rw-r--r--libs/ardour/ardour/interpolation.h10
-rw-r--r--libs/ardour/ardour/session.h8
3 files changed, 10 insertions, 10 deletions
diff --git a/libs/ardour/ardour/audio_diskstream.h b/libs/ardour/ardour/audio_diskstream.h
index ad3b1adde2..55cb747a4c 100644
--- a/libs/ardour/ardour/audio_diskstream.h
+++ b/libs/ardour/ardour/audio_diskstream.h
@@ -146,7 +146,7 @@ class AudioDiskstream : public Diskstream
}
}
- Interpolation interpolation;
+ LibSamplerateInterpolation interpolation;
XMLNode* deprecated_io_node;
diff --git a/libs/ardour/ardour/interpolation.h b/libs/ardour/ardour/interpolation.h
index d0ba3c48bc..cec951c841 100644
--- a/libs/ardour/ardour/interpolation.h
+++ b/libs/ardour/ardour/interpolation.h
@@ -8,20 +8,20 @@
namespace ARDOUR {
-class Interpolation {
+class LibSamplerateInterpolation {
protected:
double _speed;
- SRC_STATE* state;
- std::vector<SRC_DATA> data;
+ std::vector<SRC_STATE*> state;
+ std::vector<SRC_DATA*> data;
int error;
void reset_state ();
public:
- Interpolation ();
- ~Interpolation ();
+ LibSamplerateInterpolation ();
+ ~LibSamplerateInterpolation ();
void set_speed (double new_speed);
void set_target_speed (double new_speed) {}
diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index 5c2c32655f..8b291dd75b 100644
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -1008,10 +1008,10 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
bool _silent;
// varispeed playback
- volatile double _transport_speed;
- double _last_transport_speed;
- double _target_transport_speed;
- Interpolation interpolation;
+ volatile double _transport_speed;
+ double _last_transport_speed;
+ double _target_transport_speed;
+ LibSamplerateInterpolation interpolation;
bool auto_play_legal;
nframes_t _last_slave_transport_frame;