projects
/
paraslash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
buffer_tree: Improve btr_splice_out_node().
[paraslash.git]
/
wav_filter.c
diff --git
a/wav_filter.c
b/wav_filter.c
index 63c7b7eb6752ed50126c6b5a3d9900d9a1f8030e..eaef1f5cca7b79c4b532d91dda239aaa7e53c0ee 100644
(file)
--- a/
wav_filter.c
+++ b/
wav_filter.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 2005-201
0
Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-201
3
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.
*/
@@
-7,7
+7,6
@@
/** \file wav_filter.c A filter that inserts a wave header. */
#include <regex.h>
/** \file wav_filter.c A filter that inserts a wave header. */
#include <regex.h>
-#include <stdbool.h>
#include "para.h"
#include "error.h"
#include "para.h"
#include "error.h"
@@
-72,11
+71,10
@@
static void wav_pre_select(struct sched *s, struct task *t)
t->error = 0;
if (iqs == 0)
return;
t->error = 0;
if (iqs == 0)
return;
- s->timeout.tv_sec = 0;
- s->timeout.tv_usec = 1;
+ sched_min_delay(s);
}
}
-static
void
wav_post_select(__a_unused struct sched *s, struct task *t)
+static
int
wav_post_select(__a_unused struct sched *s, struct task *t)
{
struct filter_node *fn = container_of(t, struct filter_node, task);
struct btr_node *btrn = fn->btrn;
{
struct filter_node *fn = container_of(t, struct filter_node, task);
struct btr_node *btrn = fn->btrn;
@@
-85,12
+83,11
@@
static void wav_post_select(__a_unused struct sched *s, struct task *t)
char *header, *buf;
int32_t rate, ch;
char *header, *buf;
int32_t rate, ch;
- t->error = 0;
if (iqs == 0) {
ret = -E_WAV_EOF;
if (btr_no_parent(btrn))
goto err;
if (iqs == 0) {
ret = -E_WAV_EOF;
if (btr_no_parent(btrn))
goto err;
- return;
+ return
0
;
}
ret = btr_exec_up(btrn, "sample_rate", &buf);
if (ret < 0) {
}
ret = btr_exec_up(btrn, "sample_rate", &buf);
if (ret < 0) {
@@
-115,13
+112,13
@@
static void wav_post_select(__a_unused struct sched *s, struct task *t)
btr_add_output(header, WAV_HEADER_LEN, btrn);
ret = -E_WAV_SUCCESS;
err:
btr_add_output(header, WAV_HEADER_LEN, btrn);
ret = -E_WAV_SUCCESS;
err:
- t->error = ret;
if (ret == -E_WAV_SUCCESS)
if (ret == -E_WAV_SUCCESS)
- btr_splice_out_node(btrn);
+ btr_splice_out_node(
&fn->
btrn);
else {
else {
- btr_remove_node(btrn);
+ btr_remove_node(
&fn->
btrn);
PARA_ERROR_LOG("%s\n", para_strerror(-ret));
}
PARA_ERROR_LOG("%s\n", para_strerror(-ret));
}
+ return ret;
}
/**
}
/**