X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=alsa_write.c;h=b10d5c62faa910dc92757e4ce77afc818c0a676a;hp=9163815627cb623f153b8694cf3f7eb6f67eaac5;hb=deaebb6eaaa83ec633b851c9c918683508008e47;hpb=2d945f96dcd02bcabd02a79342712e089ed30c98

diff --git a/alsa_write.c b/alsa_write.c
index 91638156..b10d5c62 100644
--- a/alsa_write.c
+++ b/alsa_write.c
@@ -21,6 +21,7 @@
 #include "string.h"
 #include "list.h"
 #include "sched.h"
+#include "ggo.h"
 #include "write.h"
 #include "alsa_write.cmdline.h"
 #include "error.h"
@@ -41,7 +42,7 @@ struct private_alsa_write_data {
 	/**
 	 * the samplerate given by command line option or the decoder
 	 * of the writer node group
- 	 */
+	 */
 	unsigned samplerate;
 	/**
 	 * the number of channels, also given by command line option or the
@@ -130,11 +131,12 @@ static int alsa_open(struct writer_node *w)
 			stop_threshold) < 0)
 		return -E_STOP_THRESHOLD;
 	if (snd_pcm_sw_params(pad->handle, swparams) < 0)
-		return -E_SW_PARAMS;
+		PARA_WARNING_LOG("unable to install sw params\n");
 	pad->bytes_per_frame = snd_pcm_format_physical_width(FORMAT)
 		* pad->channels / 8;
+	PARA_INFO_LOG("bytes per frame: %zu\n", pad->bytes_per_frame);
 	if (snd_pcm_nonblock(pad->handle, 1))
-		PARA_ERROR_LOG("%s\n", "failed to set nonblock mode");
+		PARA_ERROR_LOG("failed to set nonblock mode\n");
 	return period_size * pad->bytes_per_frame;
 }
 
@@ -211,10 +213,12 @@ static void alsa_close(struct writer_node *wn)
 
 __malloc static void *alsa_parse_config(const char *options)
 {
+	int ret;
 	struct alsa_write_args_info *conf
 		= para_calloc(sizeof(struct alsa_write_args_info));
+
 	PARA_INFO_LOG("options: %s, %zd\n", options, strcspn(options, " \t"));
-	int ret = alsa_cmdline_parser_string(options, conf, "alsa_write");
+	ret = alsa_cmdline_parser_string(options, conf, "alsa_write");
 	if (ret)
 		goto err_out;
 	PARA_INFO_LOG("help given: %d\n", conf->help_given);
@@ -233,10 +237,17 @@ err_out:
  */
 void alsa_write_init(struct writer *w)
 {
+	struct alsa_write_args_info dummy;
+
+	alsa_cmdline_parser_init(&dummy);
 	w->open = alsa_open;
 	w->close = alsa_close;
 	w->pre_select = alsa_write_pre_select;
 	w->post_select = alsa_write_post_select;
 	w->parse_config = alsa_parse_config;
 	w->shutdown = NULL; /* nothing to do */
+	w->help = (struct ggo_help) {
+		.short_help = alsa_write_args_info_help,
+		.detailed_help = alsa_write_args_info_detailed_help
+	};
 }