Merge commit 'meins/master'

[paraslash.git] / send_common.c

diff --git a/send_common.c b/send_common.c
index c542e7e62fa52864b9ad8f44520b5dd495900e6a..c0098b98a833f0cae309aba11a43bec1c2c7d1a6 100644 (file)
--- a/send_common.c
+++ b/send_common.c
@@ -161,21 +161,20 @@ static int send_queued_chunks(struct sender_client *sc,
  * \param current_chunk The number of the chunk to write.
  * \param buf The data to write.
  * \param len The number of bytes of \a buf.
+ * \param header_buf The audio file header.
+ * \param header_len The number of bytes of \a header_buf.
  *
  * On errors, the client is shut down. If only a part of the buffer could be
  * written, the remainder is put into the chunk queue for that client.
  */
 void send_chunk(struct sender_client *sc, struct sender_status *ss,
                size_t max_bytes_per_write, long unsigned current_chunk,
-               const char *buf, size_t len)
+               const char *buf, size_t len, const char *header_buf,
+               size_t header_len)
 {
        int ret;
 
        if (!sc->header_sent && current_chunk) {
-               size_t header_len;
-               char *header_buf;
-
-               vss_get_header(&header_buf, &header_len);
                if (header_buf && header_len > 0) {
                        ret = queue_chunk_or_shutdown(sc, ss, header_buf, header_len);
                        if (ret < 0)