X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=vss.c;h=93790a7324afa8064df9fc20cd243e59840e7495;hp=4a395593f3aa1a6a5038b3d3c23330c6b0ea5610;hb=2c6032259d6536daabd4132a3737cac08ebdd018;hpb=505cfe0c6c8f9ef79d259ee64404ab40f2057081 diff --git a/vss.c b/vss.c index 4a395593..93790a73 100644 --- a/vss.c +++ b/vss.c @@ -23,14 +23,15 @@ */ #include "server.h" +#include /* mmap */ #include /* gettimeofday */ #include "server.cmdline.h" -#include "db.h" -#include "afh.h" +#include "afs.h" #include "vss.h" #include "send.h" #include "error.h" #include "string.h" +#include "fd.h" extern const char *status_item_list[]; @@ -44,6 +45,7 @@ extern struct audio_file_selector selectors[]; extern struct sender senders[]; static FILE *audio_file = NULL; +static char *map; #if 1 void mp3_init(struct audio_format_handler *); @@ -86,6 +88,8 @@ static struct audio_format_handler afl[] = { /** iterate over each supported audio format */ #define FOR_EACH_AUDIO_FORMAT(i) for (i = 0; afl[i].name; i++) + + /** * check if vss status flag \a P (playing) is set * @@ -181,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); + return afl[i].get_file_info(map, mmd->size, &mmd->afi); } /** @@ -220,7 +223,7 @@ static int get_audio_format(int omit) int i; FOR_EACH_AUDIO_FORMAT(i) { - if (i == omit || !afl[i].get_file_info) + if (i == omit) continue; rewind(audio_file); if (get_file_info(i) > 0) @@ -235,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); @@ -247,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; @@ -316,7 +320,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); } @@ -368,17 +372,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]); @@ -401,12 +410,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; } /** @@ -431,7 +438,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; } /** @@ -474,7 +481,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) @@ -482,8 +489,6 @@ again: } mmd->chunks_sent = 0; } - if (af && vss_repos() && mmd->current_chunk != mmd->repos_request) - af->reposition_stream(mmd->repos_request); if (vss_repos()) { mmd->new_vss_status_flags &= ~(VSS_REPOS); mmd->current_chunk = mmd->repos_request; @@ -492,7 +497,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; @@ -506,17 +511,12 @@ again: * 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; + ssize_t pos, len; struct timeval now, due; if (mmd->audio_format < 0 || !audio_file || !vss_playing()) @@ -531,25 +531,27 @@ void vss_send_chunk(void) if (chk_barrier("data send", &now, &data_send_barrier, &due, 1) < 0) return; - buf = af->read_chunk(mmd->current_chunk, &ret); mmd->new_vss_status_flags &= ~VSS_REPOS; - if (!buf) { - if (ret < 0) - mmd->new_vss_status_flags = VSS_NEXT; - 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 (!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, + map + pos, len); mmd->new_vss_status_flags |= VSS_PLAYING; mmd->chunks_sent++; mmd->current_chunk++;