Merge branch 'maint'

[paraslash.git] / afh.h

diff --git a/afh.h b/afh.h
index 62e38c02af85a946c74533115b8f826be337781a..801c168c0ca1dc578745e9af87c60028a9774827 100644 (file)
--- a/afh.h
+++ b/afh.h
@@ -28,17 +28,17 @@ struct taginfo {
 /** Audio format dependent information. */
 struct afh_info {
        /** The number of chunks this audio file contains. */
-       long unsigned chunks_total;
+       uint32_t chunks_total;
        /** The length of the audio file in seconds. */
-       long unsigned seconds_total;
+       uint32_t seconds_total;
        /** Audio handler specific info about the file. */
        char *techinfo;
        /** Id3 tags, vorbis comments, aac tags. */
        struct taginfo tags;
        /**
-        * The table that specifies the offset of the individual pieces in
-        * the current audio file.
-        */
+        * The table that specifies the offset of the individual pieces in
+        * the current audio file.
+        */
        uint32_t *chunk_table;
        /** Period of time between sending data chunks. */
        struct timeval chunk_tv;
@@ -48,7 +48,7 @@ struct afh_info {
         * which means that this audio format does not need any special header
         * treatment. The audio format handler does not need to set this to
         * zero in this case.
-        */
+        */
        uint32_t header_len;
        /** The number of channels. */
        uint8_t channels;
@@ -88,7 +88,7 @@ struct audio_format_handler {
         */
        void (*init)(struct audio_format_handler*);
        /** Typical file endings for files that can be handled by this afh. */
-       const char **suffixes;
+       const char * const *suffixes;
        /**
         * Check if this audio format handler can handle the file.
         *
@@ -101,7 +101,7 @@ struct audio_format_handler {
         * \sa struct afh_info
         */
        int (*get_file_info)(char *map, size_t numbytes, int fd,
-               struct afh_info *afi);
+               struct afh_info *afhi);
        /** Optional, used for header-rewriting. See \ref afh_get_header(). */
        void (*get_header)(void *map, size_t mapsize, char **buf, size_t *len);
        /**