-/*
- * Copyright (C) 2009-2014 Andre Noll <maan@systemlinux.org>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 2009 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
/** \file oss_write.c Paraslash's oss output plugin. */
#include <regex.h>
#include <sys/ioctl.h>
-#include <fcntl.h>
#include <sys/soundcard.h>
+#include <lopsub.h>
+#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. */
int bytes_per_frame;
};
+/*
+ * We keep one bit of static storage to make sure only one instance of the oss
+ * writer is running at any given time.
+ */
+static bool sound_device_busy;
+
+static bool sound_device_is_busy(void)
+{
+ return sound_device_busy;
+}
+
+static void set_sound_device_busy(void)
+{
+ assert(!sound_device_busy);
+ sound_device_busy = true;
+}
+
+static void set_sound_device_idle(void)
+{
+ assert(sound_device_busy);
+ sound_device_busy = false;
+}
+
static int get_oss_format(enum sample_format sf)
{
switch (sf) {
struct private_oss_write_data *powd = wn->private_data;
int ret = btr_node_status(wn->btrn, wn->min_iqs, BTR_NT_LEAF);
- if (ret == 0)
+ if (ret == 0 || (sound_device_is_busy() && !powd))
return;
if (ret < 0 || !powd)
return sched_min_delay(s);
return;
close(powd->fd);
free(powd);
+ set_sound_device_idle();
}
/*
{
int ret, format;
unsigned ch, rate;
- struct oss_write_args_info *conf = wn->conf;
struct private_oss_write_data *powd = para_calloc(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;
* Set sampling rate
*
* If we request a higher sampling rate than is supported by the
- * device, the the highest possible speed is automatically used. The
+ * device, the highest possible speed is automatically used. The
* value actually used is returned as the new value of the argument.
*/
rate = 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;
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;
}
size_t frames, bytes;
int ret;
char *data;
+ audio_buf_info abi;
ret = task_get_notification(wn->task);
if (ret < 0)
goto out;
if (!powd) {
int32_t rate, ch, format;
+
+ 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 = oss_init(wn, rate, ch, format);
if (ret < 0)
goto out;
+ set_sound_device_busy();
return 0;
}
btr_merge(btrn, wn->min_iqs);
ret = 0;
if (!FD_ISSET(powd->fd, &s->wfds))
goto out;
+ /* get maximal number of bytes that can be written */
+ ret = ioctl(powd->fd, SNDCTL_DSP_GETOSPACE, &abi);
+ if (ret >= 0) {
+ size_t max_frames = abi.bytes / powd->bytes_per_frame;
+ if (max_frames == 0)
+ goto out;
+ /* cap number of frames to avoid sound artefacts */
+ frames = PARA_MIN(frames, max_frames);
+ }
ret = xwrite(powd->fd, data, frames * powd->bytes_per_frame);
if (ret < 0)
goto 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_select = oss_pre_select,
+ .post_select = oss_post_select,
+ .close = oss_close,
+};
projects / paraslash.git / blobdiff