X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=alsa_write.c;h=363e39301651bc47881f850f0235c13f6a016c62;hp=63a7055be35fab00847379be8ce3785a48312818;hb=6bded356ec89b1344049ff702e6c6babaeccd439;hpb=ca006af72cef95b0aba3cad799badde47010a621

diff --git a/alsa_write.c b/alsa_write.c
index 63a7055b..363e3930 100644
--- a/alsa_write.c
+++ b/alsa_write.c
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 
 /** \file alsa_write.c paraslash's alsa output plugin */
 
@@ -15,17 +11,16 @@
 #include <regex.h>
 #include <sys/types.h>
 #include <alsa/asoundlib.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 "alsa_write.cmdline.h"
 #include "error.h"
 
 /** Data specific to the alsa writer. */
@@ -71,22 +66,22 @@ static snd_pcm_format_t get_alsa_pcm_format(enum sample_format sf)
 }
 
 /* Install PCM software and hardware configuration. */
-static int alsa_init(struct private_alsa_write_data *pad,
-		struct alsa_write_args_info *conf)
+static int alsa_init(struct writer_node *wn)
 {
+	struct private_alsa_write_data *pad = wn->private_data;
 	snd_pcm_hw_params_t *hwparams = NULL;
 	snd_pcm_sw_params_t *swparams = NULL;
 	snd_pcm_uframes_t start_threshold, stop_threshold;
 	snd_pcm_uframes_t buffer_size, period_size;
 	snd_output_t *output_log;
 	int ret;
-	const char *msg;
+	const char *msg, *dev = WRITE_CMD_OPT_STRING_VAL(ALSA, DEVICE, wn->lpr);
 	unsigned period_time;
 
-	PARA_INFO_LOG("opening %s\n", conf->device_arg);
+	PARA_INFO_LOG("opening %s\n", dev);
 	msg = "unable to open pcm";
-	ret = snd_pcm_open(&pad->handle, conf->device_arg,
-		SND_PCM_STREAM_PLAYBACK, SND_PCM_NONBLOCK);
+	ret = snd_pcm_open(&pad->handle, dev, SND_PCM_STREAM_PLAYBACK,
+		SND_PCM_NONBLOCK);
 	if (ret < 0)
 		goto fail;
 	ret = snd_pcm_hw_params_malloc(&hwparams);
@@ -116,7 +111,8 @@ static int alsa_init(struct private_alsa_write_data *pad,
 	if (ret < 0)
 		goto fail;
 	/* alsa wants microseconds */
-	pad->buffer_time = conf->buffer_time_arg * 1000;
+	pad->buffer_time = 1000U * WRITE_CMD_OPT_UINT32_VAL(ALSA, BUFFER_TIME,
+		wn->lpr);
 	msg = "could not set buffer time";
 	ret = snd_pcm_hw_params_set_buffer_time_near(pad->handle, hwparams,
 		&pad->buffer_time, NULL);
@@ -295,7 +291,7 @@ again:
 
 		if (bytes == 0) /* no data available */
 			return 0;
-		pad = para_calloc(sizeof(*pad));
+		pad = wn->private_data = para_calloc(sizeof(*pad));
 		get_btr_sample_rate(btrn, &val);
 		pad->sample_rate = val;
 		get_btr_channels(btrn, &val);
@@ -303,14 +299,14 @@ again:
 		get_btr_sample_format(btrn, &val);
 		pad->sample_format = get_alsa_pcm_format(val);
 
-		PARA_INFO_LOG("%d channel(s), %dHz\n", pad->channels,
+		PARA_INFO_LOG("%u channel(s), %uHz\n", pad->channels,
 			pad->sample_rate);
-		ret = alsa_init(pad, wn->conf);
+		ret = alsa_init(wn);
 		if (ret < 0) {
-			free(pad);
+			free(wn->private_data);
+			wn->private_data = NULL;
 			goto err;
 		}
-		wn->private_data = pad;
 		wn->min_iqs = pad->bytes_per_frame;
 		goto again;
 	}
@@ -340,37 +336,9 @@ err:
 	return ret;
 }
 
-__malloc static void *alsa_parse_config_or_die(int argc, char **argv)
-{
-	struct alsa_write_args_info *conf = para_calloc(sizeof(*conf));
-
-	/* exits on errors */
-	alsa_write_cmdline_parser(argc, argv, conf);
-	return conf;
-}
-
-static void alsa_free_config(void *conf)
-{
-	alsa_write_cmdline_parser_free(conf);
-}
+struct writer lsg_write_cmd_com_alsa_user_data = {
 
-/**
- * The init function of the alsa writer.
- *
- * \param w Pointer to the writer to initialize.
- *
- * \sa struct \ref writer.
- */
-void alsa_write_init(struct writer *w)
-{
-	struct alsa_write_args_info dummy;
-
-	alsa_write_cmdline_parser_init(&dummy);
-	w->close = alsa_close;
-	w->pre_select = alsa_write_pre_select;
-	w->post_select = alsa_write_post_select;
-	w->parse_config_or_die = alsa_parse_config_or_die;
-	w->free_config = alsa_free_config;
-	w->help = (struct ggo_help)DEFINE_GGO_HELP(alsa_write);
-	alsa_write_cmdline_parser_free(&dummy);
-}
+	.pre_select = alsa_write_pre_select,
+	.post_select = alsa_write_post_select,
+	.close = alsa_close,
+};