comparison index.cpp @ 433:681837f7c903 api-inversion

More on the query rationalization

Turn audioDB::delete_arrays and audioDB::read_data into ordinary
functions.

Also partially do audioDB::initialize_arrays, except for the bits that
we can't yet do because we haven't got a query datum/identifier going
through yet.

       if(prefixedString!=tmpStr)
 	delete[] tmpStr;
       initInputFile(prefixedString, false); // nommap, file pointer at correct position
       trackfd = infid;
     }
-    read_data(trackfd, trackID, &fvp, &nfv); // over-writes fvp and nfv
+    if(audiodb_read_data(adb, trackfd, trackID, &fvp, &nfv))
+      error("failed to read data");
     *fvpp = fvp; // Protect memory allocation and free() for track data
     
     if( dbH->flags & O2_FLAG_LARGE_ADB )
       // Load power and calculate power and l2norm sequence sums
       init_track_aux_data(trackID, fvp, sNormpp, snPtrp, sPowerp, spPtrp);