X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=8275ccd0646adaacbd257ab08edcdeedb7e95c7d;hp=c46966ea8e2343f38366b14f34d360dce6d67026;hb=b2917b2a0a68f84da34e7435ad697d798a0260da;hpb=bc6c214340c1760203b24097c2066abfcaa1c539

diff --git a/server.c b/server.c
index c46966ea..8275ccd0 100644
--- a/server.c
+++ b/server.c
@@ -21,8 +21,9 @@
 
 /** \mainpage Paraslash API Reference
  *
- *  Good starting points for reading are probably \ref dbtool, \ref sender,
- *  \ref receiver, \ref receiver_node, \ref filter, \ref filter_node.
+ *  Good starting points for reading are probably \ref audio_file_selector,
+ *  \ref sender, \ref receiver, \ref receiver_node, \ref filter, \ref
+ *  filter_node.
  *
  */
 
@@ -47,11 +48,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,8 +61,8 @@ 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 */
-struct dbtool dblist[] = {
+/** the list of supported audio file selectors */
+struct audio_file_selector dblist[] = {
 	{
 		.name = "random",
 		.init = random_dbtool_init,
@@ -278,41 +279,25 @@ static void setup_signal_handling(void)
 
 static void init_dbtool(void)
 {
-	int i;
+	int i, ret;
 
 	mmd->dbt_change = -1; /* no change nec., set to new dbt num by com_cdt */
-	if (!dblist[1].name)
+	if (!conf.selector_given)
 		goto random;
-	if (conf.dbtool_given) {
-		for (i = 0; dblist[i].name; i++) {
-			if (strcmp(dblist[i].name, conf.dbtool_arg))
-				continue;
-			PARA_NOTICE_LOG("initializing %s database tool\n",
-				dblist[i].name);
-			if (dblist[i].init(&dblist[i]) < 0) {
-				PARA_WARNING_LOG("init %s failed",
-					dblist[i].name);
-				goto random;
-			}
-			mmd->dbt_num = i;
-			return;
-		}
-		PARA_WARNING_LOG("%s", "no such dbtool, switching to random\n");
-		goto random;
-	}
-	/* use the first dbtool that works
-	 * (assuming that random always works)
-	 */
-	for (i = 1; dblist[i].name; i++) {
-		int ret = dblist[i].init(&dblist[i]);
-		if (ret >= 0) {
-			PARA_INFO_LOG("initialized %s\n", dblist[i].name);
-			mmd->dbt_num = i;
-			return;
+	for (i = 0; dblist[i].name; i++) {
+		if (strcmp(dblist[i].name, conf.selector_arg))
+			continue;
+		PARA_NOTICE_LOG("initializing %s audio file selector\n",
+			dblist[i].name);
+		ret = dblist[i].init(&dblist[i]);
+		if (ret < 0) {
+			PARA_WARNING_LOG("%s", PARA_STRERROR(-ret));
+			break;
 		}
-		PARA_CRIT_LOG("%s init failed: %s\n", dblist[i].name,
-			PARA_STRERROR(-ret));
+		mmd->dbt_num = i;
+		return;
 	}
+	PARA_WARNING_LOG("%s", "falling back to the random selector\n");
 random:
 	mmd->dbt_num = 0;
 	dblist[0].init(&dblist[0]); /* always successful */
@@ -397,7 +382,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;
 }
@@ -411,8 +396,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)