X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=vss.c;h=3db8bb446f447dbe4e2441af67f6c5944eb15ac8;hp=94134b515bcebebaf1410d8afbbc2c8ecb06b0ed;hb=43ae54ccb178332180b2e79ee0d6e1a15570de0b;hpb=5e5f74a84cb23f5584e799e09ff76ea50f9a35fe diff --git a/vss.c b/vss.c index 94134b51..3db8bb44 100644 --- a/vss.c +++ b/vss.c @@ -24,7 +24,6 @@ #include "server.h" #include "net.h" #include "server.cmdline.h" -#include "afs_common.h" #include "vss.h" #include "send.h" #include "ipc.h" @@ -38,72 +37,10 @@ static struct timeval eof_barrier; static struct timeval autoplay_barrier; extern struct misc_meta_data *mmd; -extern struct audio_file_selector selectors[]; extern struct sender senders[]; -static int audio_file; static char *map; -/* The mp3 audio format handler does not need any libs. */ -void mp3_init(struct audio_format_handler *); - -#ifdef HAVE_OGGVORBIS - void ogg_init(struct audio_format_handler *); -#endif -#ifdef HAVE_FAAD - void aac_afh_init(struct audio_format_handler *); -#endif - -/** - * The list of supported audio formats. - * - * We always define the full array of audio formats even if some audio formats - * were not compiled in. This is because for each audio file the number of its - * audio format is stored in the databse. We don't want that numbers to become - * stale just because the user installed a new version of paraslash that - * supports a different set of audio formats. - * - * It can still be easily detected whether an audio format is compiled in by - * checking if the init function pointer is not \p NULL. - */ -static struct audio_format_handler afl[] = { - { - .name = "mp3", - .init = mp3_init, - }, - { - .name = "ogg", -#ifdef HAVE_OGGVORBIS - .init = ogg_init, -#endif - }, - { - .name = "aac", -#ifdef HAVE_FAAD - .init = aac_afh_init, -#endif - }, - { - .name = NULL, - } -}; - -static inline int next_audio_format(int format) -{ - for (;;) { - if (!afl[format].name) - return format; - format++; - if (afl[format].init) - return format; - } - -} - -/** Iterate over each supported audio format. */ -#define FOR_EACH_AUDIO_FORMAT(i) for (i = 0; afl[i].name; i = next_audio_format(i)) - - /** * check if vss status flag \a P (playing) is set * @@ -149,34 +86,6 @@ unsigned int vss_paused(void) && !(mmd->new_vss_status_flags & VSS_PLAYING); } -/** - * Get the name of the given audio format. - * - * \param i The audio format number. - * - * This returns a pointer to statically allocated memory so it - * must not be freed by the caller. - */ -const char *audio_format_name(int i) -{ - //PARA_NOTICE_LOG("array size: %u¸ requested: %d\n", ARRAY_SIZE(afl), i); - assert(i < 0 || i < ARRAY_SIZE(afl) - 1); - return i >= 0? afl[i].name : "(none)"; -} - -static void afh_init(void) -{ - int i; - - PARA_DEBUG_LOG("supported audio formats: %s\n", - SUPPORTED_AUDIO_FORMATS); - FOR_EACH_AUDIO_FORMAT(i) { - PARA_NOTICE_LOG("initializing %s handler\n", - audio_format_name(i)); - afl[i].init(&afl[i]); - } -} - /** * initialize the virtual streaming system * @@ -191,7 +100,6 @@ void vss_init(void) conf.announce_time_arg : 300, autoplay_delay = conf.autoplay_delay_arg > 0? conf.autoplay_delay_arg : 0; - afh_init(); ms2tv(announce_time, &announce_tv); PARA_INFO_LOG("announce timeval: %lums\n", tv2ms(&announce_tv)); for (i = 0; senders[i].name; i++) { @@ -210,75 +118,6 @@ void vss_init(void) } } -/** - * guess the audio format judging from filename - * - * \param name the filename - * - * \return This function returns -1 if it has no idea what kind of audio - * file this might be. Otherwise the (non-negative) number of the audio format - * is returned. - */ -int guess_audio_format(const char *name) -{ - int i,j, len = strlen(name); - - FOR_EACH_AUDIO_FORMAT(i) { - for (j = 0; afl[i].suffixes[j]; j++) { - const char *p = afl[i].suffixes[j]; - int plen = strlen(p); - if (len < plen + 1) - continue; - if (name[len - plen - 1] != '.') - continue; - if (strcasecmp(name + len - plen, p)) - continue; -// PARA_DEBUG_LOG("might be %s\n", audio_format_name(i)); - return i; - } - } - return -E_BAD_AUDIO_FILE_SUFFIX; -} - -/** - * Call get_file_info() to obtain an afhi structure. - * - * \param path The full path of the audio file. - * \param data Pointer to the contents of the (mapped) file. - * \param size The file size in bytes. - * \param afhi Result pointer. - * - * \return The number of the audio format on success, \p -E_AUDIO_FORMAT if no - * compiled in audio format handler is able to handler the file. - * - * This function tries to find an audio format handler that can interpret the - * file given by \a data and \a size. - * - * It first tries to determine the audio format from the filename given by \a - * path. If this doesn't work, all other audio format handlers are tried until - * one is found that can handle the file. - */ -int compute_afhi(const char *path, char *data, size_t size, - struct audio_format_info *afhi) -{ - int ret, i, format = guess_audio_format(path); - - if (format >= 0) { - ret = afl[format].get_file_info(data, size, afhi); - if (ret >= 0) - return format; - } - FOR_EACH_AUDIO_FORMAT(i) { - if (i == format) /* we already tried this one to no avail */ - continue; - ret = afl[i].get_file_info(data, size, afhi); - if (ret >= 0) - return i; - PARA_WARNING_LOG("%s\n", PARA_STRERROR(-ret)); - } - return -E_AUDIO_FORMAT; -} - static int chk_barrier(const char *bname, const struct timeval *now, const struct timeval *barrier, struct timeval *diff, int print_log) @@ -353,7 +192,6 @@ static void vss_eof(void) tv_add(&mmd->afi.eof_tv, &now, &eof_barrier); munmap(map, mmd->size); map = NULL; - close(audio_file); mmd->audio_format = -1; mmd->chunks_sent = 0; mmd->offset = 0; @@ -549,6 +387,7 @@ static void recv_afs_result(void) mmd->afd.afhi.chunks_total); ret = fstat(passed_fd, &statbuf); if (ret < 0) { + PARA_ERROR_LOG("fstat error:\n"); ret = -ERRNO_TO_PARA_ERROR(errno); goto err; } @@ -556,6 +395,7 @@ static void recv_afs_result(void) mmd->mtime = statbuf.st_mtime; map = para_mmap(mmd->size, PROT_READ, MAP_PRIVATE, passed_fd, 0); + close(passed_fd); strcpy(mmd->filename, mmd->afd.path); /* FIXME: check length */ mmd->afi.header_len = 0; /* default: no header */ mmd->audio_format = mmd->afd.afsi.audio_format_id;