X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=vss.c;h=50c86ed7d8ef7069e6d9baea3df7d18c7e6ae3c2;hp=f1dbfb97fa45db3c79628887f0783301f218b4e9;hb=22245300541fa7d6e92cdcd7bc4204fd2d73f799;hpb=4cfbdce5e460934d4724cac63aa718ea6c7af199 diff --git a/vss.c b/vss.c index f1dbfb97..50c86ed7 100644 --- a/vss.c +++ b/vss.c @@ -26,7 +26,6 @@ #include /* 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); } /** @@ -261,7 +259,7 @@ static int update_mmd(void) return 1; } -static void get_song(void) +static void vss_get_audio_file(void) { char **sl = selectors[mmd->selector_num].get_audio_file_list(10); int i; @@ -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,21 @@ 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; + 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 +408,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 +436,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 +479,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) @@ -495,39 +495,42 @@ again: if (!ret && !audio_file && vss_playing() && !(mmd->new_vss_status_flags & VSS_NOMORE)) { PARA_DEBUG_LOG("%s", "ready and playing, but no audio file\n"); - get_song(); + vss_get_audio_file(); goto again; } return ret; } -static char *vss_read_chunk(long unsigned current_chunk, ssize_t *len) +/** + * read a chunk of data from the current audio file + * + * \return The length of the chunk on success, zero on end of file, negative on + * errors. Note: If the current chunk is of length zero, but the end of the + * file is not yet reached, this function returns -E_EMPTY_CHUNK. + */ +ssize_t vss_read_chunk(void) { - int ret; + ssize_t len; size_t pos; - - *len = 0; - if (current_chunk >= mmd->chunks_total) - return NULL; - *len = chunk_table[current_chunk + 1] - chunk_table[current_chunk]; - if (!*len) /* nothing to send for this run */ - return inbuf; - pos = chunk_table[current_chunk]; - if (inbuf_size < *len) { - PARA_INFO_LOG("increasing inbuf for chunk #%lu/%lu to %zd bytes\n", - current_chunk, mmd->chunks_total, *len); - inbuf = para_realloc(inbuf, *len); - inbuf_size = *len; + int ret; + long unsigned cc = mmd->current_chunk; + + if (cc >= mmd->afi.chunks_total) /* eof */ + return 0; + 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 = mmd->afi.chunk_table[cc]; + if (inbuf_size < len) { + PARA_INFO_LOG("increasing inbuf for chunk #%lu/%lu to %zu bytes\n", + cc, mmd->afi.chunks_total, len); + inbuf = para_realloc(inbuf, len); + inbuf_size = len; } -// PARA_DEBUG_LOG("reading chunk #%lu@%zd (%zd bytes)\n", current_chunk, -// pos, *len); - ret = fseek(audio_file, pos, SEEK_SET); + ret = para_fseek(audio_file, pos, SEEK_SET); if (ret < 0) - return NULL; - ret = para_fread(inbuf, *len, 1, audio_file); - if (ret != *len) - return NULL; - return inbuf; + return ret; + return para_fread(inbuf, len, 1, audio_file); } /** @@ -538,15 +541,11 @@ static char *vss_read_chunk(long unsigned current_chunk, ssize_t *len) * the current audio format handler to obtain a pointer to the data to be * sent out as well as its length. This information is then passed to each * supported sender's send() function which does the actual sending. - * - * Return value: Positive return value on success, zero on eof and negative - * on errors. */ void vss_send_chunk(void) { int i; struct audio_format_handler *af; - char *buf; ssize_t ret; struct timeval now, due; @@ -562,25 +561,32 @@ void vss_send_chunk(void) if (chk_barrier("data send", &now, &data_send_barrier, &due, 1) < 0) return; - buf = vss_read_chunk(mmd->current_chunk, &ret); + ret= vss_read_chunk(); mmd->new_vss_status_flags &= ~VSS_REPOS; - if (!buf) { - if (ret < 0) + if (!ret || (ret < 0 && ret != -E_EMPTY_CHUNK)) { + if (ret < 0) { mmd->new_vss_status_flags = VSS_NEXT; - else + PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret)); + } else mmd->new_vss_status_flags |= VSS_NEXT; vss_eof(af); return; } + /* + * We call the send function also in case of empty chunks as they + * might have still some data queued which can be sent in this case. + */ + if (ret < 0) + ret = 0; 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++; } for (i = 0; senders[i].name; i++) - senders[i].send(mmd->current_chunk, mmd->chunks_sent, buf, ret); + senders[i].send(mmd->current_chunk, mmd->chunks_sent, inbuf, ret); mmd->new_vss_status_flags |= VSS_PLAYING; mmd->chunks_sent++; mmd->current_chunk++;