Merge /home/maan/scm/paraslash_fml/paraslash

[paraslash.git] / afh.h

diff --git a/afh.h b/afh.h
index e7ca2820d92c0bc517f92b224efd12507d8dd716..e365df86569337ba767cfe9601f81c3ba39c939c 100644 (file)
--- a/afh.h
+++ b/afh.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2007 Andre Noll <maan@systemlinux.org>
  *
  *     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
@@ -70,8 +70,11 @@ struct audio_format_info {
         * file header.
         */
        char *header;
-       /* the length of the header, ignored if \a header is \p NULL */
+       /** the length of the header, ignored if \a header is \p NULL */
        unsigned header_len;
+       uint8_t channels;
+       uint16_t frequency;
+       uint16_t bitrate;
 };
 
 /**
@@ -108,14 +111,7 @@ struct audio_format_handler {
         *
         * \sa struct audio_format_info
        */
-       int (*get_file_info)(FILE *audio_file, struct audio_format_info *afi);
-       /**
-        * cleanup function of this audio format handler
-        *
-        * This close function should deallocate any resources
-        * associated with the current audio file. In particular, it is responsible
-        * for closing the file handle. It is assumed to succeed.
-       */
-       void (*close_audio_file)(void);
+       int (*get_file_info)(char *map, off_t numbytes,
+               struct audio_format_info *afi);
 };