- fixed the order of period and buffer size setting.

  firstly period then buffer size.  this will avoid the problem of
  rounding.

diff --git a/aplay/aplay.c b/aplay/aplay.c
index a569b1fb79ba329d4005591a15bb32066410de15..ca3a1d7d1c3c46bb45e990775888cb06543b5f94 100644 (file)
--- a/aplay/aplay.c
+++ b/aplay/aplay.c
@@ -848,16 +848,8 @@ static void set_params(void)
                }
        }
        rate = hwparams.rate;
-       if (buffer_time == 0 && buffer_frames > 0) {
-               err = snd_pcm_hw_params_set_buffer_size_near(handle, params,
-                                                            &buffer_frames);
-       } else {
-               if (buffer_time == 0)
-                       buffer_time = 500000;
-               err = snd_pcm_hw_params_set_buffer_time_near(handle, params,
-                                                            &buffer_time, 0);
-       }
-       assert(err >= 0);
+       if (buffer_time == 0 && buffer_frames == 0)
+               buffer_time = 500000;
        if (period_time == 0 && period_frames == 0) {
                if (buffer_time > 0)
                        period_time = buffer_time / 4;
@@ -871,6 +863,14 @@ static void set_params(void)
                err = snd_pcm_hw_params_set_period_size_near(handle, params,
                                                             &period_frames, 0);
        assert(err >= 0);
+       if (buffer_time > 0) {
+               err = snd_pcm_hw_params_set_buffer_time_near(handle, params,
+                                                            &buffer_time, 0);
+       } else {
+               err = snd_pcm_hw_params_set_buffer_size_near(handle, params,
+                                                            &buffer_frames);
+       }
+       assert(err >= 0);
        err = snd_pcm_hw_params(handle, params);
        if (err < 0) {
                error("Unable to install hw params:");