From: Andre Noll <maan@tuebingen.mpg.de>
Date: Tue, 31 Mar 2015 01:33:11 +0000 (+0000)
Subject: play: Minor log message improvements.
X-Git-Tag: v0.5.7~19
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=efad222b6321fe7964d89c1d28c3b4ff05873eca

play: Minor log message improvements.

open_new_file() returns an error code on failure, so it should not print
the corresponding strerror text.

The patch also adds messages which logs the active decoder and the
buffer tree with loglevel INFO.
---

diff --git a/play.c b/play.c
index d2539ee1..108db598 100644
--- a/play.c
+++ b/play.c
@@ -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;