X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=vss.c;h=e12176d2df3ce08eeb457aa05d10a418206d59f8;hp=9aeff44fd77e508d7c842a386a115ef5f72330cf;hb=57a8d22ad5e81dc815390685ae5f83c0f16156e7;hpb=02d14b8dab5d70d73402fb12a6bd642f70287b52 diff --git a/vss.c b/vss.c index 9aeff44f..e12176d2 100644 --- a/vss.c +++ b/vss.c @@ -23,10 +23,10 @@ */ #include "server.h" +#include /* mmap */ #include /* gettimeofday */ #include "server.cmdline.h" #include "afs.h" -#include "afh.h" #include "vss.h" #include "send.h" #include "error.h" @@ -44,9 +44,10 @@ 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; +static char *map; #if 1 void mp3_init(struct audio_format_handler *); @@ -186,8 +187,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, map, mmd->size, &mmd->afi); } /** @@ -240,9 +240,14 @@ static int get_audio_format(int omit) */ static int update_mmd(void) { - int i; + int i, fd = fileno(audio_file); struct stat file_status; + if (fstat(fd, &file_status) == -1) + return -E_FSTAT; + mmd->size = file_status.st_size; + mmd->mtime = file_status.st_mtime; + map = para_mmap(file_status.st_size, PROT_READ, MAP_PRIVATE, fd, 0); i = guess_audio_format(mmd->filename); if (i < 0 || get_file_info(i) < 0) i = get_audio_format(i); @@ -252,16 +257,12 @@ static int update_mmd(void) mmd->chunks_sent = 0; mmd->current_chunk = 0; mmd->offset = 0; - if (fstat(fileno(audio_file), &file_status) == -1) - return -E_FSTAT; - mmd->size = file_status.st_size; - mmd->mtime = file_status.st_mtime; mmd->events++; PARA_NOTICE_LOG("next audio file: %s\n", mmd->filename); 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 +322,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 +374,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); + munmap(map, mmd->size); + 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 +412,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 +440,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 +483,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,7 +499,7 @@ 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; @@ -504,12 +508,10 @@ again: /** * read a chunk of data from the current audio file * - * \param current_chunk the chunk number to read - * * \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) { ssize_t len; @@ -517,15 +519,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; } @@ -543,9 +545,6 @@ ssize_t vss_read_chunk(void) * 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) { @@ -586,7 +585,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++; }