comparison query.cpp @ 211:50da444004fe refactoring

delete_arrays() function.

           *sp += *spd;
           sp += HOP_SIZE;
           spd += HOP_SIZE;
         }
       }
+    }
+  }
+}
+
+void audioDB::delete_arrays(int track, unsigned int numVectors, double **D, double **DD) {
+  if(D != NULL) {
+    for(unsigned int j = 0; j < numVectors; j++) {
+      delete[] D[j];
+    }
+  }
+  if(DD != NULL) {
+    for(unsigned int j = 0; j < numVectors; j++) {
+      delete[] DD[j];
     }
   }
 }
 
 void audioDB::read_data(int track, double **data_buffer_p, size_t *data_buffer_size_p) {

 	    }
 	  }
 	  else
 	    break;
 	}
-      } // Duration match
-            
-      // Clean up current track
-      if(D!=NULL){
-	for(j=0; j<numVectors; j++)
-	  delete[] D[j];
-      }
-
-      if(DD!=NULL){
-	for(j=0; j<numVectors; j++)
-	  delete[] DD[j];
-      }
+      } // Duration match            
+      delete_arrays(track, numVectors, D, DD);
     }
     // per-track reset array values
     for(unsigned k=0; k<pointNN; k++){
       distances[k]=1.0e6;
       qIndexes[k]=~0;

 	  }
 	  else
 	    break;
 	}
       } // Duration match
-            
-      // Clean up current track
-      if(D!=NULL){
-	for(j=0; j<numVectors; j++)
-	  delete[] D[j];
-      }
-
-      if(DD!=NULL){
-	for(j=0; j<numVectors; j++)
-	  delete[] DD[j];
-      }
+      delete_arrays(track, numVectors, D, DD);
     }
     // per-track reset array values
     for(unsigned k=0; k<pointNN; k++){
       distances[k]=0.0;
       qIndexes[k]=~0;