#include <regex.h>
#include <sys/types.h>
-#include <dirent.h>
#include <alsa/asoundlib.h>
#include <sys/time.h>
#include <stdbool.h>
{
struct writer_node *wn = container_of(t, struct writer_node, task);
struct private_alsa_write_data *pad = wn->private_data;
- struct timeval tv;
snd_pcm_sframes_t avail, underrun;
int ret = btr_node_status(wn->btrn, wn->min_iqs, BTR_NT_LEAF);
if (ret == 0)
return;
- if (ret < 0 || !pad)
+ if (!pad)
return sched_min_delay(s);
+ if (ret < 0)
+ return sched_request_barrier_or_min_delay(&pad->drain_barrier, s);
/*
* Data is available to be written to the alsa handle. Compute number
* of milliseconds until next buffer underrun would occur.
if (underrun < 50)
underrun = 50;
underrun -= 50;
- ms2tv(underrun, &tv);
- sched_request_timeout(&tv, s);
+ sched_request_timeout_ms(underrun, s);
}
static void alsa_close(struct writer_node *wn)
bytes = btr_next_buffer(btrn, &data);
if (ret < 0 || bytes < wn->min_iqs) { /* eof */
assert(btr_no_parent(btrn));
- ret = -E_ALSA_EOF;
+ ret = -E_WRITE_COMMON_EOF;
if (!pad)
goto err;
/* wait until pending frames are played */
if (!pad) {
int32_t val;
- pad = para_calloc(sizeof(*pad));
- wn->private_data = pad;
if (bytes == 0) /* no data available */
return;
+ pad = para_calloc(sizeof(*pad));
get_btr_sample_rate(btrn, &val);
pad->sample_rate = val;
get_btr_channels(btrn, &val);
PARA_INFO_LOG("%d channel(s), %dHz\n", pad->channels,
pad->sample_rate);
ret = alsa_init(pad, wn->conf);
- if (ret < 0)
+ if (ret < 0) {
+ free(pad);
goto err;
+ }
+ wn->private_data = pad;
wn->min_iqs = pad->bytes_per_frame;
goto again;
}