Accepting request 81695 from multimedia:libs
OBS-URL: https://build.opensuse.org/request/show/81695 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/alsa-utils?expand=0&rev=56
This commit is contained in:
Sascha Peilicke
Git OBS Bridge
commit
f06c35b9ff
101
0017-speaker-test.1-Clarify-man-page-by-giving-examples.patch
Normal file
101
0017-speaker-test.1-Clarify-man-page-by-giving-examples.patch
Normal file
@ -0,0 +1,101 @@
|
||||
From 471191abe59cce84b104fc6f601cbb852a8d07e7 Mon Sep 17 00:00:00 2001
|
||||
From: Daniel T Chen <crimsun@ubuntu.com>
|
||||
Date: Sat, 4 Jun 2011 17:44:43 -0400
|
||||
Subject: [PATCH] speaker-test.1: Clarify man page by giving examples
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
BugLink: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=620513
|
||||
|
||||
From the Debian bug report:
|
||||
"The speaker-test manpage could be improved somewhat by helping a
|
||||
little bit the user determine how to find out the devices he can test.
|
||||
|
||||
Based on http://alsa.opensrc.org/Speaker-test I have make some changes
|
||||
to the manpage (diff attached) to describe a little bit more how
|
||||
speaker-test can be used alongside 'aplay'.
|
||||
|
||||
Please consider the following patch for
|
||||
alsa-utils-1.0.23/speaker-test/speaker-test.1"
|
||||
|
||||
Signed-off-by: Javier Fernández-Sanguino Peña <jfs@debian.org>
|
||||
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
||||
---
|
||||
speaker-test/speaker-test.1 | 46 ++++++++++++++++++++++++++++++++++++++++++-
|
||||
1 files changed, 45 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/speaker-test/speaker-test.1 b/speaker-test/speaker-test.1
|
||||
index f0948a6..6ef0814 100644
|
||||
--- a/speaker-test/speaker-test.1
|
||||
+++ b/speaker-test/speaker-test.1
|
||||
@@ -11,7 +11,7 @@
|
||||
. fi
|
||||
. PP
|
||||
..
|
||||
-.TH SPEAKER\-TEST 1 "20 September 2004" speaker-test
|
||||
+.TH SPEAKER\-TEST 1 "April 2nd, 2011" speaker-test
|
||||
.SH NAME
|
||||
speaker\-test \- command-line speaker test tone generator for ALSA
|
||||
.SH SYNOPSIS
|
||||
@@ -20,6 +20,41 @@ speaker\-test \- command-line speaker test tone generator for ALSA
|
||||
.SH DESCRIPTION
|
||||
\fBspeaker\-test\fP generates a tone that can be used to test the speakers of a computer.
|
||||
|
||||
+\fBspeaker-test\fP by default will test the \fIdefault\fP device. If you
|
||||
+want to test another sound device you will have first to get a list of
|
||||
+all of the sound cards in your system and the devices associated with
|
||||
+those cards. Notice that there might be for example, one device for
|
||||
+analog sound, one for digital sound and one for HDMI sound.
|
||||
+To get the list of available cards and devices you can run \fBaplay -L\fR.
|
||||
+
|
||||
+.P \fBaplay\fR's output will be similar to this one:
|
||||
+
|
||||
+.nf
|
||||
+$ aplay -L
|
||||
+null
|
||||
+ Discard all samples (playback) or generate zero samples (capture)
|
||||
+default:CARD=ICH5
|
||||
+ Intel ICH5, Intel ICH5
|
||||
+ Default Audio Device
|
||||
+front:CARD=ICH5,DEV=0
|
||||
+ Intel ICH5, Intel ICH5
|
||||
+ Front speakers
|
||||
+surround40:CARD=ICH5,DEV=0
|
||||
+ Intel ICH5, Intel ICH5
|
||||
+ 4.0 Surround output to Front and Rear speakers
|
||||
+(...)
|
||||
+.fi
|
||||
+
|
||||
+.P Each of the devices is listed in the beginning of the definition so,
|
||||
+in the above example, there are four devices listed: null, default, front
|
||||
+and surround40. So, if you want to test the last device you can
|
||||
+run \fBspeaker-test -Dsurround40:ICH5 -c 6\fR. The \fB-c\fR option will
|
||||
+indicate that the six audio channels in the device have to be tested.
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
.SH OPTIONS
|
||||
|
||||
.TP
|
||||
@@ -119,6 +154,15 @@ To send a nice low 75Hz tone to the Woofer and then exit without touching any ot
|
||||
speaker-test -Dplug:surround51 -c6 -s1 -f75
|
||||
.EE
|
||||
|
||||
+To do a 2-speaker test using the spdif (coax or optical) output:
|
||||
+.EX
|
||||
+ speaker-test -Dplug:spdif -c2
|
||||
+.EE
|
||||
+
|
||||
+
|
||||
+.SH SEE ALSO
|
||||
+.BR aplay(1)
|
||||
+
|
||||
.SH AUTHOR
|
||||
The speaker-test program was written by James Courtier-Dutton.
|
||||
Pink noise support was added by Nathan Hurst.
|
||||
--
|
||||
1.7.6
|
||||
|
||||
@ -0,0 +1,50 @@
|
||||
From 8709ffe841e6f33094f7a547ee86591b29a40cf4 Mon Sep 17 00:00:00 2001
|
||||
From: Lars-Peter Clausen <lars@metafoo.de>
|
||||
Date: Thu, 16 Jun 2011 14:19:18 +0200
|
||||
Subject: [PATCH] alsa-utils: amixer: Fix SND_CTL_TLVT_DB_RANGE handling
|
||||
|
||||
Current support for handling SND_CTL_TLVT_DB_RANGE in amixer is completely
|
||||
broken. This patch fixes it.
|
||||
|
||||
Reported-by: Daniel Mack <zonque@gmail.com>
|
||||
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
|
||||
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
||||
---
|
||||
amixer/amixer.c | 14 +++++++-------
|
||||
1 files changed, 7 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/amixer/amixer.c b/amixer/amixer.c
|
||||
index a177288..9d2855d 100644
|
||||
--- a/amixer/amixer.c
|
||||
+++ b/amixer/amixer.c
|
||||
@@ -517,20 +517,20 @@ static void decode_tlv(unsigned int spaces, unsigned int *tlv, unsigned int tlv_
|
||||
#ifdef SND_CTL_TLVT_DB_RANGE
|
||||
case SND_CTL_TLVT_DB_RANGE:
|
||||
printf("dBrange-\n");
|
||||
- if ((size / (6 * sizeof(unsigned int))) != 0) {
|
||||
+ if ((size % (6 * sizeof(unsigned int))) != 0) {
|
||||
while (size > 0) {
|
||||
printf("0x%08x,", tlv[idx++]);
|
||||
size -= sizeof(unsigned int);
|
||||
}
|
||||
break;
|
||||
}
|
||||
- idx = 0;
|
||||
- while (idx < size) {
|
||||
+ while (size > 0) {
|
||||
print_spaces(spaces + 2);
|
||||
- printf("rangemin=%i,", tlv[0]);
|
||||
- printf(",rangemax=%i\n", tlv[1]);
|
||||
- decode_tlv(spaces + 4, tlv + 2, 6 * sizeof(unsigned int));
|
||||
- idx += 6 * sizeof(unsigned int);
|
||||
+ printf("rangemin=%i,", tlv[idx++]);
|
||||
+ printf(",rangemax=%i\n", tlv[idx++]);
|
||||
+ decode_tlv(spaces + 4, tlv + idx, 4 * sizeof(unsigned int));
|
||||
+ idx += 4;
|
||||
+ size -= 6 * sizeof(unsigned int);
|
||||
}
|
||||
break;
|
||||
#endif
|
||||
--
|
||||
1.7.6
|
||||
|
||||
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Jun 28 15:53:16 CEST 2011 - tiwai@suse.de
|
||||
|
||||
- Improved speaker-test man page
|
||||
- Fix DB_RANGE TLV type handling in amixer
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jun 3 14:50:00 CEST 2011 - tiwai@suse.de
|
||||
|
||||
|
||||
@ -53,6 +53,8 @@ Patch13: 0013-Updated-COPYING-with-the-recent-FSF-address.patch
|
||||
Patch14: 0014-alsamixer-Fix-64bit-issues.patch
|
||||
Patch15: 0015-aplay-Add-include-files-for-mkdir.patch
|
||||
Patch16: 0016-aplay-Use-standard-endian-convesions.patch
|
||||
Patch17: 0017-speaker-test.1-Clarify-man-page-by-giving-examples.patch
|
||||
Patch18: 0018-alsa-utils-amixer-Fix-SND_CTL_TLVT_DB_RANGE-handling.patch
|
||||
Patch99: alsa-utils-gettext-version-removal.diff
|
||||
# Patch100: alsa-utils-po-pre-patch.diff
|
||||
Url: http://www.alsa-project.org/
|
||||
@ -92,6 +94,8 @@ sed -i -e's/EXTRA_DIST= config.rpath /EXTRA_DIST=/' Makefile.am
|
||||
%patch14 -p1
|
||||
%patch15 -p1
|
||||
%patch16 -p1
|
||||
%patch17 -p1
|
||||
%patch18 -p1
|
||||
%if %suse_version < 1020
|
||||
%patch99 -p1
|
||||
%endif
|
||||
|
||||
Loading…
Reference in New Issue
Block a user