* sound.c (alsa_configure): Move get period/buffer_size after

setting hwparams.

diff --git a/src/ChangeLog b/src/ChangeLog
index e375eae460d13edfd5713e075184f2a920ff9a7a..afad63728e7908f8f05f415a43dc9fbfd3c41865 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-26  Jan Dj\e,Ad\e(Brv  <jan.h.d@swipnet.se>
+
+       * sound.c (alsa_configure): Move get period/buffer_size after
+       setting hwparams.
+
 2006-05-26  Kenichi Handa  <handa@m17n.org>
 
        * coding.c (Ffind_operation_coding_system): Allow (FILENAME

diff --git a/src/sound.c b/src/sound.c
index 2ceefd3bce39451e634d25d29de5dfd41a5c41f3..6317b6c6279fc3cfcafd0bff305e9b89287daa57 100644 (file)
--- a/src/sound.c
+++ b/src/sound.c
@@ -1019,6 +1019,9 @@ alsa_configure (sd)
   if ((err = snd_pcm_hw_params_set_channels (p->handle, p->hwparams, val)) < 0)
     alsa_sound_perror ("Could not set channel count", err);
 
+  if ((err = snd_pcm_hw_params (p->handle, p->hwparams)) < 0)
+    alsa_sound_perror ("Could not set parameters", err);
+
 
   err = snd_pcm_hw_params_get_period_size (p->hwparams, &p->period_size, &dir);
   if (err < 0)
@@ -1028,9 +1031,6 @@ alsa_configure (sd)
   if (err < 0)
     alsa_sound_perror("Unable to get buffer size for playback", err);
 
-  if ((err = snd_pcm_hw_params (p->handle, p->hwparams)) < 0)
-    alsa_sound_perror ("Could not set parameters", err);
-
   err = snd_pcm_sw_params_current (p->handle, p->swparams);
   if (err < 0)
     alsa_sound_perror ("Unable to determine current swparams for playback",