Revert "aplay: fix S24_LE wav header"

This reverts commit 9cdcbe0e932b97fac88a6195f87647159a6c7194.

It causes regression (see Link). The physical sample width is stored
in byte_p_spl.

Closes: https://github.com/alsa-project/alsa-utils/issues/308
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/aplay/aplay.c b/aplay/aplay.c
index bdc88c2a180bdb5adc6edcbf6b0ea0f8bb2e62ed..12d5c0b254b0e22a9676986dcbcfce76b4d3300c 100644 (file)
--- a/aplay/aplay.c
+++ b/aplay/aplay.c
@@ -2726,11 +2726,11 @@ static void begin_wave(int fd, size_t cnt)
        case SND_PCM_FORMAT_S16_LE:
                bits = 16;
                break;
-       case SND_PCM_FORMAT_S24_LE: /* S24_LE is 24 bits stored in 32 bit width with 8 bit padding */
        case SND_PCM_FORMAT_S32_LE:
-       case SND_PCM_FORMAT_FLOAT_LE:
+        case SND_PCM_FORMAT_FLOAT_LE:
                bits = 32;
                break;
+       case SND_PCM_FORMAT_S24_LE:
        case SND_PCM_FORMAT_S24_3LE:
                bits = 24;
                break;