X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=vss.c;h=93790a7324afa8064df9fc20cd243e59840e7495;hb=2c6032259d6536daabd4132a3737cac08ebdd018;hp=122476064154b1d587a2403eea61384567dcbb6b;hpb=0b814bdbb7a3fe018cffee0162dc6c916cfa6879;p=paraslash.git diff --git a/vss.c b/vss.c index 12247606..93790a73 100644 --- a/vss.c +++ b/vss.c @@ -23,6 +23,7 @@ */ #include "server.h" +#include /* mmap */ #include /* gettimeofday */ #include "server.cmdline.h" #include "afs.h" @@ -42,10 +43,9 @@ static struct timeval autoplay_barrier; extern struct misc_meta_data *mmd; extern struct audio_file_selector selectors[]; extern struct sender senders[]; -static char *inbuf; -static size_t inbuf_size; static FILE *audio_file = NULL; +static char *map; #if 1 void mp3_init(struct audio_format_handler *); @@ -185,7 +185,7 @@ void vss_init(void) static int get_file_info(int i) { - return afl[i].get_file_info(audio_file, &mmd->afi); + return afl[i].get_file_info(map, mmd->size, &mmd->afi); } /** @@ -238,9 +238,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); @@ -250,16 +255,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; @@ -372,6 +373,7 @@ static void vss_eof(struct audio_format_handler *af) } gettimeofday(&now, NULL); tv_add(&mmd->afi.eof_tv, &now, &eof_barrier); + munmap(map, mmd->size); fclose(audio_file); audio_file = NULL; mmd->audio_format = -1; @@ -381,7 +383,6 @@ static void vss_eof(struct audio_format_handler *af) 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], @@ -496,46 +497,12 @@ 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; } -/** - * 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; - size_t pos; - 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; - } - ret = para_fseek(audio_file, pos, SEEK_SET); - if (ret < 0) - return ret; - return para_fread(inbuf, len, 1, audio_file); -} - /** * main sending function * @@ -544,15 +511,12 @@ 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) { int i; struct audio_format_handler *af; - ssize_t ret; + ssize_t pos, len; struct timeval now, due; if (mmd->audio_format < 0 || !audio_file || !vss_playing()) @@ -567,23 +531,17 @@ void vss_send_chunk(void) if (chk_barrier("data send", &now, &data_send_barrier, &due, 1) < 0) return; - ret= vss_read_chunk(); mmd->new_vss_status_flags &= ~VSS_REPOS; - if (!ret || (ret < 0 && ret != -E_EMPTY_CHUNK)) { - if (ret < 0) { - mmd->new_vss_status_flags = VSS_NEXT; - PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret)); - } else - mmd->new_vss_status_flags |= VSS_NEXT; - vss_eof(af); - return; + if (mmd->current_chunk >= mmd->afi.chunks_total) { /* eof */ + mmd->new_vss_status_flags |= VSS_NEXT; + return vss_eof(af); } + pos = mmd->afi.chunk_table[mmd->current_chunk]; + len = mmd->afi.chunk_table[mmd->current_chunk + 1] - pos; /* * 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); @@ -592,7 +550,8 @@ void vss_send_chunk(void) mmd->events++; } for (i = 0; senders[i].name; i++) - senders[i].send(mmd->current_chunk, mmd->chunks_sent, inbuf, ret); + senders[i].send(mmd->current_chunk, mmd->chunks_sent, + map + pos, len); mmd->new_vss_status_flags |= VSS_PLAYING; mmd->chunks_sent++; mmd->current_chunk++;