From: Andre Noll <maan@systemlinux.org>
Date: Wed, 6 Feb 2008 21:02:36 +0000 (+0100)
Subject: alsa_write.c: Kill deprecated snd_pcm_sw_params_{get,set}_xfer_align.
X-Git-Tag: v0.3.1~45
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=ed9337563385e142816f9a3764ed6fb163019434;p=paraslash.git

alsa_write.c: Kill deprecated snd_pcm_sw_params_{get,set}_xfer_align.

Fixes

	warning: 'snd_pcm_sw_params_get_xfer_align' is deprecated

for alsa-lib-1.0.16.
---

diff --git a/alsa_write.c b/alsa_write.c
index e2280699..8e8b693c 100644
--- a/alsa_write.c
+++ b/alsa_write.c
@@ -59,8 +59,7 @@ static int alsa_open(struct writer_node *w)
 {
 	snd_pcm_hw_params_t *hwparams;
 	snd_pcm_sw_params_t *swparams;
-	snd_pcm_uframes_t buffer_size, xfer_align, start_threshold,
-		stop_threshold;
+	snd_pcm_uframes_t buffer_size, start_threshold, stop_threshold;
 	int err;
 	snd_pcm_info_t *info;
 	snd_pcm_uframes_t period_size;
@@ -118,14 +117,11 @@ static int alsa_open(struct writer_node *w)
 	if (period_size == buffer_size)
 		return -E_BAD_PERIOD;
 	snd_pcm_sw_params_current(pad->handle, swparams);
-	err = snd_pcm_sw_params_get_xfer_align(swparams, &xfer_align);
-	if (err < 0 || !xfer_align)
-		return -E_GET_XFER;
 	snd_pcm_sw_params_set_avail_min(pad->handle, swparams, period_size);
-	/* round to closest transfer boundary */
-	start_threshold = (buffer_size / xfer_align) * xfer_align;
-	if (start_threshold < 1)
+	if (buffer_size < 1)
 		start_threshold = 1;
+	else
+		start_threshold = buffer_size;
 	if (snd_pcm_sw_params_set_start_threshold(pad->handle, swparams,
 			start_threshold) < 0)
 		return -E_START_THRESHOLD;
@@ -133,9 +129,6 @@ static int alsa_open(struct writer_node *w)
 	if (snd_pcm_sw_params_set_stop_threshold(pad->handle, swparams,
 			stop_threshold) < 0)
 		return -E_STOP_THRESHOLD;
-	if (snd_pcm_sw_params_set_xfer_align(pad->handle, swparams,
-			xfer_align) < 0)
-		return -E_SET_XFER;
 	if (snd_pcm_sw_params(pad->handle, swparams) < 0)
 		return -E_SW_PARAMS;
 	pad->bytes_per_frame = snd_pcm_format_physical_width(FORMAT)