X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=alsa_write.c;h=f50ad6a36e71a4f66a2747a6e7c4d08a4950089b;hb=49ae9b0afbaa8b1ac05c7956f325c4f7a710b59a;hp=e741578c66378d74926c28bea86a56c084bde255;hpb=aa179132db2bb4d29a6eef6074288b6b2f4573be;p=paraslash.git

diff --git a/alsa_write.c b/alsa_write.c
index e741578c..f50ad6a3 100644
--- a/alsa_write.c
+++ b/alsa_write.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2012 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -16,7 +16,6 @@
 #include <sys/types.h>
 #include <alsa/asoundlib.h>
 #include <sys/time.h>
-#include <stdbool.h>
 
 #include "para.h"
 #include "fd.h"
@@ -114,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);
@@ -357,7 +358,6 @@ void alsa_write_init(struct writer *w)
 	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->shutdown = NULL; /* nothing to do */
 	w->free_config = alsa_free_config;
 	w->help = (struct ggo_help) {
 		.short_help = alsa_write_args_info_help,