X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=afs.c;h=3083084c25ac793cfd3a5cad1f93c6e78f0fa413;hb=4345aa176aecdbd9a876e7efdcc034acd29616a7;hp=865effde671a4848298ab09d502898c6225a937c;hpb=420a1f30cc06482f36371d096635846f8800e198;p=paraslash.git

diff --git a/afs.c b/afs.c
index 865effde..3083084c 100644
--- a/afs.c
+++ b/afs.c
@@ -437,14 +437,14 @@ 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);
@@ -951,8 +951,8 @@ __noreturn void afs_init(int socket_fd)
 	}
 	ret = schedule(&s);
 	sched_shutdown(&s);
-	mood_unload();
-	playlist_unload();
+	mood_unload(NULL);
+	playlist_unload(NULL);
 out_close:
 	close_afs_tables();
 out:
@@ -976,9 +976,9 @@ static int com_select_callback(struct afs_callback_arg *aca)
 	arg = lls_input(0, aca->lpr);
 	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, &aca->pbout);
 	if (ret >= 0)
 		goto free_lpr;