X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=vss.c;h=7892fb14656317453304b37d4c09dcb8bcc40006;hp=93790a7324afa8064df9fc20cd243e59840e7495;hb=7f2f826603c955d35d50d6ab2a6ed48a3bc24ab8;hpb=2c6032259d6536daabd4132a3737cac08ebdd018 diff --git a/vss.c b/vss.c index 93790a73..7892fb14 100644 --- a/vss.c +++ b/vss.c @@ -1,25 +1,14 @@ /* * Copyright (C) 1997-2007 Andre Noll * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Licensed under the GPL v2. For licencing details see COPYING. */ /** \file vss.c the virtual streaming system * - * This contains the audio sending part of para_server which is independent of - * the current audio format, audio file selector and of the activated senders. + * This contains the audio streaming code of para_server which is independent + * of the current audio format, audio file selector and of the activated + * senders. */ #include "server.h" @@ -44,7 +33,7 @@ extern struct misc_meta_data *mmd; extern struct audio_file_selector selectors[]; extern struct sender senders[]; -static FILE *audio_file = NULL; +static int audio_file; static char *map; #if 1 @@ -157,6 +146,10 @@ void vss_init(void) { int i; char *hn = para_hostname(), *home = para_homedir(); + long unsigned announce_time = conf.announce_time_arg > 0? + conf.announce_time_arg : 300, + autoplay_delay = conf.autoplay_delay_arg > 0? + conf.autoplay_delay_arg : 0; PARA_DEBUG_LOG("supported audio formats: %s\n", SUPPORTED_AUDIO_FORMATS); @@ -165,7 +158,7 @@ void vss_init(void) afl[i].name); afl[i].init(&afl[i]); } - ms2tv(conf.announce_time_arg, &announce_tv); + ms2tv(announce_time, &announce_tv); PARA_INFO_LOG("announce timeval: %lums\n", tv2ms(&announce_tv)); for (i = 0; senders[i].name; i++) { PARA_NOTICE_LOG("initializing %s sender\n", senders[i].name); @@ -178,7 +171,7 @@ void vss_init(void) mmd->vss_status_flags |= VSS_PLAYING; mmd->new_vss_status_flags |= VSS_PLAYING; gettimeofday(&now, NULL); - ms2tv(conf.autoplay_delay_arg, &tmp); + ms2tv(autoplay_delay, &tmp); tv_add(&now, &tmp, &autoplay_barrier); } } @@ -225,10 +218,8 @@ static int get_audio_format(int omit) FOR_EACH_AUDIO_FORMAT(i) { if (i == omit) continue; - rewind(audio_file); if (get_file_info(i) > 0) return i; - rewind(audio_file); } return -E_AUDIO_FORMAT; } @@ -238,14 +229,8 @@ static int get_audio_format(int omit) */ static int update_mmd(void) { - int i, fd = fileno(audio_file); - struct stat file_status; + int i; - 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); @@ -256,7 +241,6 @@ static int update_mmd(void) mmd->current_chunk = 0; mmd->offset = 0; mmd->events++; - PARA_NOTICE_LOG("next audio file: %s\n", mmd->filename); return 1; } @@ -264,6 +248,7 @@ static void vss_get_audio_file(void) { char **sl = selectors[mmd->selector_num].get_audio_file_list(10); int i; + struct stat file_status; if (!sl) goto err_out; @@ -272,27 +257,37 @@ static void vss_get_audio_file(void) PARA_INFO_LOG("trying %s\n", sl[i]); if (strlen(sl[i]) >= _POSIX_PATH_MAX) continue; - audio_file = fopen(sl[i], "r"); - if (!audio_file) + audio_file = open(sl[i], O_RDONLY); + if (audio_file < 0) + continue; + if (fstat(audio_file, &file_status) == -1 || + !file_status.st_size) { + close(audio_file); continue; + } + mmd->size = file_status.st_size; + mmd->mtime = file_status.st_mtime; + map = para_mmap(mmd->size, PROT_READ, MAP_PRIVATE, + audio_file, 0); strcpy(mmd->filename, sl[i]); - if (update_mmd() < 0) { - fclose(audio_file); - audio_file = NULL; + mmd->afi.header_len = 0; /* default: no header */ + if (update_mmd() < 0) { /* invalid file */ + close(audio_file); + munmap(map, mmd->size); + map = NULL; continue; } mmd->num_played++; if (selectors[mmd->selector_num].update_audio_file) selectors[mmd->selector_num].update_audio_file(sl[i]); - PARA_DEBUG_LOG("%s", "success\n"); + PARA_NOTICE_LOG("next audio file: %s\n", mmd->filename); mmd->new_vss_status_flags &= (~VSS_NEXT); gettimeofday(&now, NULL); tv_add(&now, &announce_tv, &data_send_barrier); - goto free; } - PARA_ERROR_LOG("%s", "no valid files found\n"); err_out: + PARA_ERROR_LOG("%s", "no valid files found\n"); mmd->new_vss_status_flags = VSS_NEXT; free: if (sl) { @@ -348,7 +343,7 @@ static struct timeval *vss_compute_timeout(void) if (chk_barrier("data send", &now, &data_send_barrier, &the_timeout, 1) < 0) return &the_timeout; - if (mmd->audio_format < 0 || !vss_playing() || !audio_file) + if (mmd->audio_format < 0 || !vss_playing() || !map) return NULL; vss_next_chunk_time(&next_chunk); if (chk_barrier(afl[mmd->audio_format].name, &now, &next_chunk, @@ -360,13 +355,13 @@ static struct timeval *vss_compute_timeout(void) return &the_timeout; } -static void vss_eof(struct audio_format_handler *af) +static void vss_eof(void) { struct timeval now; int i; char *tmp; - if (!af || !audio_file) { + if (!map) { for (i = 0; senders[i].name; i++) senders[i].shutdown_clients(); return; @@ -374,17 +369,14 @@ 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; + map = NULL; + close(audio_file); mmd->audio_format = -1; - af = NULL; mmd->chunks_sent = 0; mmd->offset = 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->afi.info_string, tmp); @@ -408,12 +400,12 @@ static void vss_eof(struct audio_format_handler *af) * treamtment. * */ -char *vss_get_header(int *header_len) +char *vss_get_header(unsigned *header_len) { - if (mmd->audio_format < 0) + if (mmd->audio_format < 0 || !map || !mmd->afi.header_len) return NULL; *header_len = mmd->afi.header_len; - return mmd->afi.header; + return map + mmd->afi.header_offset; } /** @@ -471,7 +463,7 @@ again: for (i = 0; senders[i].name; i++) senders[i].shutdown_clients(); if (vss_next() && af) { - vss_eof(af); + vss_eof(); return vss_compute_timeout(); } if (vss_paused() || vss_repos()) { @@ -494,7 +486,7 @@ again: mmd->current_chunk = mmd->repos_request; } ret = vss_compute_timeout(); - if (!ret && !audio_file && vss_playing() && + if (!ret && !map && vss_playing() && !(mmd->new_vss_status_flags & VSS_NOMORE)) { PARA_DEBUG_LOG("%s", "ready and playing, but no audio file\n"); vss_get_audio_file(); @@ -516,10 +508,11 @@ void vss_send_chunk(void) { int i; struct audio_format_handler *af; - ssize_t pos, len; + ssize_t pos; + size_t len; struct timeval now, due; - if (mmd->audio_format < 0 || !audio_file || !vss_playing()) + if (mmd->audio_format < 0 || !map || !vss_playing()) return; af = &afl[mmd->audio_format]; gettimeofday(&now, NULL); @@ -534,7 +527,7 @@ void vss_send_chunk(void) mmd->new_vss_status_flags &= ~VSS_REPOS; if (mmd->current_chunk >= mmd->afi.chunks_total) { /* eof */ mmd->new_vss_status_flags |= VSS_NEXT; - return vss_eof(af); + return vss_eof(); } pos = mmd->afi.chunk_table[mmd->current_chunk]; len = mmd->afi.chunk_table[mmd->current_chunk + 1] - pos;