Fixed some implicit conversions

Fixed some implicit conversions from long long int to int
passivist · Feb 10, 2017 · cd4ade6 · cd4ade6
1 parent 3a7d48d
commit cd4ade6
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/...project.xcworkspace/xcuserdata/raffaelseyfried.xcuserdatad/UserInterfaceState.xcuserstate b/...project.xcworkspace/xcuserdata/raffaelseyfried.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/...LRR.xcodeproj/xcuserdata/raffaelseyfried.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/...LRR.xcodeproj/xcuserdata/raffaelseyfried.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -15,7 +15,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "132"
             endingLineNumber = "132"
-            landmarkName = "process (AudioSampleBuffer&amp; currentBlock, AudioSampleBuffer&amp; fileBuffer, int numChannels, int blockNumSamples, int fileNumSamples, int time)"
+            landmarkName = "process (AudioSampleBuffer&amp; currentBlock, AudioSampleBuffer&amp; fileBuffer, int numChannels, int blockNumSamples, int fileNumSamples, long long int time)"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>

diff --git a/Builds/MacOSX/build/Debug/libGRRNLRR.a b/Builds/MacOSX/build/Debug/libGRRNLRR.a
diff --git a/Source/Grain.h b/Source/Grain.h
@@ -14,7 +14,7 @@
 class Grain
 {
 public:
-    const int onset;
+    const long long int onset;
     const int length;
     const int startPosition;
 
@@ -26,7 +26,7 @@ class Grain
     const float rate;
     const float amp;
 
-    Grain(int onset, int length, int startPos, float center, float sustain, float curve, float r, float a)    : onset(onset), length(length), startPosition(startPos),
+    Grain(long long int onset, int length, int startPos, float center, float sustain, float curve, float r, float a) : onset(onset), length(length), startPosition(startPos),
                                                                                             envAttack((1 - sustain) * center), envAttackRecip(1/envAttack),
                                                                                             envRelease(sustain + envAttack), envReleaseRecip(1/(1-envRelease)),
                                                                                             envCurve(curve),
@@ -102,7 +102,7 @@ class Grain
         return ((c3 * x + c2) * x + c1) * x + c0;
     }
 
-    void process (AudioSampleBuffer& currentBlock, AudioSampleBuffer& fileBuffer, int numChannels, int blockNumSamples, int fileNumSamples, int time)
+    void process (AudioSampleBuffer& currentBlock, AudioSampleBuffer& fileBuffer, int numChannels, int blockNumSamples, int fileNumSamples, long long int time)
     {
         for(int channel=0; channel<numChannels; ++channel){
             const float gain = envelope(time);

diff --git a/Source/PluginProcessor.cpp b/Source/PluginProcessor.cpp
@@ -117,7 +117,7 @@ void GrrnlrrAudioProcessor::run()
         if( grainStack.size() > 0){
             for (int i=grainStack.size() - 1; i >= 0; --i) {
                 // check if the grain has ended
-                int grainEnd = grainStack[i].onset + grainStack[i].length;
+                long long int grainEnd = grainStack[i].onset + grainStack[i].length;
                 bool hasEnded = grainEnd < time;
 
                 if(hasEnded) grainStack.remove(i); // [4]
@@ -156,7 +156,7 @@ void GrrnlrrAudioProcessor::run()
                 //dur *= (1 / ratio);
 
                 int schedDelay = 700;
-                int onset = nextGrainOnset + schedDelay;
+                long long int onset = nextGrainOnset + schedDelay;
 
                 // Length
                 float density = *densityParam * (1 + (*randDensityParam * (Random::getSystemRandom().nextFloat() * 2 - 1)));