X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=d881868c09cc826e561c2d7d49b5bb03de8fd4ea;hp=e78b73f4fd222f2f9029b6658f671e9b6906c901;hb=9f10e6742ffc2ac5e4bf6224e1ff882074c7ca45;hpb=27a031aac0ed4d7b4e45b67afa3cbbb2b7ddb207

diff --git a/server.c b/server.c
index e78b73f4..d881868c 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.
  *
  */
 
@@ -61,15 +62,15 @@ extern void ortp_send_init(struct sender *);
 extern struct audio_format afl[];
 
 /** the list of supported audio file selectors */
-struct dbtool dblist[] = {
+struct audio_file_selector dblist[] = {
 	{
 		.name = "random",
-		.init = random_dbtool_init,
+		.init = random_selector_init,
 		.update_audio_file = NULL,
 	},
 	{
-		.name = "plm",
-		.init = plm_dbtool_init,
+		.name = "playlist",
+		.init = playlist_selector_init,
 		.update_audio_file = NULL,
 		.pre_select = NULL,
 		.post_select = NULL,
@@ -77,7 +78,7 @@ struct dbtool dblist[] = {
 #ifdef HAVE_MYSQL
 	{
 		.name = "mysql",
-		.init = mysql_dbtool_init,
+		.init = mysql_selector_init,
 		.update_audio_file = NULL,
 		.pre_select = NULL,
 		.post_select = NULL,
@@ -276,7 +277,7 @@ static void setup_signal_handling(void)
 	}
 }
 
-static void init_dbtool(void)
+static void init_selector(void)
 {
 	int i, ret;
 
@@ -351,7 +352,7 @@ static unsigned do_inits(int argc, char **argv)
 	/* become daemon */
 	if (conf.daemon_given)
 		daemon_init();
-	init_dbtool();
+	init_selector();
 	PARA_NOTICE_LOG("%s", "initializing audio file sender\n");
 	/* audio file sender */
 	afs_init();