forked from pool/alsa-utils
Takashi Iwai
3a57fbf7f8
- backport fix patches from upstream: * Some document fixes * Improve xrun_sync in alsaloop * Add option to dump HW parameters to aplay * Add the support for mapped volumes to amixer * Add option to tread any xrun as fatal to aplay/arecord * configure.in fixes * alsactl: Don't access other cards than specified * aplay prints Vu-meter to stderr now * fix the avail_min setup in alsaloop OBS-URL: https://build.opensuse.org/request/show/122710 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa-utils?expand=0&rev=52
67 lines
1.8 KiB
Diff
67 lines
1.8 KiB
Diff
From 6bbeb78dba60ffae7d6ef7e6c24de03104420d29 Mon Sep 17 00:00:00 2001
|
|
From: Jerome Carretero <cJ@zougloub.eu>
|
|
Date: Sat, 5 May 2012 23:10:01 -0400
|
|
Subject: [PATCH 12/13] aplay: print vu-meter to stderr, not stdout
|
|
|
|
It allows showing the vu-meter while recording to stdout, eg:
|
|
|
|
aplay -C -V stereo | oggenc - > out.ogg
|
|
|
|
Signed-off-by: Jerome Carretero <cJ@zougloub.eu>
|
|
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
|
---
|
|
aplay/aplay.c | 14 +++++++-------
|
|
1 file changed, 7 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/aplay/aplay.c b/aplay/aplay.c
|
|
index 1ce34c4..8462484 100644
|
|
--- a/aplay/aplay.c
|
|
+++ b/aplay/aplay.c
|
|
@@ -1453,9 +1453,9 @@ static void print_vu_meter_mono(int perc, int maxperc)
|
|
sprintf(line + val, "| MAX");
|
|
else
|
|
sprintf(line + val, "| %02i%%", maxperc);
|
|
- fputs(line, stdout);
|
|
+ fputs(line, stderr);
|
|
if (perc > 100)
|
|
- printf(_(" !clip "));
|
|
+ fprintf(stderr, _(" !clip "));
|
|
}
|
|
|
|
static void print_vu_meter_stereo(int *perc, int *maxperc)
|
|
@@ -1493,7 +1493,7 @@ static void print_vu_meter_stereo(int *perc, int *maxperc)
|
|
memcpy(line + bar_length, tmp, 3);
|
|
}
|
|
line[bar_length * 2 + 6 + 2] = 0;
|
|
- fputs(line, stdout);
|
|
+ fputs(line, stderr);
|
|
}
|
|
|
|
static void print_vu_meter(signed int *perc, signed int *maxperc)
|
|
@@ -1631,9 +1631,9 @@ static void compute_max_peak(u_char *data, size_t count)
|
|
if (perc[c] > maxperc[c])
|
|
maxperc[c] = perc[c];
|
|
|
|
- putchar('\r');
|
|
+ putc('\r', stderr);
|
|
print_vu_meter(perc, maxperc);
|
|
- fflush(stdout);
|
|
+ fflush(stderr);
|
|
}
|
|
else if(verbose==3) {
|
|
printf(_("Max peak (%li samples): 0x%08x "), (long)ocount, max_peak[0]);
|
|
@@ -1642,8 +1642,8 @@ static void compute_max_peak(u_char *data, size_t count)
|
|
putchar('#');
|
|
else
|
|
putchar(' ');
|
|
- printf(" %i%%\n", perc[0]);
|
|
- fflush(stdout);
|
|
+ fprintf(stderr, " %i%%\n", perc[0]);
|
|
+ fflush(stderr);
|
|
}
|
|
}
|
|
|
|
--
|
|
1.7.9.2
|
|
|