X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=43f2010b21e193655765afd0799f4813f4e8fd69;hp=2cbc5a7197e11ebc0305e97c218976e728745e54;hb=68fd19196e90eee5a8db43d2854c4a3d5f69206b;hpb=1fe76952bf4244b93808da5e8fc45e92d8b37c58

diff --git a/server.c b/server.c
index 2cbc5a71..43f2010b 100644
--- a/server.c
+++ b/server.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1997-2006 Andre Noll <maan@systemlinux.org>
+ * 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
@@ -32,7 +32,7 @@
 #include "server.cmdline.h"
 #include "db.h"
 #include "server.h"
-#include "afs.h"
+#include "vss.h"
 #include "config.h"
 #include "close_on_fork.h"
 #include "send.h"
@@ -42,6 +42,7 @@
 #include "string.h"
 #include "ipc.h"
 #include "fd.h"
+#include "signal.h"
 #include "user_list.h"
 
 /** define the array of error lists needed by para_server */
@@ -50,7 +51,7 @@ INIT_SERVER_ERRLISTS;
 /** shut down non-authorized connections after that many seconds */
 #define ALARM_TIMEOUT 10
 
-/* these are exported to afs.c. command.c and to all selectors */
+/* these are exported to vss.c. command.c and to all selectors */
 struct misc_meta_data *mmd;
 /** the configuration of para_server
  *
@@ -181,8 +182,8 @@ static void shm_init(void)
 	mmd->active_connections = 0;
 	strcpy(mmd->filename, "(none)");
 	mmd->audio_format = -1;
-	mmd->afs_status_flags = AFS_NEXT;
-	mmd->new_afs_status_flags = AFS_NEXT;
+	mmd->vss_status_flags = VSS_NEXT;
+	mmd->new_vss_status_flags = VSS_NEXT;
 	mmd->sender_cmd_data.cmd_num = -1;
 	return;
 err_out:
@@ -359,9 +360,8 @@ static unsigned do_inits(int argc, char **argv)
 	if (conf.daemon_given)
 		daemon_init();
 	init_selector();
-	PARA_NOTICE_LOG("%s", "initializing audio file sender\n");
-	/* audio file sender */
-	afs_init();
+	PARA_NOTICE_LOG("%s", "initializing virtual streaming system\n");
+	vss_init();
 	mmd->server_pid = getpid();
 	setup_signal_handling();
 	mmd_lock();
@@ -410,7 +410,7 @@ static void status_refresh(void)
 
 	if (prev_events != mmd->events)
 		goto out;
-	if (mmd->new_afs_status_flags != mmd->afs_status_flags)
+	if (mmd->new_vss_status_flags != mmd->vss_status_flags)
 		goto out;
 	if (uptime / 60 != prev_uptime / 60)
 		goto out;
@@ -418,7 +418,7 @@ static void status_refresh(void)
 out:
 	prev_uptime = uptime;
 	prev_events = mmd->events;
-	mmd->afs_status_flags = mmd->new_afs_status_flags;
+	mmd->vss_status_flags = mmd->new_vss_status_flags;
 	if (ret) {
 		PARA_DEBUG_LOG("%d events, forcing status update, af = %d\n",
 			mmd->events, mmd->audio_format);
@@ -448,7 +448,7 @@ repeat:
 	/* check socket and signal pipe in any case */
 	para_fd_set(sockfd, &rfds, &max_fileno);
 	para_fd_set(signal_pipe, &rfds, &max_fileno);
-	timeout = afs_preselect();
+	timeout = vss_preselect();
 	status_refresh();
 	for (i = 0; senders[i].name; i++) {
 		if (senders[i].status != SENDER_ON)
@@ -477,7 +477,7 @@ repeat:
 			continue;
 		senders[i].post_select(&rfds, &wfds);
 	}
-	afs_send_chunk();
+	vss_send_chunk();
 	status_refresh();
 	if (FD_ISSET(signal_pipe, &rfds)) {
 		int sig;