kill close_audio_file handler from struct audio format.

[paraslash.git] / vss.c

diff --git a/vss.c b/vss.c
index 9aeff44fd77e508d7c842a386a115ef5f72330cf..122476064154b1d587a2403eea61384567dcbb6b 100644 (file)
--- a/vss.c
+++ b/vss.c
@@ -26,7 +26,6 @@
 #include <sys/time.h> /* gettimeofday */
 #include "server.cmdline.h"
 #include "afs.h"
-#include "afh.h"
 #include "vss.h"
 #include "send.h"
 #include "error.h"
@@ -44,7 +43,7 @@ extern struct misc_meta_data *mmd;
 extern struct audio_file_selector selectors[];
 extern struct sender senders[];
 static char *inbuf;
-static size_t *chunk_table, inbuf_size;
+static size_t inbuf_size;
 
 static FILE *audio_file = NULL;
 
@@ -186,8 +185,7 @@ void vss_init(void)
 
 static int get_file_info(int i)
 {
-       return  afl[i].get_file_info(audio_file, mmd->audio_file_info,
-               &mmd->chunks_total, &mmd->seconds_total, &chunk_table);
+       return  afl[i].get_file_info(audio_file, &mmd->afi);
 }
 
 /**
@@ -321,7 +319,7 @@ static void vss_next_chunk_time(struct timeval *due)
 {
        struct timeval tmp;
 
-       tv_scale(mmd->chunks_sent, &afl[mmd->audio_format].chunk_tv, &tmp);
+       tv_scale(mmd->chunks_sent, &mmd->afi.chunk_tv, &tmp);
        tv_add(&tmp, &mmd->stream_start, due);
 }
 
@@ -373,17 +371,22 @@ static void vss_eof(struct audio_format_handler *af)
                return;
        }
        gettimeofday(&now, NULL);
-       tv_add(&af->eof_tv, &now, &eof_barrier);
-       af->close_audio_file();
+       tv_add(&mmd->afi.eof_tv, &now, &eof_barrier);
+       fclose(audio_file);
        audio_file = NULL;
        mmd->audio_format = -1;
        af = NULL;
        mmd->chunks_sent = 0;
        mmd->offset = 0;
-       mmd->seconds_total = 0;
+       mmd->afi.seconds_total = 0;
+       free(mmd->afi.chunk_table);
+       mmd->afi.chunk_table = NULL;
+       PARA_ERROR_LOG("freeing header %p\n", mmd->afi.header);
+       free(mmd->afi.header);
+       mmd->afi.header = NULL;
        tmp  = make_message("%s:\n%s:\n%s:\n", status_item_list[SI_AUDIO_INFO1],
                status_item_list[SI_AUDIO_INFO2], status_item_list[SI_AUDIO_INFO3]);
-       strcpy(mmd->audio_file_info, tmp);
+       strcpy(mmd->afi.info_string, tmp);
        free(tmp);
        tmp  = make_message("%s:\n%s:\n%s:\n", status_item_list[SI_DBINFO1],
                status_item_list[SI_DBINFO2], status_item_list[SI_DBINFO3]);
@@ -406,12 +409,10 @@ static void vss_eof(struct audio_format_handler *af)
  */
 char *vss_get_header(int *header_len)
 {
-       *header_len = 0;
        if (mmd->audio_format < 0)
                return NULL;
-       if (!afl[mmd->audio_format].get_header_info)
-               return NULL;
-       return afl[mmd->audio_format].get_header_info(header_len);
+       *header_len = mmd->afi.header_len;
+       return mmd->afi.header;
 }
 
 /**
@@ -436,7 +437,7 @@ struct timeval *vss_chunk_time(void)
 {
        if (mmd->audio_format < 0)
                return NULL;
-       return &afl[mmd->audio_format].chunk_tv;
+       return &mmd->afi.chunk_tv;
 }
 
 /**
@@ -479,7 +480,7 @@ again:
                        struct timeval now;
                        gettimeofday(&now, NULL);
                        if (!vss_paused() || mmd->chunks_sent)
-                               tv_add(&af->eof_tv, &now, &eof_barrier);
+                               tv_add(&mmd->afi.eof_tv, &now, &eof_barrier);
                        if (vss_repos())
                                tv_add(&now, &announce_tv, &data_send_barrier);
                        if (mmd->new_vss_status_flags & VSS_NOMORE)
@@ -517,15 +518,15 @@ ssize_t vss_read_chunk(void)
        int ret;
        long unsigned cc = mmd->current_chunk;
 
-       if (cc >= mmd->chunks_total) /* eof */
+       if (cc >= mmd->afi.chunks_total) /* eof */
                return 0;
-       len = chunk_table[cc + 1] - chunk_table[cc];
+       len = mmd->afi.chunk_table[cc + 1] - mmd->afi.chunk_table[cc];
        if (!len) /* nothing to send for this run */
                return -E_EMPTY_CHUNK;
-       pos = chunk_table[cc];
+       pos = mmd->afi.chunk_table[cc];
        if (inbuf_size < len) {
                PARA_INFO_LOG("increasing inbuf for chunk #%lu/%lu to %zu bytes\n",
-                       cc, mmd->chunks_total, len);
+                       cc, mmd->afi.chunks_total, len);
                inbuf = para_realloc(inbuf, len);
                inbuf_size = len;
        }
@@ -586,7 +587,7 @@ void vss_send_chunk(void)
        if (!mmd->chunks_sent) {
                struct timeval tmp;
                gettimeofday(&mmd->stream_start, NULL);
-               tv_scale(mmd->current_chunk, &af->chunk_tv, &tmp);
+               tv_scale(mmd->current_chunk, &mmd->afi.chunk_tv, &tmp);
                mmd->offset = tv2ms(&tmp);
                mmd->events++;
        }