X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=server.c;h=005a29b63219e20f8c78a57f279cd42403bc7bd7;hb=7a51f686d02cf4b2463d9aee2ca79addea4261f5;hp=ab88b07fbd60827e56299c2338acc7cb9e3a541d;hpb=08a1de75a3a83c728d97a3c4ff182553adbda8cc;p=paraslash.git

diff --git a/server.c b/server.c
index ab88b07f..005a29b6 100644
--- a/server.c
+++ b/server.c
@@ -22,7 +22,6 @@
 #include "para.h"
 #include "error.h"
 #include "server.cmdline.h"
-#include "afs_common.h"
 #include "afh.h"
 #include "string.h"
 #include "afs.h"
@@ -148,14 +147,12 @@ static void shm_init(void)
 		goto err_out;
 	mmd_mutex = ret;
 
-	mmd->selector_num = 0;
 	mmd->num_played = 0;
 	mmd->num_commands = 0;
 	mmd->events = 0;
 	mmd->num_connects = 0;
 	mmd->active_connections = 0;
 	strcpy(mmd->filename, "(none)");
-	mmd->audio_format = -1;
 	mmd->vss_status_flags = VSS_NEXT;
 	mmd->new_vss_status_flags = VSS_NEXT;
 	mmd->sender_cmd_data.cmd_num = -1;
@@ -345,8 +342,6 @@ static unsigned do_inits(int argc, char **argv)
 	/* become daemon */
 	if (conf.daemon_given)
 		daemon_init();
-//	init_selector();
-//	PARA_ERROR_LOG("num: %d\n", mmd->selector_num);
 	PARA_NOTICE_LOG("%s", "initializing virtual streaming system\n");
 	afh_init();
 	vss_init();
@@ -392,8 +387,8 @@ out:
 	prev_events = mmd->events;
 	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);
+		PARA_DEBUG_LOG("%d events, forcing status update\n",
+			mmd->events);
 		killpg(0, SIGUSR1);
 	}
 }