Merge commit 'remotes/fml/master'

[paraslash.git] / afh.h

diff --git a/afh.h b/afh.h
index 52d50a9103c8093a840c9b8e09003ad764f69c1f..ffccce95fbb12720d40e5549e60781bc6c5e7fe4 100644 (file)
--- a/afh.h
+++ b/afh.h
@@ -23,13 +23,10 @@
 
 /** \endcond */
 
-/** size of the  audio_file info string */
+/** Size of the audio_file info string. */
 #define AUDIO_FILE_INFO_SIZE 256
 
-/**
- * Audio format dependent information. Details vary between each audio format
- * handler.
- */
+/** Audio format dependent information. */
 struct afh_info {
        /** The number of chunks this audio file contains. */
        long unsigned chunks_total;
@@ -46,6 +43,11 @@ struct afh_info {
        struct timeval chunk_tv;
        /** End of file timeout - Do not load new audio file until this time. */
        struct timeval eof_tv;
+       /**
+        * The position of the header within the audio file. Ignored if \a
+        * header_len equals zero.
+        */
+       uint32_t header_offset;
        /**
         * The header is needed by senders in case a new client connects in the
         * middle of the stream. The length of the header defaults to zero
@@ -53,15 +55,10 @@ struct afh_info {
         * treatment. The audio format handler does not need to set this to
         * zero in this case.
         */
-       unsigned header_len;
-       /**
-        * The position of the header within the audio file. Ignored if \a
-        * header_len equals zero.
-        */
-       unsigned header_offset;
+       uint32_t header_len;
        /** The number of channels. */
        uint8_t channels;
-       /** Frquency on Hz. */
+       /** Frequency in Hz. */
        uint16_t frequency;
        /** Exact meaning depends on audio format. */
        uint16_t bitrate;