From: Andre Noll <maan@systemlinux.org>
Date: Sun, 8 Jul 2012 16:02:54 +0000 (+0000)
Subject: Merge branch 't/command_util_cleanups'
X-Git-Tag: v0.4.11~10
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=452920e64da3451578bb2b1244bb982993b3a278;hp=9f58f76988085e31f3211a4f4735bacf537fafff

Merge branch 't/command_util_cleanups'

	9f58f7 command_util: grep source files only once.
	b4aff8 command_util: Fix make dependencies for *_command_list.h.
	289547 Make (most) command handlers static.
	ad3864 command_util: Remove code for generating .c files.
	c9df5d command_util: Write array definition in header mode.
	73ca79 command_util: Output array members with backslashes.
	3792a2 command_util: Avoid empty output lines.
	a51586 command_util: replace dump_xxx() by make_xxx().
	6a4f5e command_util: Kill HC and CC header lines.
---

diff --git a/NEWS b/NEWS
index df54a641..d38b977c 100644
--- a/NEWS
+++ b/NEWS
@@ -7,7 +7,9 @@
 	- The --no_default_filters option of para_filter has been
 	  removed.
 	- Several fixes and latency improvements to various decoders.
+	- The alsa writer now limits the prebuffer time to 500ms.
 	- Documentation improvements.
+	- Overhaul of the command_util.sh script.
 
 ------------------------------------------
 0.4.10 (2012-03-30) "heterogeneous vacuum"
diff --git a/alsa_write.c b/alsa_write.c
index a4863a59..a211985a 100644
--- a/alsa_write.c
+++ b/alsa_write.c
@@ -113,6 +113,8 @@ static int alsa_init(struct private_alsa_write_data *pad,
 		NULL);
 	if (ret < 0 || buffer_time == 0)
 		goto fail;
+	/* buffer at most 500 milliseconds */
+	buffer_time = PARA_MIN(buffer_time, 500U * 1000U);
 	msg = "could not set buffer time";
 	ret = snd_pcm_hw_params_set_buffer_time_near(pad->handle, hwparams,
 		&buffer_time, NULL);