X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=afs.c;fp=afs.c;h=445d5871097b79cdcd14170c2a1f59998354dc98;hb=101dcb49997b393280c10ba5a1cfc11e8fe0a091;hp=cb3ead27e55d43df0d7230f2ca404499439348ec;hpb=1f31fcdd74ab1aab01cbc70942f9d69bb779156a;p=paraslash.git

diff --git a/afs.c b/afs.c
index cb3ead27..445d5871 100644
--- a/afs.c
+++ b/afs.c
@@ -437,18 +437,18 @@ static int activate_mood_or_playlist(const char *arg, struct para_buffer *pb)
 	int ret;
 	char *msg;
 
-	if (!arg) {
-		ret = mood_load(NULL, &msg);
+	if (!arg) { /* load dummy mood */
+		ret = mood_load(NULL, NULL, &msg);
 		mode = PLAY_MODE_MOOD;
 	} else if (!strncmp(arg, "p/", 2)) {
-		ret = playlist_load(arg + 2, &msg);
+		ret = playlist_load(arg + 2, NULL, &msg);
 		mode = PLAY_MODE_PLAYLIST;
 	} else if (!strncmp(arg, "m/", 2)) {
-		ret = mood_load(arg + 2, &msg);
+		ret = mood_load(arg + 2, NULL, &msg);
 		mode = PLAY_MODE_MOOD;
 	} else {
 		ret = -ERRNO_TO_PARA_ERROR(EINVAL);
-		msg = make_message("%s: parse error", arg);
+		msg = make_message("%s: parse error\n", arg);
 	}
 	if (pb)
 		para_printf(pb, "%s", msg);
@@ -580,17 +580,6 @@ static void get_database_dir(void)
 	PARA_INFO_LOG("afs_database dir %s\n", database_dir);
 }
 
-static int make_database_dir(void)
-{
-	int ret;
-
-	get_database_dir();
-	ret = para_mkdir(database_dir, 0777);
-	if (ret >= 0 || ret == -ERRNO_TO_PARA_ERROR(EEXIST))
-		return 1;
-	return ret;
-}
-
 static int open_afs_tables(void)
 {
 	int i, ret;
@@ -962,7 +951,8 @@ __noreturn void afs_init(int socket_fd)
 	}
 	ret = schedule(&s);
 	sched_shutdown(&s);
-	mood_unload();
+	mood_unload(NULL);
+	playlist_unload(NULL);
 out_close:
 	close_afs_tables();
 out:
@@ -989,9 +979,9 @@ static int com_select_callback(struct afs_callback_arg *aca)
 		&aca->pbout : NULL;
 	score_clear();
 	if (current_play_mode == PLAY_MODE_MOOD)
-		mood_unload();
+		mood_unload(NULL);
 	else
-		playlist_unload();
+		playlist_unload(NULL);
 	ret = activate_mood_or_playlist(arg, pbout);
 	if (ret >= 0)
 		goto free_lpr;
@@ -1064,7 +1054,8 @@ static int com_init(struct command_context *cc, struct lls_parse_result *lpr)
 		.size = sizeof(table_mask)};
 	unsigned num_inputs = lls_num_inputs(lpr);
 
-	ret = make_database_dir();
+	get_database_dir();
+	ret = para_mkdir(database_dir);
 	if (ret < 0)
 		return ret;
 	if (num_inputs > 0) {