[polypaudio-commits] r628 - /trunk/src/modules/alsa-util.c

[svnmailer-noreply at 0pointer.de]

Author: ossman
Date: Sun Mar  5 19:37:13 2006
New Revision: 628

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=628&root=polypaudio&view=rev
Log:
It's safer to set buffer size than to try setting number of periods.

Modified:
    trunk/src/modules/alsa-util.c

Modified: trunk/src/modules/alsa-util.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/alsa-util.c?rev=628&root=polypaudio&r1=627&r2=628&view=diff
==============================================================================
--- trunk/src/modules/alsa-util.c (original)
+++ trunk/src/modules/alsa-util.c Sun Mar  5 19:37:13 2006
@@ -262,6 +262,8 @@
         [PA_SAMPLE_FLOAT32BE] = SND_PCM_FORMAT_FLOAT_BE,
     };
     assert(pcm_handle && ss && periods && period_size);
+
+    buffer_size = *periods * *period_size;
     
     if ((ret = snd_pcm_hw_params_malloc(&hwparams)) < 0 ||
         (ret = snd_pcm_hw_params_any(pcm_handle, hwparams)) < 0 ||
@@ -269,7 +271,7 @@
         (ret = snd_pcm_hw_params_set_format(pcm_handle, hwparams, format_trans[ss->format])) < 0 ||
     	(ret = snd_pcm_hw_params_set_rate_near(pcm_handle, hwparams, &r, NULL)) < 0 ||
         (ret = snd_pcm_hw_params_set_channels(pcm_handle, hwparams, ss->channels)) < 0 ||
-        (*periods > 0 && (ret = snd_pcm_hw_params_set_periods_near(pcm_handle, hwparams, periods, NULL)) < 0) ||
+        (*periods > 0 && (ret = snd_pcm_hw_params_set_buffer_size_near(pcm_handle, hwparams, &buffer_size)) < 0) ||
         (*period_size > 0 && (ret = snd_pcm_hw_params_set_period_size_near(pcm_handle, hwparams, period_size, NULL)) < 0) ||
         (ret = snd_pcm_hw_params(pcm_handle, hwparams)) < 0)
         goto finish;