X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=afs.c;h=cea8f2707491f00bab0f457a3463fd4762147a21;hb=9055c71be97f1095dcdbd83da305b600f204f763;hp=b017a7afcc0f01030f70e9f3133b27003f530ee3;hpb=513731227550737966bf05f724aef4ff26c0b9a7;p=paraslash.git

diff --git a/afs.c b/afs.c
index b017a7af..cea8f270 100644
--- a/afs.c
+++ b/afs.c
@@ -100,7 +100,7 @@ extern uint32_t afs_socket_cookie;
  */
 struct callback_query {
 	/** The function to be called. */
-	afs_callback *handler;
+	afs_callback *cb;
 	/** The number of bytes of the query */
 	size_t query_size;
 };
@@ -191,7 +191,7 @@ int send_callback_request(afs_callback *f, struct osl_object *query,
 	if (ret < 0)
 		goto out;
 	cq = query_shm;
-	cq->handler = f;
+	cq->cb = f;
 	cq->query_size = query_shm_size - sizeof(*cq);
 
 	if (query)
@@ -431,37 +431,30 @@ no_admissible_files:
 	return write_all(server_socket, buf, 8);
 }
 
-static int activate_mood_or_playlist(const char *arg, int *num_admissible,
-		char **errmsg)
+static int activate_mood_or_playlist(const char *arg, struct para_buffer *pb)
 {
 	enum play_mode mode;
 	int ret;
+	char *msg;
 
 	if (!arg) {
+		ret = mood_load(NULL, &msg);
+		mode = PLAY_MODE_MOOD;
+	} else if (!strncmp(arg, "p/", 2)) {
+		ret = playlist_load(arg + 2, &msg);
+		mode = PLAY_MODE_PLAYLIST;
+	} else if (!strncmp(arg, "m/", 2)) {
+		ret = mood_load(arg + 2, &msg);
 		mode = PLAY_MODE_MOOD;
-		ret = mood_switch(NULL, errmsg);
-		if (ret < 0) {
-			if (num_admissible)
-				*num_admissible = 0;
-			return ret;
-		}
 	} else {
-		if (!strncmp(arg, "p/", 2)) {
-			ret = playlist_open(arg + 2, errmsg);
-			mode = PLAY_MODE_PLAYLIST;
-		} else if (!strncmp(arg, "m/", 2)) {
-			ret = mood_switch(arg + 2, errmsg);
-			mode = PLAY_MODE_MOOD;
-		} else {
-			if (errmsg)
-				*errmsg = make_message("%s: parse error", arg);
-			return -ERRNO_TO_PARA_ERROR(EINVAL);
-		}
-		if (ret < 0)
-			return ret;
+		ret = -ERRNO_TO_PARA_ERROR(EINVAL);
+		msg = make_message("%s: parse error", arg);
 	}
-	if (num_admissible)
-		*num_admissible = ret;
+	if (pb)
+		para_printf(pb, "%s", msg);
+	free(msg);
+	if (ret < 0)
+		return ret;
 	current_play_mode = mode;
 	/*
 	 * We get called with arg == current_mop from the signal dispatcher
@@ -536,46 +529,30 @@ static int com_select_callback(struct afs_callback_arg *aca)
 {
 	const struct lls_command *cmd = SERVER_CMD_CMD_PTR(SELECT);
 	const char *arg;
-	int num_admissible, ret;
-	char *errmsg;
+	int ret;
 
 	ret = lls_deserialize_parse_result(aca->query.data, cmd, &aca->lpr);
 	assert(ret >= 0);
 	arg = lls_input(0, aca->lpr);
-	ret = clear_score_table();
-	if (ret < 0) {
-		para_printf(&aca->pbout, "could not clear score table\n");
-		goto free_lpr;
-	}
+	score_clear();
 	if (current_play_mode == PLAY_MODE_MOOD)
-		close_current_mood();
+		mood_unload();
 	else
-		playlist_close();
-	ret = activate_mood_or_playlist(arg, &num_admissible, &errmsg);
+		playlist_unload();
+	ret = activate_mood_or_playlist(arg, &aca->pbout);
 	if (ret >= 0)
-		goto out;
+		goto free_lpr;
 	/* ignore subsequent errors (but log them) */
-	para_printf(&aca->pbout, "%s\n", errmsg);
-	free(errmsg);
-	para_printf(&aca->pbout, "could not activate %s\n", arg);
 	if (current_mop && strcmp(current_mop, arg) != 0) {
 		int ret2;
 		para_printf(&aca->pbout, "switching back to %s\n", current_mop);
-		ret2 = activate_mood_or_playlist(current_mop, &num_admissible,
-			&errmsg);
+		ret2 = activate_mood_or_playlist(current_mop, &aca->pbout);
 		if (ret2 >= 0)
-			goto out;
-		para_printf(&aca->pbout, "%s\n", errmsg);
-		free(errmsg);
+			goto free_lpr;
 		para_printf(&aca->pbout, "could not reactivate %s: %s\n",
 			current_mop, para_strerror(-ret2));
 	}
-	para_printf(&aca->pbout, "activating dummy mood\n");
-	activate_mood_or_playlist(NULL, &num_admissible, NULL);
-out:
-	para_printf(&aca->pbout, "activated %s (%d admissible file%s)\n",
-		current_mop? current_mop : "dummy mood", num_admissible,
-			num_admissible == 1? "" : "s");
+	activate_mood_or_playlist(NULL, &aca->pbout);
 free_lpr:
 	lls_free_parse_result(aca->lpr, cmd);
 	return ret;
@@ -597,12 +574,12 @@ EXPORT_SERVER_CMD_HANDLER(select);
 
 static void init_admissible_files(const char *arg)
 {
-	int ret = activate_mood_or_playlist(arg, NULL, NULL);
+	int ret = activate_mood_or_playlist(arg, NULL);
 	if (ret < 0) {
 		PARA_WARNING_LOG("could not activate %s: %s\n", arg,
 			para_strerror(-ret));
 		if (arg)
-			activate_mood_or_playlist(NULL, NULL, NULL);
+			activate_mood_or_playlist(NULL, NULL);
 	}
 }
 
@@ -817,7 +794,7 @@ static int call_callback(int fd, int query_shmid)
 		.fd = fd,
 		.band = SBD_OUTPUT
 	};
-	ret = cq->handler(&aca);
+	ret = cq->cb(&aca);
 	ret2 = shm_detach(query_shm);
 	if (ret2 < 0) {
 		if (ret < 0) /* ignore (but log) detach error */
@@ -995,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: