--- psiconv/trunk/program/psiconv/psiconv.h	2004/01/06 20:15:01	184
+++ psiconv/trunk/program/psiconv/psiconv.h	2004/01/09 22:20:03	185
@@ -17,25 +17,32 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#ifndef PSICONV_PSICONV_H
-#define PSICONV_PSICONV_H
+#ifndef PSICONV_H
+#define PSICONV_H
 
-#include "psiconv/data.h"
+#include <psiconv/data.h>
+#include <psiconv/configuration.h>
 
-#ifndef PSICONV_ENC_H
-#include "encoding.h"
-#endif
+typedef enum
+{ 
+  ENCODING_UTF8,
+  ENCODING_UCS2,
+  ENCODING_PSION,
+  ENCODING_ASCII
+} encoding;
 
-typedef int output_function(const char *filename, const psiconv_file,
+typedef int output_function(const psiconv_config config,
+                            psiconv_list list, const psiconv_file file,
                             const char *type,
-			    const psiconv_encoding encoding_type);
+			    const encoding encoding_type);
 
-typedef struct psiconv_fileformat_s {
+typedef struct fileformat_s {
   const char *name;
   const char *description;
   output_function *output;
-} *psiconv_fileformat;
+} *fileformat;
 
 psiconv_list fileformat_list; /* of struct psiconv_fileformat */
 
-#endif /* PSICONV_GEN_H */
+
+#endif /* PSICONV_H */