X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=alsa_write.c;h=63a7055be35fab00847379be8ce3785a48312818;hp=358b6346581dc813815419592823046231eab61f;hb=b2e4347baf722d13e4936cf2138750f05c43c3da;hpb=3ac2a1478a7ad965bb48bec7d21aa49affd95d29

diff --git a/alsa_write.c b/alsa_write.c
index 358b6346..63a7055b 100644
--- a/alsa_write.c
+++ b/alsa_write.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2013 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -50,7 +50,7 @@ struct private_alsa_write_data {
 	snd_pcm_format_t sample_format;
 	/* The number of channels, again determined like \a sample_rate. */
 	unsigned channels;
-	/* time until buffer underrun occurs, in microseconds */
+	/* time until buffer underrun occurs, in milliseconds */
 	unsigned buffer_time;
 	struct timeval drain_barrier;
 	/* File descriptor for select(). */
@@ -74,8 +74,8 @@ static snd_pcm_format_t get_alsa_pcm_format(enum sample_format sf)
 static int alsa_init(struct private_alsa_write_data *pad,
 		struct alsa_write_args_info *conf)
 {
-	snd_pcm_hw_params_t *hwparams;
-	snd_pcm_sw_params_t *swparams;
+	snd_pcm_hw_params_t *hwparams = NULL;
+	snd_pcm_sw_params_t *swparams = NULL;
 	snd_pcm_uframes_t start_threshold, stop_threshold;
 	snd_pcm_uframes_t buffer_size, period_size;
 	snd_output_t *output_log;
@@ -89,7 +89,8 @@ static int alsa_init(struct private_alsa_write_data *pad,
 		SND_PCM_STREAM_PLAYBACK, SND_PCM_NONBLOCK);
 	if (ret < 0)
 		goto fail;
-	snd_pcm_hw_params_alloca(&hwparams);
+	ret = snd_pcm_hw_params_malloc(&hwparams);
+	assert(ret >= 0);
 	msg = "Broken alsa configuration";
 	ret = snd_pcm_hw_params_any(pad->handle, hwparams);
 	if (ret < 0)
@@ -114,22 +115,18 @@ static int alsa_init(struct private_alsa_write_data *pad,
 		&pad->sample_rate, NULL);
 	if (ret < 0)
 		goto fail;
-	msg = "unable to get buffer time";
-	ret = snd_pcm_hw_params_get_buffer_time_max(hwparams, &pad->buffer_time,
-		NULL);
-	if (ret < 0 || pad->buffer_time == 0)
-		goto fail;
-	/* buffer at most 500 milliseconds */
-	pad->buffer_time = PARA_MIN(pad->buffer_time, 500U * 1000U);
+	/* alsa wants microseconds */
+	pad->buffer_time = conf->buffer_time_arg * 1000;
 	msg = "could not set buffer time";
 	ret = snd_pcm_hw_params_set_buffer_time_near(pad->handle, hwparams,
 		&pad->buffer_time, NULL);
 	if (ret < 0)
 		goto fail;
-	period_time = pad->buffer_time / 4;
+	pad->buffer_time /= 1000; /* we prefer milliseconds */
+	period_time = pad->buffer_time * 250; /* buffer time / 4 */
 	msg = "could not set period time";
 	ret = snd_pcm_hw_params_set_period_time_near(pad->handle, hwparams,
-		&period_time, 0);
+		&period_time, NULL);
 	if (ret < 0)
 		goto fail;
 
@@ -144,7 +141,8 @@ static int alsa_init(struct private_alsa_write_data *pad,
 		goto fail;
 
 	/* software parameter setup */
-	snd_pcm_sw_params_alloca(&swparams);
+	ret = snd_pcm_sw_params_malloc(&swparams);
+	assert(ret >= 0);
 	snd_pcm_sw_params_current(pad->handle, swparams);
 	snd_pcm_sw_params_set_avail_min(pad->handle, swparams, period_size);
 	if (buffer_size < 1)
@@ -194,19 +192,24 @@ static int alsa_init(struct private_alsa_write_data *pad,
 		}
 		snd_output_close(output_log);
 	}
-	return 1;
+	ret = 1;
+	goto out;
 fail:
 	if (ret < 0)
 		PARA_ERROR_LOG("%s: %s\n", msg, snd_strerror(-ret));
 	else
 		PARA_ERROR_LOG("%s\n", msg);
-	return -E_ALSA;
+	ret = -E_ALSA;
+out:
+	snd_pcm_hw_params_free(hwparams);
+	snd_pcm_sw_params_free(swparams);
+	return ret;
 }
 
-static void alsa_write_pre_select(struct sched *s, struct task *t)
+static void alsa_write_pre_select(struct sched *s, void *context)
 {
 	struct pollfd pfd;
-	struct writer_node *wn = container_of(t, struct writer_node, task);
+	struct writer_node *wn = context;
 	struct private_alsa_write_data *pad = wn->private_data;
 	int ret = btr_node_status(wn->btrn, wn->min_iqs, BTR_NT_LEAF);
 
@@ -223,7 +226,7 @@ static void alsa_write_pre_select(struct sched *s, struct task *t)
 		return;
 	}
 	/* wait at most 50% of the buffer time */
-	sched_request_timeout_ms(pad->buffer_time / 2 / 1000, s);
+	sched_request_timeout_ms(pad->buffer_time / 2, s);
 	ret = snd_pcm_poll_descriptors(pad->handle, &pfd, 1);
 	if (ret < 0) {
 		PARA_ERROR_LOG("could not get alsa poll fd: %s\n",
@@ -252,10 +255,9 @@ static void alsa_close(struct writer_node *wn)
 	free(pad);
 }
 
-static int alsa_write_post_select(__a_unused struct sched *s,
-		struct task *t)
+static int alsa_write_post_select(__a_unused struct sched *s, void *context)
 {
-	struct writer_node *wn = container_of(t, struct writer_node, task);
+	struct writer_node *wn = context;
 	struct private_alsa_write_data *pad = wn->private_data;
 	struct btr_node *btrn = wn->btrn;
 	char *data;
@@ -263,7 +265,7 @@ static int alsa_write_post_select(__a_unused struct sched *s,
 	snd_pcm_sframes_t frames;
 	int ret;
 
-	ret = task_get_notification(t);
+	ret = task_get_notification(wn->task);
 	if (ret < 0)
 		goto err;
 again: