--- psiconv/trunk/lib/psiconv/configuration.h	2003/11/25 17:57:05	168
+++ psiconv/trunk/lib/psiconv/configuration.h	2004/02/08 22:44:29	204
@@ -1,6 +1,6 @@
 /*
     configuration.h - Part of psiconv, a PSION 5 file formats converter
-    Copyright (c) 1999, 2000,2003  Frodo Looijaard <frodol@dds.nl>
+    Copyright (c) 1999-2004  Frodo Looijaard <frodol@dds.nl>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -27,15 +27,30 @@
 extern "C" {
 #endif /* __cplusplus */
 
+typedef void *psiconv_error_handler_t (int kind, psiconv_u32 off,
+                                       const char *message);
+
 typedef struct psiconv_config_s
 {
   int verbosity;
   int colordepth;
-  psiconv_bool_t greyscale;
+  int redbits;    /* Only needed when color is used and no palet */
+  int greenbits;  /* Only needed when color is used and no palet */
+  int bluebits;   /* Only needed when color is used and no palet */
+  psiconv_bool_t color;
+  psiconv_error_handler_t *error_handler;
+  psiconv_u8 unknown_epoc_char;
+  psiconv_ucs2 unknown_unicode_char;
+  psiconv_ucs2 unicode_table[0x100];
+  psiconv_bool_t unicode;
 } *psiconv_config;
 
-extern psiconv_config psiconv_config_read(const char *extra_config_file);
+extern psiconv_config psiconv_config_default(void);
+
+extern void psiconv_config_read(const char *extra_config_files,
+                                psiconv_config *config);
 
+extern psiconv_config_free(psiconv_config config);
 
 #ifdef __cplusplus
 }