X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=alsa_write.c;h=526cffc1aeaede74968d0f5e1ec89057dd8933b1;hp=c104a5d5352ce35287e6ec8f167d24951890e166;hb=5b30367a7e47fe5b9014599586e819305d76c9b0;hpb=a5937a0eca5ada5cb2332dbce676b327aa9e37ee

diff --git a/alsa_write.c b/alsa_write.c
index c104a5d5..526cffc1 100644
--- a/alsa_write.c
+++ b/alsa_write.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2007 Andre Noll <maan@systemlinux.org>
  *
  *     This program is free software; you can redistribute it and/or modify
  *     it under the terms of the GNU General Public License as published by
@@ -36,7 +36,7 @@
 #include "alsa_write.cmdline.h"
 #include "error.h"
 
-
+/** always use 16 bit little endian */
 #define FORMAT SND_PCM_FORMAT_S16_LE
 
 /** data specific to the alsa writer */
@@ -49,7 +49,15 @@ struct private_alsa_write_data {
 	struct timeval next_chunk;
 	/** the return value of snd_pcm_hw_params_get_buffer_time_max() */
 	unsigned buffer_time;
+	/**
+	 * 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
+	 * decoder of the writer node group
+	 */
 	unsigned channels;
 };
 
@@ -170,7 +178,7 @@ static int alsa_write_pre_select(struct sched *s, struct writer_node *wn)
 static int alsa_write_post_select(__a_unused struct sched *s,
 		struct writer_node *wn)
 {
-	struct private_alsa__write_data *pad = wn->private_data;
+	struct private_alsa_write_data *pad = wn->private_data;
 	struct writer_node_group *wng = wn->wng;
 	size_t frames = (*wng->loaded - wn->written) / pad->bytes_per_frame;
 	snd_pcm_sframes_t ret;
@@ -212,11 +220,11 @@ static void alsa_close(struct writer_node *wn)
 	free(pad);
 }
 
-__malloc void *alsa_parse_config(char *options)
+__malloc static void *alsa_parse_config(const char *options)
 {
 	struct alsa_write_args_info *conf
 		= para_calloc(sizeof(struct alsa_write_args_info));
-	PARA_INFO_LOG("options: %s, %d\n", options, strcspn(options, " \t"));
+	PARA_INFO_LOG("options: %s, %zd\n", options, strcspn(options, " \t"));
 	int ret = alsa_cmdline_parser_string(options, conf, "alsa_write");
 	if (ret)
 		goto err_out;
@@ -227,7 +235,13 @@ err_out:
 	return NULL;
 }
 
-/** the init function of the alsa writer */
+/**
+ * the init function of the alsa writer
+ *
+ * \param w pointer to the writer to initialize
+ *
+ * \sa struct writer
+ */
 void alsa_write_init(struct writer *w)
 {
 	w->open = alsa_open;