X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=f86fb8b26b6111d2acacaeccceb108424441f616;hp=d16675be7a53373b9f2bb442091d2c5a92c30ab9;hb=ecff9e8a5b4e4c3c9fbf7f9c2f86067285d66ecc;hpb=5244fcecf39219c7ccca0b94355de054fbef91d4

diff --git a/server.c b/server.c
index d16675be..f86fb8b2 100644
--- a/server.c
+++ b/server.c
@@ -32,7 +32,7 @@
  *	- dccp: \ref dccp_recv.c, \ref dccp_send.c,
  *	- Audio file selector: \ref afs.c, \ref aft.c, \ref mood.c,
  *	- Afs structures: \ref afs_table, \ref audio_file_data,
- *	  \ref afs_info \ref audio_format_info,
+ *	  \ref afs_info \ref afh_info,
  *	- Afs tables: \ref aft.c, \ref mood.c, \ref playlist.c,
  *	  \ref attribute.c, \ref score.c,
  *	- The virtual streaming system: \ref vss.c, \ref chunk_queue.c.
@@ -370,7 +370,7 @@ static void init_afs(void)
 }
 
 
-static unsigned do_inits(int argc, char **argv)
+static unsigned server_init(int argc, char **argv)
 {
 	/* connector's address information */
 	int sockfd;
@@ -389,17 +389,19 @@ static unsigned do_inits(int argc, char **argv)
 	/* become daemon */
 	if (conf.daemon_given)
 		daemon_init();
-	PARA_NOTICE_LOG("%s", "initializing virtual streaming system\n");
+	PARA_NOTICE_LOG("initializing audio format handlers\n");
 	afh_init();
+	PARA_NOTICE_LOG("initializing virtual streaming system\n");
 	vss_init();
 	mmd->server_pid = getpid();
 	setup_signal_handling();
+	PARA_NOTICE_LOG("initializing the audio file selector\n");
 	init_afs();
 	mmd_lock();
 	/* init network socket */
-	PARA_NOTICE_LOG("%s", "initializing tcp command socket\n");
+	PARA_NOTICE_LOG("initializing tcp command socket\n");
 	sockfd = init_network();
-	PARA_NOTICE_LOG("%s", "init complete\n");
+	PARA_NOTICE_LOG("server init complete\n");
 	return sockfd;
 }
 
@@ -460,7 +462,7 @@ int main(int argc, char *argv[])
 	struct timeval *timeout;
 
 	valid_fd_012();
-	sockfd = do_inits(argc, argv);
+	sockfd = server_init(argc, argv);
 repeat:
 	FD_ZERO(&rfds);
 	FD_ZERO(&wfds);