comparison open.cpp @ 430:2d14d21f826b api-inversion

Make the keys std::set in adb_t a std::map instead.

The key's index can usefully be the value, and now suddenly we can
remove audioDB::getKeyPos and its oh-so-helpful "this should be an STL
map" comment.

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

   }
   if(!audiodb_check_header(adb->header)) {
     goto error;
   }
 
-  adb->keys = new std::set<std::string>;
+  adb->keys = new std::map<std::string,uint32_t>;
   if(!adb->keys) {
     goto error;
   }
   if(audiodb_collect_keys(adb)) {
     goto error;