/*
- * Copyright (C) 2009-2010 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2009-2013 Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
#include <regex.h>
#include <sys/ioctl.h>
#include <fcntl.h>
-#include <dirent.h>
#include <sys/soundcard.h>
-#include <stdbool.h>
#include "para.h"
#include "fd.h"
struct private_oss_write_data *powd = wn->private_data;
int ret = btr_node_status(wn->btrn, wn->min_iqs, BTR_NT_LEAF);
- t->error = 0;
- if (ret < 0)
- sched_min_delay(s);
- else if (ret > 0)
- para_fd_set(powd->fd, &s->wfds, &s->max_fileno);
+ if (ret == 0)
+ return;
+ if (ret < 0 || !powd)
+ return sched_min_delay(s);
+ para_fd_set(powd->fd, &s->wfds, &s->max_fileno);
}
static void oss_close(struct writer_node *wn)
{
struct private_oss_write_data *powd = wn->private_data;
- if (powd->fd >= 0)
- close(powd->fd);
+ if (!powd)
+ return;
+ close(powd->fd);
free(powd);
}
int ret, format;
unsigned ch, rate;
struct oss_write_args_info *conf = wn->conf;
- struct private_oss_write_data *powd = wn->private_data;
+ struct private_oss_write_data *powd = para_calloc(sizeof(*powd));
PARA_INFO_LOG("opening %s\n", conf->device_arg);
ret = para_open(conf->device_arg, O_WRONLY, 0);
if (ret < 0)
- return ret;
+ goto err_free;
powd->fd = ret;
ret = mark_fd_nonblocking(powd->fd);
if (ret < 0)
sample_rate);
}
wn->min_iqs = powd->bytes_per_frame;
+ wn->private_data = powd;
return 1;
err:
close(powd->fd);
- powd->fd = -1;
+err_free:
+ free(powd);
+ PARA_ERROR_LOG("failed to init %s: %s\n", conf->device_arg,
+ para_strerror(-ret));
return ret;
}
-static void oss_post_select(__a_unused struct sched *s,
+static int oss_post_select(__a_unused struct sched *s,
struct task *t)
{
struct writer_node *wn = container_of(t, struct writer_node, task);
struct private_oss_write_data *powd = wn->private_data;
struct btr_node *btrn = wn->btrn;
size_t frames, bytes;
- int ret = btr_node_status(btrn, wn->min_iqs, BTR_NT_LEAF);
+ int ret;
char *data;
+ ret = task_get_notification(t);
if (ret < 0)
goto out;
- if (ret == 0)
- return;
- if (powd->fd < 0) {
+ ret = btr_node_status(btrn, wn->min_iqs, BTR_NT_LEAF);
+ if (ret <= 0)
+ goto out;
+ if (!powd) {
int32_t rate, ch, format;
get_btr_sample_rate(btrn, &rate);
get_btr_channels(btrn, &ch);
ret = oss_init(wn, rate, ch, format);
if (ret < 0)
goto out;
- return;
+ return 0;
}
btr_merge(btrn, wn->min_iqs);
bytes = btr_next_buffer(btrn, &data);
frames = bytes / powd->bytes_per_frame;
if (!frames) { /* eof and less than a single frame available */
- ret = -E_OSS_EOF;
+ ret = -E_WRITE_COMMON_EOF;
goto out;
}
ret = 0;
if (!FD_ISSET(powd->fd, &s->wfds))
goto out;
- ret = write_nonblock(powd->fd, data, frames * powd->bytes_per_frame);
+ ret = xwrite(powd->fd, data, frames * powd->bytes_per_frame);
if (ret < 0)
goto out;
btr_consume(btrn, ret);
ret = 0;
out:
- t->error = ret;
if (ret < 0)
- btr_remove_node(btrn);
-}
-
-static void oss_open(struct writer_node *wn)
-{
- struct private_oss_write_data *powd = para_calloc(sizeof(*powd));
-
- powd->fd = -1;
- wn->private_data = powd;
+ btr_remove_node(&wn->btrn);
+ return ret;
}
-__malloc static void *oss_parse_config_or_die(const char *options)
+__malloc static void *oss_parse_config_or_die(int argc, char **argv)
{
struct oss_write_args_info *conf = para_calloc(sizeof(*conf));
/* exits on errors */
- oss_cmdline_parser_string(options, conf, "oss_write");
+ oss_write_cmdline_parser(argc, argv, conf);
return conf;
}
static void oss_free_config(void *conf)
{
- oss_cmdline_parser_free(conf);
+ oss_write_cmdline_parser_free(conf);
}
/**
{
struct oss_write_args_info dummy;
- oss_cmdline_parser_init(&dummy);
- w->open = oss_open;
+ oss_write_cmdline_parser_init(&dummy);
w->close = oss_close;
w->pre_select = oss_pre_select;
w->post_select = oss_post_select;
w->parse_config_or_die = oss_parse_config_or_die;
w->free_config = oss_free_config;
- w->shutdown = NULL;
- w->help = (struct ggo_help) {
- .short_help = oss_write_args_info_help,
- .detailed_help = oss_write_args_info_detailed_help
- };
- oss_cmdline_parser_free(&dummy);
+ w->help = (struct ggo_help)DEFINE_GGO_HELP(oss_write);
+ oss_write_cmdline_parser_free(&dummy);
}