projects
/
paraslash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Major audio format handler cleanups.
[paraslash.git]
/
oggdec_filter.c
diff --git
a/oggdec_filter.c
b/oggdec_filter.c
index 689fc7aac57739ba23989616d4e8cbfb1ed761b1..b158a5e17444112148bd1d33d90dba87e912274e 100644
(file)
--- a/
oggdec_filter.c
+++ b/
oggdec_filter.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 2005-200
8
Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-200
9
Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
@@
-11,6
+11,7
@@
#include "oggdec_filter.cmdline.h"
#include "list.h"
#include "sched.h"
#include "oggdec_filter.cmdline.h"
#include "list.h"
#include "sched.h"
+#include "ggo.h"
#include "filter.h"
#include "error.h"
#include "string.h"
#include "filter.h"
#include "error.h"
#include "string.h"
@@
-124,7
+125,9
@@
static ssize_t ogg_convert(char *inbuffer, size_t len, struct filter_node *fn)
if (!pod->vf) {
int ib = 1024 * conf->initial_buffer_arg; /* initial buffer */
if (!pod->vf) {
int ib = 1024 * conf->initial_buffer_arg; /* initial buffer */
- if (len <ib && !*fn->fc->input_error) {
+ if (*fn->fc->input_error < 0)
+ return *fn->fc->input_error;
+ if (len < ib) {
PARA_DEBUG_LOG("initial input buffer %zd/%d, "
"waiting for more data\n", len, ib);
return 0;
PARA_DEBUG_LOG("initial input buffer %zd/%d, "
"waiting for more data\n", len, ib);
return 0;
@@
-195,9
+198,15
@@
err:
*/
void oggdec_filter_init(struct filter *f)
{
*/
void oggdec_filter_init(struct filter *f)
{
+ struct oggdec_filter_args_info dummy;
+
+ oggdec_cmdline_parser_init(&dummy);
f->open = ogg_open;
f->close = ogg_close;
f->convert = ogg_convert;
f->open = ogg_open;
f->close = ogg_close;
f->convert = ogg_convert;
- f->print_help = oggdec_cmdline_parser_print_help;
f->parse_config = oggdec_parse_config;
f->parse_config = oggdec_parse_config;
+ f->help = (struct ggo_help) {
+ .short_help = oggdec_filter_args_info_help,
+ .detailed_help = oggdec_filter_args_info_detailed_help
+ };
}
}