X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=alsa_write.c;h=11e4504d79e78c8e613fc33baec80ef168e72f20;hp=a3912c1165e6054b0be0bd622b17175fdad4fd8a;hb=4eb15d1cf4dbd3b2962cdd3930e2d9559acb248e;hpb=5cb5db1fbf8f9b96c3b5a1e0cc7de9e710757540

diff --git a/alsa_write.c b/alsa_write.c
index a3912c11..11e4504d 100644
--- a/alsa_write.c
+++ b/alsa_write.c
@@ -34,16 +34,21 @@ struct private_alsa_write_data {
 	snd_pcm_t *handle;
 	/** Determined and set by alsa_init(). */
 	int bytes_per_frame;
-	/**
-	 * The sample rate given by command line option or the decoder
-	 * of the writer node group.
+	/*
+	 * If the sample rate is not given at the command line and no wav
+	 * header was detected, the btr exec mechanism is employed to query the
+	 * ancestor buffer tree nodes for this information. In a typical setup
+	 * the decoder passes the sample rate back to the alsa writer.
+	 *
+	 *  \sa \ref btr_exec_up().
 	 */
 	unsigned sample_rate;
-	snd_pcm_format_t sample_format;
-	/**
-	 * The number of channels, given by command line option or the
-	 * decoder of the writer node group.
+	/*
+	 * The sample format (8/16 bit, signed/unsigned, little/big endian) is
+	 * determined in the same way as the \a sample_rate.
 	 */
+	snd_pcm_format_t sample_format;
+	/* The number of channels, again determined like \a sample_rate. */
 	unsigned channels;
 	struct timeval drain_barrier;
 	/* File descriptor for select(). */
@@ -166,15 +171,16 @@ static int alsa_init(struct private_alsa_write_data *pad,
 	if (ret == 0) {
 		char *buf, *p;
 		size_t sz;
-		PARA_INFO_LOG("dumping alsa configuration\n");
+		PARA_DEBUG_LOG("dumping alsa configuration\n");
 		snd_pcm_dump(pad->handle, output_log);
+		snd_pcm_hw_params_dump(hwparams, output_log);
 		sz = snd_output_buffer_string(output_log, &buf);
 		for (p = buf; p < buf + sz;) {
 			char *q = memchr(p, '\n', buf + sz - p);
 			if (!q)
 				break;
 			*q = '\0';
-			PARA_INFO_LOG("%s\n", p);
+			PARA_DEBUG_LOG("%s\n", p);
 			p = q + 1;
 		}
 		snd_output_close(output_log);
@@ -211,7 +217,6 @@ static void alsa_write_pre_select(struct sched *s, struct task *t)
 	if (ret < 0) {
 		PARA_ERROR_LOG("could not get alsa poll fd: %s\n",
 			snd_strerror(-ret));
-		t->error = -E_ALSA;
 		return;
 	}
 	pad->poll_fd = pfd.fd;