Takashi Iwai
f57427e846
- backport from upstream tree: * add support for the new chmap API OBS-URL: https://build.opensuse.org/request/show/138458 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa-utils?expand=0&rev=60
45 lines
1.3 KiB
Diff
45 lines
1.3 KiB
Diff
From 6017849f1b9d406ac2c882ddbde408ada38c3d61 Mon Sep 17 00:00:00 2001
|
|
From: Jaroslav Kysela <perex@perex.cz>
|
|
Date: Mon, 24 Sep 2012 16:18:54 +0200
|
|
Subject: [PATCH 5/5] aplay: fix typo & silence warning..
|
|
|
|
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
|
---
|
|
aplay/aplay.c | 10 ++++++----
|
|
1 file changed, 6 insertions(+), 4 deletions(-)
|
|
|
|
--- a/aplay/aplay.c
|
|
+++ b/aplay/aplay.c
|
|
@@ -1864,7 +1864,7 @@ static u_char **remap_datav(u_char **dat
|
|
}
|
|
#else
|
|
#define remap_data(data, count) (data)
|
|
-#define remapv_data(data, count) (data)
|
|
+#define remap_datav(data, count) (data)
|
|
#endif
|
|
|
|
/*
|
|
@@ -2122,7 +2122,6 @@ static void voc_play(int fd, int ofs, ch
|
|
u_char *data, *buf;
|
|
char was_extended = 0, output = 0;
|
|
u_short *sp, repeat = 0;
|
|
- size_t silence;
|
|
off64_t filepos = 0;
|
|
|
|
#define COUNT(x) nextblock -= x; in_buffer -= x; data += x
|
|
@@ -2226,9 +2225,12 @@ static void voc_play(int fd, int ofs, ch
|
|
COUNT1(1);
|
|
hwparams.rate = 1000000 / (256 - hwparams.rate);
|
|
set_params();
|
|
- silence = (((size_t) * sp) * 1000) / hwparams.rate;
|
|
#if 0
|
|
- d_printf("Silence for %d ms\n", (int) silence);
|
|
+ {
|
|
+ size_t silence;
|
|
+ silence = (((size_t) * sp) * 1000) / hwparams.rate;
|
|
+ d_printf("Silence for %d ms\n", (int) silence);
|
|
+ }
|
|
#endif
|
|
voc_write_silence(*sp);
|
|
break;
|