Update of /cvsroot/alsa/alsa-utils/aplay
In directory sc8-pr-cvs1:/tmp/cvs-serv1797
Modified Files:
aplay.c
Log Message:
Redo wrong changes by Takashi
Index: aplay.c
===================================================================
RCS file: /cvsroot/alsa/alsa-utils/aplay/aplay.c,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- aplay.c 19 Dec 2002 11:10:05 -0000 1.154
+++ aplay.c 19 Dec 2002 11:26:55 -0000 1.155
@@ -654,7 +654,7 @@
hwparams.format = SND_PCM_FORMAT_S16_LE;
break;
case 24:
- switch (LE_SHORT(f->byte_p_spl)) {
+ switch (LE_SHORT(f->byte_p_spl) / hwparams.channels) {
case 3:
hwparams.format = SND_PCM_FORMAT_S24_3LE;
break;
@@ -662,9 +662,10 @@
hwparams.format = SND_PCM_FORMAT_S24_LE;
break;
default:
- error(" can't play WAVE-files with sample %d bits in %d bytes
wide", LE_SHORT(f->bit_p_spl), LE_SHORT(f->byte_p_spl));
- break;
+ error(" can't play WAVE-files with sample %d bits in %d bytes
+wide (%d channels)", LE_SHORT(f->bit_p_spl), LE_SHORT(f->byte_p_spl),
+hwparams.channels);
+ exit(EXIT_FAILURE);
}
+ break;
case 32:
hwparams.format = SND_PCM_FORMAT_S32_LE;
break;
-------------------------------------------------------
This SF.NET email is sponsored by: Geek Gift Procrastinating?
Get the perfect geek gift now! Before the Holidays pass you by.
T H I N K G E E K . C O M http://www.thinkgeek.com/sf/
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
