X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=vss.c;h=859fd6119a524589fd17f1e316aba4a7942fa600;hp=8e9c17bf48a623bd883274ce5f58dfd6a463f264;hb=77264e47dcd6a606ecff2f86f14359f25ab0eba0;hpb=3450a4ee2962926a58b0e48bb19f8a7544450518 diff --git a/vss.c b/vss.c index 8e9c17bf..859fd611 100644 --- a/vss.c +++ b/vss.c @@ -1,19 +1,7 @@ /* * 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 @@ -27,7 +15,7 @@ #include /* mmap */ #include /* gettimeofday */ #include "server.cmdline.h" -#include "afs.h" +#include "afs_common.h" #include "vss.h" #include "send.h" #include "error.h" @@ -158,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); @@ -166,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); @@ -179,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); } } @@ -268,15 +260,17 @@ static void vss_get_audio_file(void) audio_file = open(sl[i], O_RDONLY); if (audio_file < 0) continue; - if (fstat(audio_file, &file_status) == -1) { + 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(file_status.st_size, PROT_READ, MAP_PRIVATE, + map = para_mmap(mmd->size, PROT_READ, MAP_PRIVATE, audio_file, 0); strcpy(mmd->filename, sl[i]); + mmd->afi.header_len = 0; /* default: no header */ if (update_mmd() < 0) { /* invalid file */ close(audio_file); munmap(map, mmd->size); @@ -383,8 +377,6 @@ static void vss_eof(void) 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(void) * treamtment. * */ -char *vss_get_header(int *header_len) +char *vss_get_header(size_t *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; } /** @@ -503,6 +495,32 @@ again: return ret; } +static void get_chunk(long unsigned chunk_num, char **buf, size_t *len) +{ + size_t pos = mmd->afi.chunk_table[chunk_num]; + *buf = map + pos; + *len = mmd->afi.chunk_table[chunk_num + 1] - pos; +} + +/** + * Get the data of the given chunk. + * + * \param chunk_num The number of the desired chunk. + * \param buf Chunk data. + * \param len Chunk length in bytes. + * + * \return Positive on success, negative on errors. + */ +int vss_get_chunk(long unsigned chunk_num, char **buf, size_t *len) +{ + if (mmd->audio_format < 0 || !map || !vss_playing()) + return -E_CHUNK; + if (chunk_num >= mmd->afi.chunks_total) + return -E_CHUNK; + get_chunk(chunk_num, buf, len); + return 1; +} + /** * main sending function * @@ -516,7 +534,6 @@ void vss_send_chunk(void) { int i; struct audio_format_handler *af; - ssize_t pos, len; struct timeval now, due; if (mmd->audio_format < 0 || !map || !vss_playing()) @@ -536,8 +553,6 @@ void vss_send_chunk(void) mmd->new_vss_status_flags |= VSS_NEXT; return vss_eof(); } - 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. @@ -549,9 +564,12 @@ void vss_send_chunk(void) mmd->offset = tv2ms(&tmp); mmd->events++; } - for (i = 0; senders[i].name; i++) - senders[i].send(mmd->current_chunk, mmd->chunks_sent, - map + pos, len); + for (i = 0; senders[i].name; i++) { + char *buf; + size_t len; + get_chunk(mmd->current_chunk, &buf, &len); + senders[i].send(mmd->current_chunk, mmd->chunks_sent, buf, len); + } mmd->new_vss_status_flags |= VSS_PLAYING; mmd->chunks_sent++; mmd->current_chunk++;