From ce076784a47d6322282763a69ace368db4ba735a Mon Sep 17 00:00:00 2001
From: Ariel Elkin <arielelkin@gmail.com>
Date: Sun, 6 Apr 2014 08:33:25 +0100
Subject: [PATCH 1/2] Fix variable types in Granulate

---
 src/Granulate.cpp | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/Granulate.cpp b/src/Granulate.cpp
index f15515c..cce2dc5 100644
--- a/src/Granulate.cpp
+++ b/src/Granulate.cpp
@@ -106,10 +106,11 @@ void Granulate :: reset( void )
   gPointer_ = 0;
 
   // Reset grain parameters.
-  unsigned int count, nVoices = grains_.size();
+  std::vector<Grain>::size_type count;
+  std::vector<Grain>::size_type nVoices = (unsigned int)grains_.size();
   for ( unsigned int i=0; i<grains_.size(); i++ ) {
     grains_[i].repeats = 0;
-    count = (unsigned int ) ( i * gDuration_ * 0.001 * Stk::sampleRate() / nVoices );
+    count = ( i * gDuration_ * 0.001 * Stk::sampleRate() / nVoices );
     grains_[i].counter = count;
     grains_[i].state = GRAIN_STOPPED;
   }
@@ -126,14 +127,14 @@ void Granulate :: setVoices( unsigned int nVoices )
   handleError( message.str(), StkError::DEBUG_PRINT );
 #endif
 
-  unsigned int oldSize = grains_.size();
+  std::vector<Grain>::size_type oldSize = grains_.size();
   grains_.resize( nVoices );
 
   // Initialize new grain voices.
-  unsigned int count;
-  for ( unsigned int i=oldSize; i<nVoices; i++ ) {
+  std::vector<Grain>::size_type count;
+  for ( std::vector<Grain>::size_type i=oldSize; i<nVoices; i++ ) {
     grains_[i].repeats = 0;
-    count = (unsigned int ) ( i * gDuration_ * 0.001 * Stk::sampleRate() / nVoices );
+    count = ( i * gDuration_ * 0.001 * Stk::sampleRate() / nVoices );
     grains_[i].counter = count;
     grains_[i].pointer = gPointer_;
     grains_[i].state = GRAIN_STOPPED;
@@ -163,7 +164,7 @@ void Granulate :: calculateGrain( Granulate::Grain& grain )
   // Calculate duration and envelope parameters.
   StkFloat seconds = gDuration_ * 0.001;
   seconds += ( seconds * gRandomFactor_ * noise.tick() );
-  unsigned int count = (unsigned long) ( seconds * Stk::sampleRate() );
+  unsigned long count = (unsigned long) ( seconds * Stk::sampleRate() );
   grain.attackCount = (unsigned int) ( gRampPercent_ * 0.005 * count );
   grain.decayCount = grain.attackCount;
   grain.sustainCount = count - 2 * grain.attackCount;

From 7388163b7cf18e23902fb90f1d988658971f09ef Mon Sep 17 00:00:00 2001
From: Ariel Elkin <arielelkin@gmail.com>
Date: Fri, 11 Apr 2014 23:47:51 +0200
Subject: [PATCH 2/2] Granulate.cpp: change variable types from
 std::vector<Grain>::size_type to size_t

---
 src/Granulate.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Granulate.cpp b/src/Granulate.cpp
index cce2dc5..a654159 100644
--- a/src/Granulate.cpp
+++ b/src/Granulate.cpp
@@ -106,8 +106,8 @@ void Granulate :: reset( void )
   gPointer_ = 0;
 
   // Reset grain parameters.
-  std::vector<Grain>::size_type count;
-  std::vector<Grain>::size_type nVoices = (unsigned int)grains_.size();
+  size_t count;
+  size_t nVoices = (unsigned int)grains_.size();
   for ( unsigned int i=0; i<grains_.size(); i++ ) {
     grains_[i].repeats = 0;
     count = ( i * gDuration_ * 0.001 * Stk::sampleRate() / nVoices );
@@ -127,12 +127,12 @@ void Granulate :: setVoices( unsigned int nVoices )
   handleError( message.str(), StkError::DEBUG_PRINT );
 #endif
 
-  std::vector<Grain>::size_type oldSize = grains_.size();
+  size_t oldSize = grains_.size();
   grains_.resize( nVoices );
 
   // Initialize new grain voices.
-  std::vector<Grain>::size_type count;
-  for ( std::vector<Grain>::size_type i=oldSize; i<nVoices; i++ ) {
+  size_t count;
+  for ( size_t i=oldSize; i<nVoices; i++ ) {
     grains_[i].repeats = 0;
     count = ( i * gDuration_ * 0.001 * Stk::sampleRate() / nVoices );
     grains_[i].counter = count;