comparison open.cpp @ 509:cc2b97d020b1

Code rearrangements to tease apart library code from C++ audioDB code.

There should be precisely no functional changes in this commit.
Instead, the only thing that has happened is that all the abstraction
violation and other horribleness is concentrated in one place: the
include of "audioDB-internals.h" in audioDB.h -- the separation will be
complete once that include can be removed.

This include is necessary because the command-line binary / SOAP server
still does some things directly rather than through an API: not least of
which the operations that have not yet been integrated into the API yet,
but also some messing around with constants, flags and nominally
internal functions.  The intent is to remove as many of these as
possible and think quite hard about the rest.

In the meantime, the library is now much more self-contained: the only
things it uses are in the audioDB_API.h and audioDB-internals.h headers;
thus there are fewer nasty surprises lurking for readers of the code.

The Makefile has been adjusted to take advantage of this rearrangement
in the dependencies.

-#include "audioDB.h"
 extern "C" {
 #include "audioDB_API.h"
+}
 #include "audioDB-internals.h"
-}
 
 static bool audiodb_check_header(adb_header_t *header) {
   /* FIXME: use syslog() or write to stderr or something to give the
      poor user some diagnostics. */
-  if(header->magic == O2_OLD_MAGIC) {
+  if(header->magic == ADB_OLD_MAGIC) {
     return false;
   }
-  if(header->magic != O2_MAGIC) {
+  if(header->magic != ADB_MAGIC) {
     return false;
   }
-  if(header->version != O2_FORMAT_VERSION) {
+  if(header->version != ADB_FORMAT_VERSION) {
     return false;
   }
-  if(header->headerSize != O2_HEADERSIZE) {
+  if(header->headerSize != ADB_HEADER_SIZE) {
     return false;
   }
   return true;
 }
 

   char *key_table = 0;
   size_t key_table_length = 0;
 
   if(adb->header->length > 0) {
     unsigned nfiles = adb->header->numFiles;
-    key_table_length = ALIGN_PAGE_UP(nfiles * O2_FILETABLE_ENTRY_SIZE);
+    key_table_length = align_page_up(nfiles * ADB_FILETABLE_ENTRY_SIZE);
     mmap_or_goto_error(char *, key_table, adb->header->fileTableOffset, key_table_length);
     for (unsigned int k = 0; k < nfiles; k++) {
-      adb->keys->push_back(key_table + k*O2_FILETABLE_ENTRY_SIZE);
-      (*adb->keymap)[(key_table + k*O2_FILETABLE_ENTRY_SIZE)] = k;
+      adb->keys->push_back(key_table + k*ADB_FILETABLE_ENTRY_SIZE);
+      (*adb->keymap)[(key_table + k*ADB_FILETABLE_ENTRY_SIZE)] = k;
     }
     munmap(key_table, key_table_length);
   }
 
   return 0;

 static int audiodb_collect_track_lengths(adb_t *adb) {
   uint32_t *track_table = 0;
   size_t track_table_length = 0;
   if(adb->header->length > 0) {
     unsigned nfiles = adb->header->numFiles;
-    track_table_length = ALIGN_PAGE_UP(nfiles * O2_TRACKTABLE_ENTRY_SIZE);
+    track_table_length = align_page_up(nfiles * ADB_TRACKTABLE_ENTRY_SIZE);
     mmap_or_goto_error(uint32_t *, track_table, adb->header->trackTableOffset, track_table_length);
     off_t offset = 0;
     for (unsigned int k = 0; k < nfiles; k++) {
       uint32_t track_length = track_table[k];
       adb->track_lengths->push_back(track_length);

 
   adb->header = (adb_header_t *) malloc(sizeof(adb_header_t));
   if(!(adb->header)) {
     goto error;
   }
-  if(read(fd, (char *) adb->header, O2_HEADERSIZE) != O2_HEADERSIZE) {
+  if(read(fd, (char *) adb->header, ADB_HEADER_SIZE) != ADB_HEADER_SIZE) {
     goto error;
   }
   if(!audiodb_check_header(adb->header)) {
     goto error;
   }