Update of /cvsroot/alsa/alsa-utils/aplay
In directory sc8-pr-cvs1:/tmp/cvs-serv2219

Modified Files:
        aplay.c 
Log Message:
- fixed the order of period and buffer size setting.
  firstly period then buffer size.  this will avoid the problem of
  rounding.



Index: aplay.c
===================================================================
RCS file: /cvsroot/alsa/alsa-utils/aplay/aplay.c,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -r1.172 -r1.173
--- aplay.c     27 Aug 2003 11:12:50 -0000      1.172
+++ aplay.c     11 Sep 2003 11:23:58 -0000      1.173
@@ -848,16 +848,8 @@
                }
        }
        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;
@@ -870,6 +862,14 @@
        else
                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) {



-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

Reply via email to