Rename mood_switch(), mood_close(), playlist_{open/close}.

[paraslash.git] / afs.c

diff --git a/afs.c b/afs.c
index b2cdb6c46ef85a7526538342b27604456e7cf648..cea8f2707491f00bab0f457a3463fd4762147a21 100644 (file)
--- a/afs.c
+++ b/afs.c
@@ -438,13 +438,13 @@ static int activate_mood_or_playlist(const char *arg, struct para_buffer *pb)
        char *msg;
 
        if (!arg) {
-               ret = mood_switch(NULL, &msg);
+               ret = mood_load(NULL, &msg);
                mode = PLAY_MODE_MOOD;
        } else if (!strncmp(arg, "p/", 2)) {
-               ret = playlist_open(arg + 2, &msg);
+               ret = playlist_load(arg + 2, &msg);
                mode = PLAY_MODE_PLAYLIST;
        } else if (!strncmp(arg, "m/", 2)) {
-               ret = mood_switch(arg + 2, &msg);
+               ret = mood_load(arg + 2, &msg);
                mode = PLAY_MODE_MOOD;
        } else {
                ret = -ERRNO_TO_PARA_ERROR(EINVAL);
@@ -536,9 +536,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)
-               close_current_mood();
+               mood_unload();
        else
-               playlist_close();
+               playlist_unload();
        ret = activate_mood_or_playlist(arg, &aca->pbout);
        if (ret >= 0)
                goto free_lpr;
@@ -972,7 +972,7 @@ __noreturn void afs_init(int socket_fd)
        }
        ret = schedule(&s);
        sched_shutdown(&s);
-       close_current_mood();
+       mood_unload();
 out_close:
        close_afs_tables();
 out: