X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=play.c;h=fac551aa161d14f258e1495a4530462ca1146357;hp=927f5dc69df9c8a44d60c5d7221c626ccc0efaea;hb=3f696a82bbb79cb07bfdb8e510bb4f3515570cec;hpb=becfb4be64a123630775b6517279ed20e4b498f8

diff --git a/play.c b/play.c
index 927f5dc6..fac551aa 100644
--- a/play.c
+++ b/play.c
@@ -13,7 +13,6 @@
 #include "para.h"
 #include "list.h"
 #include "play.cmdline.h"
-#include "filter.cmdline.h"
 #include "error.h"
 #include "ggo.h"
 #include "buffer_tree.h"
@@ -37,6 +36,9 @@
  * Playlist handling is done exclusively in play context.
  */
 
+/** Array of error strings. */
+DEFINE_PARA_ERRLIST;
+
 /**
  * Describes a request to change the state of para_play.
  *
@@ -96,9 +98,6 @@ struct play_task {
 	char *afhi_txt;
 };
 
-/** Initialize the array of errors for para_play. */
-INIT_PLAY_ERRLISTS;
-
 /* Activate the afh receiver. */
 extern void afh_recv_init(struct receiver *r);
 #undef AFH_RECEIVER
@@ -329,8 +328,7 @@ static int open_new_file(struct play_task *pt)
 	pt->rn.receiver = afh_recv;
 	ret = afh_recv->open(&pt->rn);
 	if (ret < 0) {
-		PARA_ERROR_LOG("could not open %s: %s\n", path,
-			para_strerror(-ret));
+		PARA_ERROR_LOG("could not open %s\n", path);
 		goto fail;
 	}
 	pt->audio_format_num = ret;
@@ -389,6 +387,7 @@ static int load_file(struct play_task *pt)
 	/* set up decoding filter */
 	af = audio_format_name(pt->audio_format_num);
 	tmp = make_message("%sdec", af);
+	PARA_INFO_LOG("decoder: %s\n", tmp);
 	ret = check_filter_arg(tmp, &pt->fn.conf);
 	freep(&tmp);
 	if (ret < 0)
@@ -398,7 +397,10 @@ static int load_file(struct play_task *pt)
 	pt->fn.btrn = btr_new_node(&(struct btr_node_description)
 		EMBRACE(.name = decoder->name, .parent = pt->rn.btrn,
 			.handler = decoder->execute, .context = &pt->fn));
-	decoder->open(&pt->fn);
+	if (decoder->open)
+		decoder->open(&pt->fn);
+	PARA_INFO_LOG("buffer tree:\n");
+	btr_log_tree(pt->rn.btrn, LL_INFO);
 
 	/* setup default writer */
 	pt->wn.conf = check_writer_arg_or_die(NULL, &pt->wn.writer_num);
@@ -453,6 +455,8 @@ again:
 		pt->next_file = pt->current_file;
 	ret = load_file(pt);
 	if (ret < 0) {
+		PARA_ERROR_LOG("%s: marking file as invalid\n",
+			para_strerror(-ret));
 		pt->invalid[pt->next_file] = true;
 		pt->rq = CRT_NONE;
 		goto again;
@@ -592,6 +596,28 @@ static char *get_key_map_seq(int key)
 		get_internal_key_map_seq(key) : get_user_key_map_seq(key);
 }
 
+static char *get_key_map_seq_safe(int key)
+{
+	const char hex[] = "0123456789abcdef";
+	char *seq = get_key_map_seq(key), *sseq;
+	size_t n, len = strlen(seq);
+
+	if (len == 1 && isprint(*seq))
+		return seq;
+	sseq = para_malloc(2 + 2 * len + 1);
+	sseq[0] = '0';
+	sseq[1] = 'x';
+	for (n = 0; n < len; n++) {
+		uint8_t val = (seq[n] & 0xf0) >> 4;
+		sseq[2 + 2 * n] = hex[val];
+		val = seq[n] & 0xf;
+		sseq[2 + 2 * n + 1] = hex[val];
+	}
+	free(seq);
+	sseq[2 + 2 * n] = '\0';
+	return sseq;
+}
+
 static inline char *get_internal_key_map_cmd(int key)
 {
 	return para_strdup(default_commands[get_internal_key_map_idx(key)]);
@@ -620,15 +646,8 @@ static char **get_mapped_keyseqs(void)
 
 	result = para_malloc((NUM_MAPPED_KEYS + 1) * sizeof(char *));
 	FOR_EACH_MAPPED_KEY(i) {
-		int idx = get_key_map_idx(i);
 		char *seq = get_key_map_seq(i);
-		char *cmd = get_key_map_cmd(i);
-		bool internal = is_internal_key(i);
-		PARA_DEBUG_LOG("%s key sequence #%d: %s -> %s\n",
-			internal? "internal" : "user-defined",
-			idx, seq, cmd);
 		result[i] = seq;
-		free(cmd);
 	}
 	result[i] = NULL;
 	return result;
@@ -717,7 +736,7 @@ static int com_help(struct play_task *pt, int argc, char **argv)
 			FOR_EACH_MAPPED_KEY(i) {
 				bool internal = is_internal_key(i);
 				int idx = get_key_map_idx(i);
-				char *seq = get_key_map_seq(i);
+				char *seq = get_key_map_seq_safe(i);
 				char *cmd = get_key_map_cmd(i);
 				sz = xasprintf(&buf,
 					"%s key #%d: %s -> %s\n",
@@ -769,7 +788,7 @@ static void list_file(struct play_task *pt, int num)
 	char *buf;
 	size_t sz;
 
-	sz = xasprintf(&buf, "%s %4u %s\n", num == pt->current_file?
+	sz = xasprintf(&buf, "%s %4d %s\n", num == pt->current_file?
 		"*" : " ", num, conf.inputs[num]);
 	btr_add_output(buf, sz, pt->btrn);
 }