X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afh.h;h=e0087a56c750355224d0719ee064caf26c237d35;hp=e365df86569337ba767cfe9601f81c3ba39c939c;hb=a7a37b282c4e936b2fb34c2bd7423f9f800dfd44;hpb=6ef3d51cbb57d90c187a116966cc7b2226b9d1f1 diff --git a/afh.h b/afh.h index e365df86..e0087a56 100644 --- a/afh.h +++ b/afh.h @@ -48,7 +48,7 @@ struct audio_format_info { /** the number of chunks this audio file contains */ long unsigned chunks_total; /** the length of the audio file in seconds */ - int seconds_total; + long unsigned seconds_total; /** a string that gets filled in by the audio format handler */ char info_string[AUDIO_FILE_INFO_SIZE]; /** @@ -61,17 +61,18 @@ struct audio_format_info { /** end of file timeout - do not load new audio file until this time */ struct timeval eof_tv; /** - * optional audio file header - * - * This is read from a sender in case a new client connects in the - * middle of the stream. The audio format handler does not need to set - * this if the audio format does not need any special header treatment. - * If non-NULL, it must point to a buffer holding the current audio - * file header. - */ - char *header; - /** the length of the header, ignored if \a header is \p NULL */ + * 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 + * 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. + */ unsigned header_len; + /** + * The position of the header within the audio file. Ignored if \a + * header_len equals zero. + */ + unsigned header_offset; uint8_t channels; uint16_t frequency; uint16_t bitrate; @@ -111,7 +112,7 @@ struct audio_format_handler { * * \sa struct audio_format_info */ - int (*get_file_info)(char *map, off_t numbytes, + int (*get_file_info)(char *map, size_t numbytes, struct audio_format_info *afi); };