projects
/
paraslash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
aft: Unify handling of hash and path duplicates.
[paraslash.git]
/
resample_filter.c
diff --git
a/resample_filter.c
b/resample_filter.c
index bd8ece91ef13f27b389fa5385ac922784bb7124c..6a285ec3bbcacfd88941aeec5d913862adeb8839 100644
(file)
--- a/
resample_filter.c
+++ b/
resample_filter.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 2012
-2013 Andre Noll <maan@systemlinux.org
>
+ * Copyright (C) 2012
Andre Noll <maan@tuebingen.mpg.de
>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
@@
-65,9
+65,9
@@
static void resample_open(struct filter_node *fn)
btr_log_tree(btr_parent(btr_parent(btrn)), LL_INFO);
}
btr_log_tree(btr_parent(btr_parent(btrn)), LL_INFO);
}
-static void resample_pre_select(struct sched *s,
struct task *
t)
+static void resample_pre_select(struct sched *s,
void *contex
t)
{
{
- struct filter_node *fn = cont
ainer_of(t, struct filter_node, task)
;
+ struct filter_node *fn = cont
ext
;
struct resample_context *ctx = fn->private_data;
int ret = btr_node_status(fn->btrn, fn->min_iqs, BTR_NT_INTERNAL);
struct resample_context *ctx = fn->private_data;
int ret = btr_node_status(fn->btrn, fn->min_iqs, BTR_NT_INTERNAL);
@@
-202,10
+202,10
@@
static int resample_frames(int16_t *in, size_t num_frames, bool have_more,
return data.input_frames_used;
}
return data.input_frames_used;
}
-static int resample_post_select(__a_unused struct sched *s,
struct task *
t)
+static int resample_post_select(__a_unused struct sched *s,
void *contex
t)
{
int ret;
{
int ret;
- struct filter_node *fn = cont
ainer_of(t, struct filter_node, task)
;
+ struct filter_node *fn = cont
ext
;
struct resample_context *ctx = fn->private_data;
struct resample_filter_args_info *conf = fn->conf;
struct btr_node *btrn = fn->btrn;
struct resample_context *ctx = fn->private_data;
struct resample_filter_args_info *conf = fn->conf;
struct btr_node *btrn = fn->btrn;
@@
-310,8
+310,5
@@
void resample_filter_init(struct filter *f)
f->parse_config = resample_parse_config;
f->free_config = resample_free_config;
f->execute = resample_execute;
f->parse_config = resample_parse_config;
f->free_config = resample_free_config;
f->execute = resample_execute;
- f->help = (struct ggo_help) {
- .short_help = resample_filter_args_info_help,
- .detailed_help = resample_filter_args_info_detailed_help
- };
+ f->help = (struct ggo_help)DEFINE_GGO_HELP(resample_filter);
}
}