From 417309d6d40e486e7a4757715b67780617a9c248 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <carl@carlh.net>
Date: Tue, 23 Jun 2009 10:40:48 +0000
Subject: Fix some warnings.

git-svn-id: svn://localhost/ardour2/branches/3.0@5259 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 libs/ardour/ardour/interpolation.h |  1 -
 libs/ardour/interpolation.cc       | 10 +++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'libs/ardour')

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 {
-- 
cgit v1.2.3