diff audioDB.h @ 15:69eb22e09772 audiodb-debian

Merged trunk changes -r14:29 onto audiodb-debian branch
author mas01cr
date Thu, 02 Aug 2007 11:34:27 +0000
parents 9eab3e0f3068
children 42498552b30c
line wrap: on
line diff
--- a/audioDB.h	Tue Jul 24 12:04:15 2007 +0000
+++ b/audioDB.h	Thu Aug 02 11:34:27 2007 +0000
@@ -119,8 +119,8 @@
 #define O2_DEFAULT_POINTNN (10U)
 #define O2_DEFAULT_SEGNN  (10U)
 
-//#define O2_DEFAULTDBSIZE (2000000000) // 2GB table size
-#define O2_DEFAULTDBSIZE (1000000000U) // 1GB table size
+#define O2_DEFAULTDBSIZE (2000000000) // 2GB table size
+//#define O2_DEFAULTDBSIZE (1000000000U) // 1GB table size
 
 //#define O2_MAXFILES (1000000)
 #define O2_MAXFILES (10000U)           // 10,000 files
@@ -208,6 +208,7 @@
   unsigned isServer;
   unsigned port;
   double timesTol;
+  unsigned ignoreCols;
 
   // Timers
   struct timeval tv1;