comparison scanpath.mm @ 5:085d80989ba7

Release 1.01

 }
 //----------------------------------------------------------------
 void ScanPath::updateWavetables(){
     // swap old , new
     double * temp;
-
+    if(pathElements.size() == 0) return;
     // TODO THRED MUTEX HERE!??
     // this is called from graphics thread
     // reset the interp between frames
-
+/*
     int i = 0;
     while(audioAccessing){
         i++;
     }
     if(i > 0){
         cout << "Update wavetables had to wait for audio access " << i << " times\n";
         // hardly ever happens
     }
+ */
     updateAccessing = true;
      
 
     switch(scanMode){
         case DISPLACEMENT:
             // now fill with new values
             for(int i = 0; i < numElements; i++){
                 // double check
-                if(pathElements[i].eLump->isInScanPath){
-                    wavetableUpdate[i] = pathElements[i].eLump->scanRadialDisplacement()/1.5;
-                }
+                
+                wavetableUpdate[i] = pathElements[i].eLump->scanRadialDisplacement();
+                
                 
             }
             break;
         case SPEED:
             for(int i = 0; i < numElements; i++){
-                if(pathElements[i].eLump->isInScanPath){
-                    wavetableUpdate[i] = pathElements[i].eLump->scanLumpSpeed();
-                }
+                
+                wavetableUpdate[i] = pathElements[i].eLump->scanLumpSpeed();
+                
             }
             break;
         case SPRING_FORCE:
             for(int i = 0; i < numElements; i++){
                 if(pathElements[i].eSpring->isInScanPath){

 // get next sample
 
 double ScanPath::getNextSample(double aPhasor){
 	// move along path, interpolating between points
     // move between frames too
+    if(pathElements.size() == 0) return 0.0;
+    
     double alongPath = aPhasor*double(numElements);
     
     // indexes for interpolated points
     int n0 = floor(alongPath);
     int n1 = n0+1;

 
     double frac = alongPath - double(n0);
     
     // TODO THRED MUTEX HERE!??
     // this is called from audio thread
-
+/*
     int i = 0;
     while(updateAccessing){
         i++;
     }
+ */
     audioAccessing = true;
-    if(i>0) cout << "Audio thread had to wait for wavetable update " << i << " times\n";
+    // if(i>0) cout << "Audio thread had to wait for wavetable update " << i << " times\n";
 
     
     double oldsample = (1 - frac) * wavetableOld[n0] + frac * wavetableOld[n1];
     
     double newsample = (1 - frac) * wavetableNew[n0] + frac * wavetableNew[n1];