summaryrefslogtreecommitdiff
path: root/libs/ardour
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2009-06-23 10:40:48 +0000
committerCarl Hetherington <carl@carlh.net>2009-06-23 10:40:48 +0000
commit417309d6d40e486e7a4757715b67780617a9c248 (patch)
treeeb5bfcfa917813ae903b2386dc7492e0b3a92593 /libs/ardour
parentdd84d5312e2b09538aa98a1b21e84a458a2c145c (diff)
Fix some warnings.
git-svn-id: svn://localhost/ardour2/branches/3.0@5259 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour')
-rw-r--r--libs/ardour/ardour/interpolation.h1
-rw-r--r--libs/ardour/interpolation.cc10
2 files changed, 5 insertions, 6 deletions
diff --git a/libs/ardour/ardour/interpolation.h b/libs/ardour/ardour/interpolation.h
index deb0204794..a2945ffc2b 100644
--- a/libs/ardour/ardour/interpolation.h
+++ b/libs/ardour/ardour/interpolation.h
@@ -24,7 +24,6 @@ class Interpolation {
void add_channel_to (int input_buffer_size, int output_buffer_size) {}
void remove_channel_from () {}
- nframes_t interpolate (int channel, nframes_t nframes, Sample* input, Sample* output) {}
void reset () {}
};
diff --git a/libs/ardour/interpolation.cc b/libs/ardour/interpolation.cc
index 9b2ff03e23..d7f1c835df 100644
--- a/libs/ardour/interpolation.cc
+++ b/libs/ardour/interpolation.cc
@@ -63,7 +63,7 @@ FixedPointLinearInterpolation::remove_channel_from ()
void
FixedPointLinearInterpolation::reset()
{
- for(int i = 0; i <= last_phase.size(); i++) {
+ for (size_t i = 0; i <= last_phase.size(); i++) {
last_phase[i] = 0;
}
}
@@ -131,7 +131,7 @@ LinearInterpolation::remove_channel_from ()
void
LinearInterpolation::reset()
{
- for(int i = 0; i <= phase.size(); i++) {
+ for (size_t i = 0; i <= phase.size(); i++) {
phase[i] = 0.0;
}
}
@@ -143,7 +143,7 @@ LibSamplerateInterpolation::LibSamplerateInterpolation() : state (0)
LibSamplerateInterpolation::~LibSamplerateInterpolation()
{
- for (int i = 0; i < state.size(); i++) {
+ for (size_t i = 0; i < state.size(); i++) {
state[i] = src_delete (state[i]);
}
}
@@ -152,7 +152,7 @@ void
LibSamplerateInterpolation::set_speed (double new_speed)
{
_speed = new_speed;
- for (int i = 0; i < state.size(); i++) {
+ for (size_t i = 0; i < state.size(); i++) {
src_set_ratio (state[i], 1.0/_speed);
}
}
@@ -161,7 +161,7 @@ void
LibSamplerateInterpolation::reset_state ()
{
printf("INTERPOLATION: reset_state()\n");
- for (int i = 0; i < state.size(); i++) {
+ for (size_t i = 0; i < state.size(); i++) {
if (state[i]) {
src_reset (state[i]);
} else {