X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=random_selector.c;h=bef1b7fdb96bdcd0e35c540f9c82d0c179929590;hp=4c803d8459f2059fba58a489d6fe72da9c26262d;hb=28ca8e57ce76f5496f0d1ba143ec2c1c725bc90a;hpb=10756ea9adc1b757ef1ccf2149bda9771923637c diff --git a/random_selector.c b/random_selector.c index 4c803d84..bef1b7fd 100644 --- a/random_selector.c +++ b/random_selector.c @@ -1,19 +1,7 @@ /* * Copyright (C) 2004-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 random_selector.c An audio file selector which chooses files by random */ @@ -21,7 +9,7 @@ #include /* gettimeofday */ #include "server.cmdline.h" #include "server.h" -#include "db.h" +#include "afs.h" #include "error.h" #include "net.h" #include "string.h" @@ -106,7 +94,7 @@ out: return ret_list; } -void random_update_audio_file(char *audio_file) +static void random_update_audio_file(char *audio_file) { char *dn = para_dirname(audio_file); snprintf(mmd->selector_info, MMD_INFO_SIZE - 1, @@ -122,20 +110,23 @@ static void random_shutdown(void) } /** - * the init function for the random audio file selector + * the init function for the random audio file selector + * + * \param s pointer ro the struct to iniitalize * - * Init all function pointers of \a s, init the info text and seed the - * PRNG. + * Init all function pointers of \a s, init the info text and seed the PRNG. * * \sa struct audio_file_selector, misc_meta_data::selector_info, mysql.c */ int random_selector_init(struct audio_file_selector *s) { struct timeval now; + unsigned int seed; PARA_INFO_LOG("%s", "registering random handlers ;)\n"); gettimeofday(&now, NULL); - srand(now.tv_usec); + seed = now.tv_usec; + srand(seed); s->cmd_list = random_selector_cmds; s->get_audio_file_list = random_get_audio_file_list; s->shutdown = random_shutdown;