projects
/
paraslash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'refs/heads/t/simple_error_codes'
[paraslash.git]
/
play.c
diff --git
a/play.c
b/play.c
index 034e0f6f189a54cb9e7d4cb365dec0c4dbcc66c0..fac551aa161d14f258e1495a4530462ca1146357 100644
(file)
--- 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) {
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;
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);
/* 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)
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);
.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);
/* 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) {
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;
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;
char *buf;
size_t sz;
- sz = xasprintf(&buf, "%s %4
u
%s\n", num == pt->current_file?
+ sz = xasprintf(&buf, "%s %4
d
%s\n", num == pt->current_file?
"*" : " ", num, conf.inputs[num]);
btr_add_output(buf, sz, pt->btrn);
}
"*" : " ", num, conf.inputs[num]);
btr_add_output(buf, sz, pt->btrn);
}