X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=play.c;h=fac551aa161d14f258e1495a4530462ca1146357;hp=d2539ee134773614a40bca9941f35dd161007946;hb=bc78a94412b17dfd445d6bb88f752041df3cf7ba;hpb=78cc9c57ad9b1cc389956957030d37f71cb60a07

diff --git a/play.c b/play.c
index d2539ee1..fac551aa 100644
--- a/play.c
+++ b/play.c
@@ -36,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.
  *
@@ -95,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
@@ -328,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;
@@ -388,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)
@@ -399,6 +399,8 @@ static int load_file(struct play_task *pt)
 			.handler = decoder->execute, .context = &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;
@@ -784,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);
 }