[alsa-cvslog] CVS: alsa-lib/src/pcm pcm_dmix.c,1.50,1.51 pcm_dsnoop.c,1.15,1.16

[Jaroslav Kysela]

Update of /cvsroot/alsa/alsa-lib/src/pcm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17734

Modified Files:
        pcm_dmix.c pcm_dsnoop.c 
Log Message:
The format condition was wrong (dmix<->dsnoop)

Index: pcm_dmix.c
===================================================================
RCS file: /cvsroot/alsa/alsa-lib/src/pcm/pcm_dmix.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- pcm_dmix.c  24 Jan 2004 16:35:11 -0000      1.50
+++ pcm_dmix.c  3 Feb 2004 14:44:48 -0000       1.51
@@ -1215,6 +1215,14 @@
        if (err < 0)
                return err;
 
+       /* sorry, limited features */
+        if (params.format != SND_PCM_FORMAT_S16 &&
+            params.format != SND_PCM_FORMAT_S32) {
+               SNDERR("invalid format, specify s16 or s32");
+               snd_config_delete(sconf);
+               return -EINVAL;
+       }
+
        params.period_size = psize;
        params.buffer_size = bsize;
 

Index: pcm_dsnoop.c
===================================================================
RCS file: /cvsroot/alsa/alsa-lib/src/pcm/pcm_dsnoop.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- pcm_dsnoop.c        23 Jan 2004 13:05:20 -0000      1.15
+++ pcm_dsnoop.c        3 Feb 2004 14:44:48 -0000       1.16
@@ -837,14 +837,6 @@
        if (err < 0)
                return err;
 
-       /* sorry, limited features */
-       if (params.format != SND_PCM_FORMAT_S16 &&
-           params.format != SND_PCM_FORMAT_S32) {
-               SNDERR("invalid format, specify s16 or s32");
-               snd_config_delete(sconf);
-               return -EINVAL;
-       }
-
        params.period_size = psize;
        params.buffer_size = bsize;
        err = snd_pcm_dsnoop_open(pcmp, name, ipc_key, ipc_perm, &params, bindings, 
slowptr, root, sconf, stream, mode);



-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog