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

diff --git a/server.c b/server.c
index 8275ccd0..d881868c 100644
--- a/server.c
+++ b/server.c
@@ -65,12 +65,12 @@ extern struct audio_format afl[];
 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,
@@ -78,7 +78,7 @@ struct audio_file_selector dblist[] = {
 #ifdef HAVE_MYSQL
 	{
 		.name = "mysql",
-		.init = mysql_dbtool_init,
+		.init = mysql_selector_init,
 		.update_audio_file = NULL,
 		.pre_select = NULL,
 		.post_select = NULL,
@@ -277,7 +277,7 @@ static void setup_signal_handling(void)
 	}
 }
 
-static void init_dbtool(void)
+static void init_selector(void)
 {
 	int i, ret;
 
@@ -352,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();