/*
- * Copyright (C) 2009-2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2009-2012 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 oss_write_args_info *conf = wn->conf;
struct private_oss_write_data *powd = para_calloc(sizeof(*powd));
- wn->private_data = powd;
PARA_INFO_LOG("opening %s\n", conf->device_arg);
ret = para_open(conf->device_arg, O_WRONLY, 0);
if (ret < 0)
sample_rate);
}
wn->min_iqs = powd->bytes_per_frame;
+ wn->private_data = powd;
return 1;
err:
close(powd->fd);
err_free:
free(powd);
+ PARA_ERROR_LOG("failed to init %s: %s\n", conf->device_arg,
+ para_strerror(-ret));
return ret;
}
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);
out:
t->error = ret;
if (ret < 0)
- btr_remove_node(btrn);
+ btr_remove_node(&wn->btrn);
}
-__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_cmdline_parser(argc, argv, conf);
return conf;
}
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