X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afs.c;h=a8c504f460d4f10a67422fcca2adc2ba25478a80;hp=59595567fcd6c7b4f7c66c49bfb2e3183cd73283;hb=23af03dbfb283045ff952267ee83c2b7f2ef6380;hpb=6811b2f8ea8b7a8c77046285c9432aee6327da80

diff --git a/afs.c b/afs.c
index 59595567..a8c504f4 100644
--- a/afs.c
+++ b/afs.c
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 2007 Andre Noll <maan@tuebingen.mpg.de>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 2007 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 
 /** \file afs.c Paraslash's audio file selector. */
 
@@ -466,23 +462,30 @@ no_admissible_files:
 }
 
 /* Never fails if arg == NULL */
-static int activate_mood_or_playlist(const char *arg, int *num_admissible)
+static int activate_mood_or_playlist(const char *arg, int *num_admissible,
+		char **errmsg)
 {
 	enum play_mode mode;
 	int ret;
 
 	if (!arg) {
-		ret = change_current_mood(NULL); /* always successful */
+		ret = change_current_mood(NULL, NULL); /* always successful */
 		mode = PLAY_MODE_MOOD;
 	} else {
 		if (!strncmp(arg, "p/", 2)) {
 			ret = playlist_open(arg + 2);
+			if (ret < 0 && errmsg)
+				*errmsg = make_message( "could not open %s",
+					arg);
 			mode = PLAY_MODE_PLAYLIST;
 		} else if (!strncmp(arg, "m/", 2)) {
-			ret = change_current_mood(arg + 2);
+			ret = change_current_mood(arg + 2, errmsg);
 			mode = PLAY_MODE_MOOD;
-		} else
-			return -E_AFS_SYNTAX;
+		} else {
+			if (errmsg)
+				*errmsg = make_message("%s: parse error", arg);
+			return -ERRNO_TO_PARA_ERROR(EINVAL);
+		}
 		if (ret < 0)
 			return ret;
 	}
@@ -497,10 +500,12 @@ static int activate_mood_or_playlist(const char *arg, int *num_admissible)
 			strncpy(mmd->afs_mode_string, arg,
 				sizeof(mmd->afs_mode_string));
 			mmd->afs_mode_string[sizeof(mmd->afs_mode_string) - 1] = '\0';
+			mmd->events++;
 			mutex_unlock(mmd_mutex);
 		} else {
 			mutex_lock(mmd_mutex);
 			strcpy(mmd->afs_mode_string, "dummy");
+			mmd->events++;
 			mutex_unlock(mmd_mutex);
 			current_mop = NULL;
 		}
@@ -562,6 +567,7 @@ 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;
 
 	ret = lls_deserialize_parse_result(aca->query.data, cmd, &aca->lpr);
 	assert(ret >= 0);
@@ -575,22 +581,27 @@ static int com_select_callback(struct afs_callback_arg *aca)
 		close_current_mood();
 	else
 		playlist_close();
-	ret = activate_mood_or_playlist(arg, &num_admissible);
+	ret = activate_mood_or_playlist(arg, &num_admissible, &errmsg);
 	if (ret >= 0)
 		goto out;
 	/* 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) {
+	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);
+		ret2 = activate_mood_or_playlist(current_mop, &num_admissible,
+			&errmsg);
 		if (ret2 >= 0)
 			goto out;
+		para_printf(&aca->pbout, "%s\n", errmsg);
+		free(errmsg);
 		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);
+	activate_mood_or_playlist(NULL, &num_admissible, NULL);
 out:
 	para_printf(&aca->pbout, "activated %s (%d admissible files)\n",
 		current_mop? current_mop : "dummy mood", num_admissible);
@@ -615,8 +626,13 @@ EXPORT_SERVER_CMD_HANDLER(select);
 
 static void init_admissible_files(const char *arg)
 {
-	if (activate_mood_or_playlist(arg, NULL) < 0)
-		activate_mood_or_playlist(NULL, NULL); /* always successful */
+	int ret = activate_mood_or_playlist(arg, NULL, NULL);
+	if (ret < 0) {
+		assert(arg);
+		PARA_WARNING_LOG("could not activate %s: %s\n", arg,
+			para_strerror(-ret));
+		activate_mood_or_playlist(NULL, NULL, NULL);
+	}
 }
 
 static int setup_command_socket_or_die(void)