diff query.cpp @ 580:633614461994

API for retrieving a track's data.

A new function, audiodb_retrieve_datum() fills a provided adb_datum_t
structure with the data corresponding to a given database key; the
companion audiodb_free_datum() function frees the data in a given datum
appropriately.

Just in case, I continue to require passing in the adb_t * as the first
argument to audiodb_free_datum(), even though it's not currently used:
I couldn't convince myself that _all_ possible implementations could
free a datum without reference to the adb_t.

This meant rewriting the internal code to use a new internal
audiodb_really_free_datum() function, which audiodb_free_datum() also
calls.

Sanity-checked by implementing a binding in sb-alien to this function,
lightly-tested.

All this fixes ticket:20 in Trac.

--- a/query.cpp	Mon Jul 06 17:13:49 2009 +0000
+++ b/query.cpp	Tue Jul 14 15:35:36 2009 +0000
@@ -240,7 +240,7 @@
     return 0;
   }
  error:
-  audiodb_free_datum(d);
+  audiodb_really_free_datum(d);
   return 1;
 }
 
@@ -310,7 +310,7 @@
   /* FIXME: check the overflow logic here */
   if(sequence_start + sequence_length > d.nvectors) {
     if(datum != &d) {
-      audiodb_free_datum(&d);
+      audiodb_really_free_datum(&d);
     }
     return 1;
   }
@@ -333,7 +333,7 @@
   /* Clean up: free any bits of datum that we have ourselves
    * allocated. */
   if(datum != &d) {
-    audiodb_free_datum(&d);
+    audiodb_really_free_datum(&d);
   }
 
   return 0;
@@ -464,10 +464,10 @@
       }
       if(audiodb_datum_qpointers(&d, sequence_length, &dbdata, &dbdata_pointer, &dbpointers)) {
         delete qstate->exact_evaluation_queue;
-        audiodb_free_datum(&d);
+        audiodb_really_free_datum(&d);
         return 1;
       }
-      audiodb_free_datum(&d);
+      audiodb_really_free_datum(&d);
     }
     Uns32T qPos = (spec->qid.flags & ADB_QID_FLAG_EXHAUSTIVE) ? pp.qpos : 0;
     Uns32T sPos = pp.spos; // index into l2norm table