/*
* Copyright (C) 1997-2007 Andre Noll <maan@systemlinux.org>
*
- * 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
{
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);
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);
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);
}
}
}
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);
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);
* 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;
}
/**
{
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 || !map || !vss_playing())