X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=e78b73f4fd222f2f9029b6658f671e9b6906c901;hp=538d201b78a4a69a23467f94fef595933f8f802b;hb=27a031aac0ed4d7b4e45b67afa3cbbb2b7ddb207;hpb=91c9e7bc373465599b220f03d17a61f814c0303b;ds=sidebyside

diff --git a/server.c b/server.c
index 538d201b..e78b73f4 100644
--- a/server.c
+++ b/server.c
@@ -47,11 +47,11 @@ INIT_SERVER_ERRLISTS;
 /** shut down non-authorized connections after that many seconds */
 #define ALARM_TIMEOUT 10
 
-/* these are exported to afs/command/dbtool */
+/* these are exported to afs.c. command.c and to all selectors */
 struct misc_meta_data *mmd;
 /** the configuration of para_server
  *
- * It also contains the options for all database tools and all supported
+ * It also contains the options for all audio file selectors and all supported
  * senders.
 */
 struct gengetopt_args_info conf;
@@ -60,7 +60,7 @@ extern void http_send_init(struct sender *);
 extern void ortp_send_init(struct sender *);
 extern struct audio_format afl[];
 
-/** the list of supported database tools */
+/** the list of supported audio file selectors */
 struct dbtool dblist[] = {
 	{
 		.name = "random",
@@ -281,12 +281,12 @@ static void init_dbtool(void)
 	int i, ret;
 
 	mmd->dbt_change = -1; /* no change nec., set to new dbt num by com_cdt */
-	if (!conf.dbtool_given)
+	if (!conf.selector_given)
 		goto random;
 	for (i = 0; dblist[i].name; i++) {
-		if (strcmp(dblist[i].name, conf.dbtool_arg))
+		if (strcmp(dblist[i].name, conf.selector_arg))
 			continue;
-		PARA_NOTICE_LOG("initializing %s database tool\n",
+		PARA_NOTICE_LOG("initializing %s audio file selector\n",
 			dblist[i].name);
 		ret = dblist[i].init(&dblist[i]);
 		if (ret < 0) {
@@ -296,7 +296,7 @@ static void init_dbtool(void)
 		mmd->dbt_num = i;
 		return;
 	}
-	PARA_WARNING_LOG("%s", "falling back to the random dbtool\n");
+	PARA_WARNING_LOG("%s", "falling back to the random selector\n");
 random:
 	mmd->dbt_num = 0;
 	dblist[0].init(&dblist[0]); /* always successful */
@@ -381,7 +381,7 @@ static void handle_dbt_change(void)
 		return;
 	}
 	/* init failed */
-	PARA_ERROR_LOG("%s -- switching to the random dbtool\n", PARA_STRERROR(-ret));
+	PARA_ERROR_LOG("%s -- switching to the random selector\n", PARA_STRERROR(-ret));
 	dblist[0].init(&dblist[0]);
 	mmd->dbt_num = 0;
 }
@@ -395,8 +395,8 @@ static void handle_sighup(void)
 	close_log(logfile); /* gets reopened if necessary by parse_config */
 	logfile = NULL;
 	parse_config(1); /* reopens log */
-	mmd->dbt_change = mmd->dbt_num; /* do not change dbtool */
-	handle_dbt_change(); /* force reloading dbtool */
+	mmd->dbt_change = mmd->dbt_num; /* do not change selector */
+	handle_dbt_change(); /* reload selector */
 }
 
 static void status_refresh(void)