comparison common.cpp @ 693:b1723ae7675e

begin work on sampling API

This is motivated by the need to be able to sample with arbitrary feature data
(e.g. from a feature file) against a database, for the JNMR "collections" paper
revisions or possible ISMIR paper revisions.  That bit doesn't work yet, but
the C-ified version of the current functionality (sample db x db and
sample key x db) works to the level of anecdotal tests.

The general approach is to mirror the _query_spec() API, where a whole heap
of knobs and twiddles are available to the user.  Unlike in the _query_spec()
API, not quite all of the knobs make sense (and even fewer are actually
implemented), but the basic idea is the same.

I pity the poor chump who will have to document all this.

         if (sysFunc) {
             perror(sysFunc);
         }
         exit(1);
     }
-}
-
-void audioDB::initRNG() {
-  rng = gsl_rng_alloc(gsl_rng_mt19937);
-  if(!rng) {
-    error("could not allocate Random Number Generator");
-  }
-  /* FIXME: maybe we should use a real source of entropy? */
-  uint32_t seed = 0;
-#ifdef WIN32
-  seed = time(NULL);
-#else
-  struct timeval tv;
-  if(gettimeofday(&tv, NULL) == -1) {
-    error("failed to get time of day");
-  }
-  /* usec field should be less than than 2^20.  We want to mix the
-     usec field, highly-variable, into the high bits of the seconds
-     field, which will be static between closely-spaced runs.  -- CSR,
-     2010-01-05 */
-  seed = tv.tv_sec ^ (tv.tv_usec << 12);
-#endif
-  gsl_rng_set(rng, seed);
 }
 
 void audioDB::initDBHeader(const char* dbName) {
   if(!adb) {
     adb = audiodb_open(dbName, forWrite ? O_RDWR : O_RDONLY);

     }
   }
 }
 
 void audioDB::initTables(const char* dbName, const char* inFile) {
-  /* FIXME: initRNG() really logically belongs in the audioDB
-     contructor.  However, there are of the order of four constructors
-     at the moment, and more to come from API implementation.  Given
-     that duplication, I think this is the least worst place to put
-     it; the assumption is that nothing which doesn't look at a
-     database will need an RNG.  -- CSR, 2008-07-02 */
-  initRNG();
   initDBHeader(dbName);
   if(inFile)
     initInputFile(inFile);
 }