/*
- * Copyright (C) 2005-2010 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2013 Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
/** \file wav_filter.c A filter that inserts a wave header. */
#include <regex.h>
-#include <stdbool.h>
#include "para.h"
#include "error.h"
/** Always write 16 bit header. */
#define BITS 16
-static void make_wav_header(unsigned int channels, unsigned int samplerate,
+static void make_wav_header(unsigned int channels, unsigned int sample_rate,
char *headbuf)
{
unsigned int size = 0x7fffffff;
- int bytespersec = channels * samplerate * 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, samplerate);
+ PARA_DEBUG_LOG("writing wave header: %d channels, %d KHz\n", channels, sample_rate);
memset(headbuf, 0, WAV_HEADER_LEN);
memcpy(headbuf, "RIFF", 4);
write_u32(headbuf + 4, size - 8);
write_u32(headbuf + 16, 16); /* 16 + extra format bytes (zero) */
write_u16(headbuf + 20, 1); /* format (1 == PCM/uncompressed) */
write_u16(headbuf + 22, channels);
- write_u32(headbuf + 24, samplerate);
+ write_u32(headbuf + 24, sample_rate);
write_u32(headbuf + 28, bytespersec);
write_u16(headbuf + 32, align); /* number of bytes per sample slice */
write_u16(headbuf + 34, BITS); /* significant bits per sample */
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)
goto err;
return;
}
- ret = btr_exec_up(btrn, "samplerate", &buf);
+ ret = btr_exec_up(btrn, "sample_rate", &buf);
if (ret < 0) {
ret = -E_WAV_BAD_FC;
goto err;
if (ret == -E_WAV_SUCCESS)
btr_splice_out_node(btrn);
else {
- btr_remove_node(btrn);
+ btr_remove_node(&fn->btrn);
PARA_ERROR_LOG("%s\n", para_strerror(-ret));
}
}