dccp_send.c: Minor cleanups.

[paraslash.git] / afh.h

diff --git a/afh.h b/afh.h
index 246cb9200fefc8a601a333ad7f3e82b490beb346..73c02c128565f9d03fe216dd4732a75877f5f5a1 100644 (file)
--- a/afh.h
+++ b/afh.h
@@ -1,19 +1,7 @@
 /*
 /*

- * 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
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Licensed under the GPL v2. For licencing details see COPYING.

  */
 
 /** \file afh.h structures for audio format handling (para_server) */
  */
 
 /** \file afh.h structures for audio format handling (para_server) */


@@ -48,7 +36,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 */
        /** 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];
        /**
        /** a string that gets filled in by the audio format handler */
        char info_string[AUDIO_FILE_INFO_SIZE];
        /**


@@ -61,17 +49,21 @@ struct audio_format_info {
        /** end of file timeout - do not load new audio file until this time */
        struct timeval eof_tv;
        /**
        /** 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;
        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;

 };
 
 /**
 };
 
 /**


@@ -108,7 +100,7 @@ struct audio_format_handler {
         *
         * \sa struct audio_format_info
        */
         *
         * \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);
 };
 
                struct audio_format_info *afi);
 };