Major audio format handler cleanups.

[paraslash.git] / vss.c

diff --git a/vss.c b/vss.c
index da8510ee7b1dcf8babee2234bd29c851fd9babd8..458394b8930186a0e32ff0dc649570a7a57d15b5 100644 (file)
--- a/vss.c
+++ b/vss.c
@@ -487,8 +487,7 @@ static void compute_slice_timeout(struct timeval *timeout)
 static void set_eof_barrier(struct vss_task *vsst)
 {
        struct fec_client *fc;
 static void set_eof_barrier(struct vss_task *vsst)
 {
        struct fec_client *fc;

-       struct timeval timeout = mmd->afd.afhi.eof_tv,
-               *chunk_tv = vss_chunk_time();
+       struct timeval timeout = {1, 0}, *chunk_tv = vss_chunk_time();

 
        if (!chunk_tv)
                goto out;
 
        if (!chunk_tv)
                goto out;


@@ -630,9 +629,6 @@ static void vss_eof(struct vss_task *vsst)
        mmd->afd.afhi.chunk_tv.tv_usec = 0;
        free(mmd->afd.afhi.chunk_table);
        mmd->afd.afhi.chunk_table = NULL;
        mmd->afd.afhi.chunk_tv.tv_usec = 0;
        free(mmd->afd.afhi.chunk_table);
        mmd->afd.afhi.chunk_table = NULL;

-       free(mmd->afd.afhi.info_string);
-       mmd->afd.afhi.info_string = make_message("%s:\n%s:\n%s:\n", status_item_list[SI_AUDIO_FILE_INFO],
-               status_item_list[SI_TAGINFO1], status_item_list[SI_TAGINFO2]);

        make_empty_status_items(mmd->afd.verbose_ls_output);
        mmd->mtime = 0;
        mmd->size = 0;
        make_empty_status_items(mmd->afd.verbose_ls_output);
        mmd->mtime = 0;
        mmd->size = 0;


@@ -782,7 +778,6 @@ static void recv_afs_result(struct vss_task *vsst)
        if (passed_fd < 0)
                goto err;
        shmid = afs_data;
        if (passed_fd < 0)
                goto err;
        shmid = afs_data;

-       free(mmd->afd.afhi.info_string);

        ret = load_afd(shmid, &mmd->afd);
        if (ret < 0)
                goto err;
        ret = load_afd(shmid, &mmd->afd);
        if (ret < 0)
                goto err;