X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=oss_write.c;h=311a514dc86ff6bfb01abf53d16a75672827af12;hp=12cf8b69bef2a7a189425df8ed15604f5cf10220;hb=HEAD;hpb=642445e95fea1c548c79f80ad3b5d6f30ba572f3 diff --git a/oss_write.c b/oss_write.c index 12cf8b69..4ea85afa 100644 --- a/oss_write.c +++ b/oss_write.c @@ -1,25 +1,20 @@ -/* - * Copyright (C) 2009 Andre Noll - * - * Licensed under the GPL v2. For licencing details see COPYING. - */ +/* Copyright (C) 2009 Andre Noll , see file COPYING. */ /** \file oss_write.c Paraslash's oss output plugin. */ #include #include #include +#include +#include "write_cmd.lsg.h" #include "para.h" #include "fd.h" #include "string.h" #include "list.h" #include "sched.h" -#include "ggo.h" #include "buffer_tree.h" #include "write.h" -#include "write_common.h" -#include "oss_write.cmdline.h" #include "error.h" /** Data specific to the oss writer. */ @@ -62,11 +57,11 @@ static int get_oss_format(enum sample_format sf) case SF_S16_BE: return AFMT_S16_BE; case SF_U16_LE: return AFMT_U16_LE; case SF_U16_BE: return AFMT_U16_BE; - default: return AFMT_S16_LE; + default: return -E_BAD_SAMPLE_FORMAT; } } -static void oss_pre_select(struct sched *s, void *context) +static void oss_pre_monitor(struct sched *s, void *context) { struct writer_node *wn = context; struct private_oss_write_data *powd = wn->private_data; @@ -76,7 +71,7 @@ static void oss_pre_select(struct sched *s, void *context) return; if (ret < 0 || !powd) return sched_min_delay(s); - para_fd_set(powd->fd, &s->wfds, &s->max_fileno); + sched_monitor_writefd(powd->fd, s); } static void oss_close(struct writer_node *wn) @@ -106,11 +101,11 @@ static int oss_init(struct writer_node *wn, unsigned sample_rate, { int ret, format; unsigned ch, rate; - struct oss_write_args_info *conf = wn->conf; - struct private_oss_write_data *powd = para_calloc(sizeof(*powd)); + struct private_oss_write_data *powd = zalloc(sizeof(*powd)); + const char *dev = WRITE_CMD_OPT_STRING_VAL(OSS, DEVICE, wn->lpr); - PARA_INFO_LOG("opening %s\n", conf->device_arg); - ret = para_open(conf->device_arg, O_WRONLY, 0); + PARA_INFO_LOG("opening %s\n", dev); + ret = para_open(dev, O_WRONLY, 0); if (ret < 0) goto err_free; powd->fd = ret; @@ -118,10 +113,14 @@ static int oss_init(struct writer_node *wn, unsigned sample_rate, if (ret < 0) goto err; /* set PCM format */ - sample_format = format = get_oss_format(sample_format); + ret = get_oss_format(sample_format); + if (ret < 0) + return ret; + sample_format = format = ret; ret = ioctl(powd->fd, SNDCTL_DSP_SETFMT, &format); if (ret < 0) { ret = -ERRNO_TO_PARA_ERROR(errno); + PARA_ERROR_LOG("could not set sample format\n"); goto err; } ret = -E_BAD_SAMPLE_FORMAT; @@ -165,7 +164,7 @@ static int oss_init(struct writer_node *wn, unsigned sample_rate, ret = -E_BAD_SAMPLERATE; if (100 * max > 110 * min) /* more than 10% deviation */ goto err; - PARA_NOTICE_LOG("using %dHz rather than %dHz\n", rate, + PARA_NOTICE_LOG("using %uHz rather than %uHz\n", rate, sample_rate); } wn->min_iqs = powd->bytes_per_frame; @@ -175,12 +174,11 @@ err: close(powd->fd); err_free: free(powd); - PARA_ERROR_LOG("failed to init %s: %s\n", conf->device_arg, - para_strerror(-ret)); + PARA_ERROR_LOG("failed to init %s: %s\n", dev, para_strerror(-ret)); return ret; } -static int oss_post_select(__a_unused struct sched *s, void *context) +static int oss_post_monitor(__a_unused struct sched *s, void *context) { struct writer_node *wn = context; struct private_oss_write_data *powd = wn->private_data; @@ -201,9 +199,15 @@ static int oss_post_select(__a_unused struct sched *s, void *context) if (sound_device_is_busy()) return 0; - get_btr_sample_rate(btrn, &rate); - get_btr_channels(btrn, &ch); - get_btr_sample_format(btrn, &format); + ret = get_btr_sample_rate(btrn, &rate); + if (ret < 0) + goto out; + ret = get_btr_channels(btrn, &ch); + if (ret < 0) + goto out; + ret = get_btr_sample_format(btrn, &format); + if (ret < 0) + goto out; ret = oss_init(wn, rate, ch, format); if (ret < 0) goto out; @@ -214,11 +218,11 @@ static int oss_post_select(__a_unused struct sched *s, void *context) bytes = btr_next_buffer(btrn, &data); frames = bytes / powd->bytes_per_frame; if (!frames) { /* eof and less than a single frame available */ - ret = -E_WRITE_COMMON_EOF; + ret = -E_EOF; goto out; } ret = 0; - if (!FD_ISSET(powd->fd, &s->wfds)) + if (!sched_write_ok(powd->fd, s)) goto out; /* get maximal number of bytes that can be written */ ret = ioctl(powd->fd, SNDCTL_DSP_GETOSPACE, &abi); @@ -240,37 +244,8 @@ out: return ret; } -__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_write_cmdline_parser(argc, argv, conf); - return conf; -} - -static void oss_free_config(void *conf) -{ - oss_write_cmdline_parser_free(conf); -} - -/** - * The init function of the oss writer. - * - * \param w Pointer to the writer to initialize. - * - * \sa struct writer. - */ -void oss_write_init(struct writer *w) -{ - struct oss_write_args_info dummy; - - 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->help = (struct ggo_help)DEFINE_GGO_HELP(oss_write); - oss_write_cmdline_parser_free(&dummy); -} +const struct writer lsg_write_cmd_com_oss_user_data = { + .pre_monitor = oss_pre_monitor, + .post_monitor = oss_post_monitor, + .close = oss_close, +};