projects
/
paraslash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
audiod: Use lsu_merge_config_file_options().
[paraslash.git]
/
wav_filter.c
diff --git
a/wav_filter.c
b/wav_filter.c
index 83b81fb2d5b4b9303feb1600cb808fe52accfa51..e749160d3337e87dc7c908c023ea100c955590e4 100644
(file)
--- a/
wav_filter.c
+++ b/
wav_filter.c
@@
-1,8
+1,4
@@
-/*
- * Copyright (C) 2005-2013 Andre Noll <maan@systemlinux.org>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
/** \file wav_filter.c A filter that inserts a wave header. */
/** \file wav_filter.c A filter that inserts a wave header. */
@@
-12,7
+8,6
@@
#include "error.h"
#include "list.h"
#include "sched.h"
#include "error.h"
#include "list.h"
#include "sched.h"
-#include "ggo.h"
#include "buffer_tree.h"
#include "filter.h"
#include "string.h"
#include "buffer_tree.h"
#include "filter.h"
#include "string.h"
@@
-31,7
+26,7
@@
static void make_wav_header(unsigned int channels, unsigned int sample_rate,
int bytespersec = channels * sample_rate * BITS / 8;
int align = channels * BITS / 8;
int bytespersec = channels * sample_rate * BITS / 8;
int align = channels * BITS / 8;
- PARA_DEBUG_LOG("writing wave header: %
d channels, %d
KHz\n", channels, sample_rate);
+ PARA_DEBUG_LOG("writing wave header: %
u channels, %u
KHz\n", channels, sample_rate);
memset(headbuf, 0, WAV_HEADER_LEN);
memcpy(headbuf, "RIFF", 4);
write_u32(headbuf + 4, size - 8);
memset(headbuf, 0, WAV_HEADER_LEN);
memcpy(headbuf, "RIFF", 4);
write_u32(headbuf + 4, size - 8);
@@
-63,20
+58,19
@@
static void wav_open(struct filter_node *fn)
*bof = 1;
}
*bof = 1;
}
-static void wav_pre_select(struct sched *s,
struct task *
t)
+static void wav_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
;
size_t iqs = btr_get_input_queue_size(fn->btrn);
size_t iqs = btr_get_input_queue_size(fn->btrn);
- t->error = 0;
if (iqs == 0)
return;
sched_min_delay(s);
}
if (iqs == 0)
return;
sched_min_delay(s);
}
-static int wav_post_select(__a_unused struct sched *s,
struct task *
t)
+static int wav_post_select(__a_unused 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 btr_node *btrn = fn->btrn;
size_t iqs = btr_get_input_queue_size(btrn);
int ret;
struct btr_node *btrn = fn->btrn;
size_t iqs = btr_get_input_queue_size(btrn);
int ret;
@@
-113,7
+107,7
@@
static int wav_post_select(__a_unused struct sched *s, struct task *t)
ret = -E_WAV_SUCCESS;
err:
if (ret == -E_WAV_SUCCESS)
ret = -E_WAV_SUCCESS;
err:
if (ret == -E_WAV_SUCCESS)
- btr_splice_out_node(btrn);
+ btr_splice_out_node(
&fn->
btrn);
else {
btr_remove_node(&fn->btrn);
PARA_ERROR_LOG("%s\n", para_strerror(-ret));
else {
btr_remove_node(&fn->btrn);
PARA_ERROR_LOG("%s\n", para_strerror(-ret));
@@
-121,15
+115,9
@@
err:
return ret;
}
return ret;
}
-/**
- * The init function of the wav filter.
- *
- * \param f Structure to initialize.
- */
-void wav_filter_init(struct filter *f)
-{
- f->close = wav_close;
- f->open = wav_open;
- f->pre_select = wav_pre_select;
- f->post_select = wav_post_select;
-}
+const struct filter lsg_filter_cmd_com_wav_user_data = {
+ .close = wav_close,
+ .open = wav_open,
+ .pre_select = wav_pre_select,
+ .post_select = wav_post_select,
+};