X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=random_selector.c;h=bcbdae692b09269d46ffb370be6a139fab8540f5;hp=5d8b386c6f433d68ef55b589bbe077df41c9331b;hb=a8509af9116e9a045ace70ff312e40569c5ace16;hpb=c39956768e5a7e4bc8c0124b216afbdadf3c0262 diff --git a/random_selector.c b/random_selector.c index 5d8b386c..bcbdae69 100644 --- a/random_selector.c +++ b/random_selector.c @@ -1,27 +1,17 @@ /* * 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 */ #include /* gettimeofday */ +#include "para.h" #include "server.cmdline.h" +#include "afh.h" #include "server.h" -#include "db.h" +#include "afs_common.h" #include "error.h" #include "net.h" #include "string.h" @@ -48,7 +38,7 @@ static int remember_file(const char *dir, const char *name) return 1; } -int com_random_info(int fd, __a_unused int argc, __a_unused char *argv[]) +int com_random_info(int fd, __a_unused int argc, __a_unused char * const * const argv) { return send_buffer(fd, "Don't use for huge directories as it is " "very inefficient in this case.\n"); @@ -133,10 +123,12 @@ static void random_shutdown(void) 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;