X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=oss_write.c;h=311a514dc86ff6bfb01abf53d16a75672827af12;hp=12cf8b69bef2a7a189425df8ed15604f5cf10220;hb=4643fd6eeee81acc0e82e47e7895a3111775bbba;hpb=9b406cbe5d20ba969713ca3d7a8033e697476d75

diff --git a/oss_write.c b/oss_write.c
index 12cf8b69..311a514d 100644
--- a/oss_write.c
+++ b/oss_write.c
@@ -1,25 +1,20 @@
-/*
- * Copyright (C) 2009 Andre Noll <maan@tuebingen.mpg.de>
- *
- * 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 <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. */
@@ -62,7 +57,7 @@ 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;
 	}
 }
 
@@ -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));
+	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,8 +174,7 @@ 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;
 }
 
@@ -240,37 +238,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_select = oss_pre_select,
+	.post_select = oss_post_select,
+	.close = oss_close,
+};