From b2cefb3b5354bf0cf487bc018463fc41228a3b20 Mon Sep 17 00:00:00 2001
From: Ariel Elkin <arielelkin@gmail.com>
Date: Sun, 6 Apr 2014 08:24:32 +0100
Subject: [PATCH] TapDelay: fix variable types

---
 include/TapDelay.h | 12 ++++++++----
 src/TapDelay.cpp   |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/include/TapDelay.h b/include/TapDelay.h
index 1ce6010..e816673 100644
--- a/include/TapDelay.h
+++ b/include/TapDelay.h
@@ -166,8 +166,10 @@ inline StkFrames& TapDelay :: tick( StkFrames& frames, unsigned int channel )
 
   StkFloat *iSamples = &frames[channel];
   StkFloat *oSamples = &frames[0];
-  unsigned int j, iHop = frames.channels(), oHop = frames.channels() - outPoint_.size();
-  for ( unsigned int i=0; i<frames.frames(); i++, iSamples += iHop, oSamples += oHop ) {
+  std::size_t j;
+  unsigned int iHop = frames.channels();
+  std::size_t oHop = frames.channels() - outPoint_.size();
+  for ( unsigned long i=0; i<frames.frames(); i++, iSamples += iHop, oSamples += oHop ) {
     inputs_[inPoint_++] = *iSamples * gain_;
     if ( inPoint_ == inputs_.size() ) inPoint_ = 0;
     for ( j=0; j<outPoint_.size(); j++ ) {
@@ -196,8 +198,10 @@ inline StkFrames& TapDelay :: tick( StkFrames& iFrames, StkFrames& oFrames, unsi
 
   StkFloat *iSamples = &iFrames[iChannel];
   StkFloat *oSamples = &oFrames[0];
-  unsigned int j, iHop = iFrames.channels(), oHop = oFrames.channels() - outPoint_.size();
-  for ( unsigned int i=0; i<iFrames.frames(); i++, iSamples += iHop, oSamples += oHop ) {
+  std::size_t j;
+  unsigned int iHop = iFrames.channels();
+  std::size_t oHop = oFrames.channels() - outPoint_.size();
+  for ( unsigned long i=0; i<iFrames.frames(); i++, iSamples += iHop, oSamples += oHop ) {
     inputs_[inPoint_++] = *iSamples * gain_;
     if ( inPoint_ == inputs_.size() ) inPoint_ = 0;
     for ( j=0; j<outPoint_.size(); j++ ) {
diff --git a/src/TapDelay.cpp b/src/TapDelay.cpp
index 9a0396b..f4d52c3 100644
--- a/src/TapDelay.cpp
+++ b/src/TapDelay.cpp
@@ -72,7 +72,7 @@ void TapDelay :: setTapDelays( std::vector<unsigned long> taps )
   if ( taps.size() != outPoint_.size() ) {
     outPoint_.resize( taps.size() );
     delays_.resize( taps.size() );
-    lastFrame_.resize( 1, taps.size(), 0.0 );
+      lastFrame_.resize( 1, (unsigned int)taps.size(), 0.0 );
   }
 
   for ( unsigned int i=0; i<taps.size(); i++ ) {