Move afh_init() call from vss.c to server.c.
authorAndre Noll <maan@systemlinux.org>
Mon, 22 Oct 2007 23:14:32 +0000 (01:14 +0200)
committerAndre Noll <maan@systemlinux.org>
Mon, 22 Oct 2007 23:14:32 +0000 (01:14 +0200)
server.c
vss.c

index 5777ec4..3cc7e78 100644 (file)
--- a/server.c
+++ b/server.c
@@ -403,6 +403,7 @@ static unsigned do_inits(int argc, char **argv)
        init_selector();
 //     PARA_ERROR_LOG("num: %d\n", mmd->selector_num);
        PARA_NOTICE_LOG("%s", "initializing virtual streaming system\n");
+       afh_init();
        vss_init();
        mmd->server_pid = getpid();
        setup_signal_handling();
diff --git a/vss.c b/vss.c
index 3d54f16..0bc2aed 100644 (file)
--- a/vss.c
+++ b/vss.c
@@ -38,7 +38,6 @@ 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;
@@ -103,7 +102,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++) {