Accepting request 244351 from multimedia:libs
1 OBS-URL: https://build.opensuse.org/request/show/244351 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/alsa?expand=0&rev=153
This commit is contained in:
Git OBS Bridge
commit
29282abdba
67
0016-pcm-Fix-DSD-formats-userland-usability.patch
Normal file
67
0016-pcm-Fix-DSD-formats-userland-usability.patch
Normal file
@ -0,0 +1,67 @@
|
|||||||
|
From 87df9f3b7a650418b9aef943ac246549c132672a Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jurgen Kramer <gtmkramer@xs4all.nl>
|
||||||
|
Date: Sat, 9 Aug 2014 12:09:21 +0200
|
||||||
|
Subject: [PATCH] pcm: Fix DSD formats userland usability
|
||||||
|
|
||||||
|
Support for DSD sample formats has been added a while ago. This patch makes
|
||||||
|
those sample formats beter usable from userland (e.g. aplay).
|
||||||
|
|
||||||
|
[These implementation details have been forgotten in the previous DSD
|
||||||
|
support patch -- tiwai]
|
||||||
|
|
||||||
|
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
||||||
|
---
|
||||||
|
include/sound/asound.h | 4 +++-
|
||||||
|
src/pcm/pcm_misc.c | 4 ++++
|
||||||
|
2 files changed, 7 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/include/sound/asound.h b/include/sound/asound.h
|
||||||
|
index c819df421434..519452466317 100644
|
||||||
|
--- a/include/sound/asound.h
|
||||||
|
+++ b/include/sound/asound.h
|
||||||
|
@@ -214,7 +214,9 @@ typedef int __bitwise snd_pcm_format_t;
|
||||||
|
#define SNDRV_PCM_FORMAT_G723_24_1B ((__force snd_pcm_format_t) 45) /* 1 sample in 1 byte */
|
||||||
|
#define SNDRV_PCM_FORMAT_G723_40 ((__force snd_pcm_format_t) 46) /* 8 Samples in 5 bytes */
|
||||||
|
#define SNDRV_PCM_FORMAT_G723_40_1B ((__force snd_pcm_format_t) 47) /* 1 sample in 1 byte */
|
||||||
|
-#define SNDRV_PCM_FORMAT_LAST SNDRV_PCM_FORMAT_G723_40_1B
|
||||||
|
+#define SNDRV_PCM_FORMAT_DSD_U8 ((__force snd_pcm_format_t) 48) /* 8 1-bit samples in 1 byte */
|
||||||
|
+#define SNDRV_PCM_FORMAT_DSD_U16_LE ((__force snd_pcm_format_t) 49) /* 16 1-bit samples in 2 bytes */
|
||||||
|
+#define SNDRV_PCM_FORMAT_LAST SNDRV_PCM_FORMAT_DSD_U16_LE
|
||||||
|
|
||||||
|
#ifdef SNDRV_LITTLE_ENDIAN
|
||||||
|
#define SNDRV_PCM_FORMAT_S16 SNDRV_PCM_FORMAT_S16_LE
|
||||||
|
diff --git a/src/pcm/pcm_misc.c b/src/pcm/pcm_misc.c
|
||||||
|
index d52160cec653..44bb89cb0d44 100644
|
||||||
|
--- a/src/pcm/pcm_misc.c
|
||||||
|
+++ b/src/pcm/pcm_misc.c
|
||||||
|
@@ -195,11 +195,13 @@ int snd_pcm_format_width(snd_pcm_format_t format)
|
||||||
|
switch (format) {
|
||||||
|
case SNDRV_PCM_FORMAT_S8:
|
||||||
|
case SNDRV_PCM_FORMAT_U8:
|
||||||
|
+ case SNDRV_PCM_FORMAT_DSD_U8:
|
||||||
|
return 8;
|
||||||
|
case SNDRV_PCM_FORMAT_S16_LE:
|
||||||
|
case SNDRV_PCM_FORMAT_S16_BE:
|
||||||
|
case SNDRV_PCM_FORMAT_U16_LE:
|
||||||
|
case SNDRV_PCM_FORMAT_U16_BE:
|
||||||
|
+ case SNDRV_PCM_FORMAT_DSD_U16_LE:
|
||||||
|
return 16;
|
||||||
|
case SNDRV_PCM_FORMAT_S18_3LE:
|
||||||
|
case SNDRV_PCM_FORMAT_S18_3BE:
|
||||||
|
@@ -253,11 +255,13 @@ int snd_pcm_format_physical_width(snd_pcm_format_t format)
|
||||||
|
switch (format) {
|
||||||
|
case SNDRV_PCM_FORMAT_S8:
|
||||||
|
case SNDRV_PCM_FORMAT_U8:
|
||||||
|
+ case SNDRV_PCM_FORMAT_DSD_U8:
|
||||||
|
return 8;
|
||||||
|
case SNDRV_PCM_FORMAT_S16_LE:
|
||||||
|
case SNDRV_PCM_FORMAT_S16_BE:
|
||||||
|
case SNDRV_PCM_FORMAT_U16_LE:
|
||||||
|
case SNDRV_PCM_FORMAT_U16_BE:
|
||||||
|
+ case SNDRV_PCM_FORMAT_DSD_U16_LE:
|
||||||
|
return 16;
|
||||||
|
case SNDRV_PCM_FORMAT_S18_3LE:
|
||||||
|
case SNDRV_PCM_FORMAT_S18_3BE:
|
||||||
|
--
|
||||||
|
2.0.4
|
||||||
|
|
||||||
60
0017-Sync-include-sound-asound.h-with-3.17-rc1-kernel.patch
Normal file
60
0017-Sync-include-sound-asound.h-with-3.17-rc1-kernel.patch
Normal file
@ -0,0 +1,60 @@
|
|||||||
|
From 717ae3dd90c37f3a5ea9809370bdf56e2590a1c4 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Takashi Iwai <tiwai@suse.de>
|
||||||
|
Date: Mon, 11 Aug 2014 11:51:29 +0200
|
||||||
|
Subject: [PATCH] Sync include/sound/asound.h with 3.17-rc1 kernel
|
||||||
|
|
||||||
|
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
||||||
|
---
|
||||||
|
include/sound/asound.h | 13 +++++++++----
|
||||||
|
1 file changed, 9 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/include/sound/asound.h b/include/sound/asound.h
|
||||||
|
index 519452466317..32168f7ffce3 100644
|
||||||
|
--- a/include/sound/asound.h
|
||||||
|
+++ b/include/sound/asound.h
|
||||||
|
@@ -93,9 +93,12 @@ enum {
|
||||||
|
SNDRV_HWDEP_IFACE_SB_RC, /* SB Extigy/Audigy2NX remote control */
|
||||||
|
SNDRV_HWDEP_IFACE_HDA, /* HD-audio */
|
||||||
|
SNDRV_HWDEP_IFACE_USB_STREAM, /* direct access to usb stream */
|
||||||
|
+ SNDRV_HWDEP_IFACE_FW_DICE, /* TC DICE FireWire device */
|
||||||
|
+ SNDRV_HWDEP_IFACE_FW_FIREWORKS, /* Echo Audio Fireworks based device */
|
||||||
|
+ SNDRV_HWDEP_IFACE_FW_BEBOB, /* BridgeCo BeBoB based device */
|
||||||
|
|
||||||
|
/* Don't forget to change the following: */
|
||||||
|
- SNDRV_HWDEP_IFACE_LAST = SNDRV_HWDEP_IFACE_USB_STREAM
|
||||||
|
+ SNDRV_HWDEP_IFACE_LAST = SNDRV_HWDEP_IFACE_FW_BEBOB
|
||||||
|
};
|
||||||
|
|
||||||
|
struct snd_hwdep_info {
|
||||||
|
@@ -214,8 +217,8 @@ typedef int __bitwise snd_pcm_format_t;
|
||||||
|
#define SNDRV_PCM_FORMAT_G723_24_1B ((__force snd_pcm_format_t) 45) /* 1 sample in 1 byte */
|
||||||
|
#define SNDRV_PCM_FORMAT_G723_40 ((__force snd_pcm_format_t) 46) /* 8 Samples in 5 bytes */
|
||||||
|
#define SNDRV_PCM_FORMAT_G723_40_1B ((__force snd_pcm_format_t) 47) /* 1 sample in 1 byte */
|
||||||
|
-#define SNDRV_PCM_FORMAT_DSD_U8 ((__force snd_pcm_format_t) 48) /* 8 1-bit samples in 1 byte */
|
||||||
|
-#define SNDRV_PCM_FORMAT_DSD_U16_LE ((__force snd_pcm_format_t) 49) /* 16 1-bit samples in 2 bytes */
|
||||||
|
+#define SNDRV_PCM_FORMAT_DSD_U8 ((__force snd_pcm_format_t) 48) /* DSD, 1-byte samples DSD (x8) */
|
||||||
|
+#define SNDRV_PCM_FORMAT_DSD_U16_LE ((__force snd_pcm_format_t) 49) /* DSD, 2-byte samples DSD (x16), little endian */
|
||||||
|
#define SNDRV_PCM_FORMAT_LAST SNDRV_PCM_FORMAT_DSD_U16_LE
|
||||||
|
|
||||||
|
#ifdef SNDRV_LITTLE_ENDIAN
|
||||||
|
@@ -461,7 +464,7 @@ struct snd_xfern {
|
||||||
|
enum {
|
||||||
|
SNDRV_PCM_TSTAMP_TYPE_GETTIMEOFDAY = 0, /* gettimeofday equivalent */
|
||||||
|
SNDRV_PCM_TSTAMP_TYPE_MONOTONIC, /* posix_clock_monotonic equivalent */
|
||||||
|
- SNDRV_PCM_TSTAMP_TYPE_MONOTONIC_RAW, /* monotonic_raw (no NTP) */
|
||||||
|
+ SNDRV_PCM_TSTAMP_TYPE_MONOTONIC_RAW, /* monotonic_raw (no NTP) */
|
||||||
|
SNDRV_PCM_TSTAMP_TYPE_LAST = SNDRV_PCM_TSTAMP_TYPE_MONOTONIC_RAW,
|
||||||
|
};
|
||||||
|
|
||||||
|
@@ -820,6 +823,8 @@ typedef int __bitwise snd_ctl_elem_iface_t;
|
||||||
|
#define SNDRV_CTL_POWER_D3hot (SNDRV_CTL_POWER_D3|0x0000) /* Off, with power */
|
||||||
|
#define SNDRV_CTL_POWER_D3cold (SNDRV_CTL_POWER_D3|0x0001) /* Off, without power */
|
||||||
|
|
||||||
|
+#define SNDRV_CTL_ELEM_ID_NAME_MAXLEN 44
|
||||||
|
+
|
||||||
|
struct snd_ctl_elem_id {
|
||||||
|
unsigned int numid; /* numeric identifier, zero = invalid */
|
||||||
|
snd_ctl_elem_iface_t iface; /* interface identifier */
|
||||||
|
--
|
||||||
|
2.0.4
|
||||||
|
|
||||||
@ -0,0 +1,36 @@
|
|||||||
|
From e8e54811339b13d6df648bb48b35157d9fba352c Mon Sep 17 00:00:00 2001
|
||||||
|
From: Takashi Iwai <tiwai@suse.de>
|
||||||
|
Date: Mon, 11 Aug 2014 11:55:03 +0200
|
||||||
|
Subject: [PATCH] pcm: Add missing signed and endianess definitions for DSD
|
||||||
|
formats
|
||||||
|
|
||||||
|
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
||||||
|
---
|
||||||
|
src/pcm/pcm_misc.c | 4 ++++
|
||||||
|
1 file changed, 4 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/src/pcm/pcm_misc.c b/src/pcm/pcm_misc.c
|
||||||
|
index 44bb89cb0d44..24d52f910cb6 100644
|
||||||
|
--- a/src/pcm/pcm_misc.c
|
||||||
|
+++ b/src/pcm/pcm_misc.c
|
||||||
|
@@ -62,6 +62,8 @@ int snd_pcm_format_signed(snd_pcm_format_t format)
|
||||||
|
case SNDRV_PCM_FORMAT_U20_3BE:
|
||||||
|
case SNDRV_PCM_FORMAT_U18_3LE:
|
||||||
|
case SNDRV_PCM_FORMAT_U18_3BE:
|
||||||
|
+ case SNDRV_PCM_FORMAT_DSD_U8:
|
||||||
|
+ case SNDRV_PCM_FORMAT_DSD_U16_LE:
|
||||||
|
return 0;
|
||||||
|
default:
|
||||||
|
return -EINVAL;
|
||||||
|
@@ -150,6 +152,8 @@ int snd_pcm_format_little_endian(snd_pcm_format_t format)
|
||||||
|
case SNDRV_PCM_FORMAT_U24_3BE:
|
||||||
|
case SNDRV_PCM_FORMAT_U20_3BE:
|
||||||
|
case SNDRV_PCM_FORMAT_U18_3BE:
|
||||||
|
+ case SNDRV_PCM_FORMAT_DSD_U8:
|
||||||
|
+ case SNDRV_PCM_FORMAT_DSD_U16_LE:
|
||||||
|
return 0;
|
||||||
|
default:
|
||||||
|
return -EINVAL;
|
||||||
|
--
|
||||||
|
2.0.4
|
||||||
|
|
||||||
935
alsa-info.sh
935
alsa-info.sh
@ -1,935 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
SCRIPT_VERSION=0.4.63
|
|
||||||
CHANGELOG="http://www.alsa-project.org/alsa-info.sh.changelog"
|
|
||||||
|
|
||||||
#################################################################################
|
|
||||||
#Copyright (C) 2007 Free Software Foundation.
|
|
||||||
|
|
||||||
#This program is free software; you can redistribute it and/or modify
|
|
||||||
#it under the terms of the GNU General Public License as published by
|
|
||||||
#the Free Software Foundation; either version 2 of the License, or
|
|
||||||
#(at your option) any later version.
|
|
||||||
|
|
||||||
#This program is distributed in the hope that it will be useful,
|
|
||||||
#but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
#GNU General Public License for more details.
|
|
||||||
|
|
||||||
#You should have received a copy of the GNU General Public License
|
|
||||||
#along with this program; if not, write to the Free Software
|
|
||||||
#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
||||||
|
|
||||||
##################################################################################
|
|
||||||
|
|
||||||
#The script was written for 2 main reasons:
|
|
||||||
# 1. Remove the need for the devs/helpers to ask several questions before we can easily help the user.
|
|
||||||
# 2. Allow newer/inexperienced ALSA users to give us all the info we need to help them.
|
|
||||||
|
|
||||||
#Set the locale (this may or may not be a good idea.. let me know)
|
|
||||||
export LC_ALL=C
|
|
||||||
|
|
||||||
#Change the PATH variable, so we can run lspci (needed for some distros)
|
|
||||||
PATH=$PATH:/bin:/sbin:/usr/bin:/usr/sbin
|
|
||||||
BGTITLE="ALSA-Info v $SCRIPT_VERSION"
|
|
||||||
PASTEBINKEY="C9cRIO8m/9y8Cs0nVs0FraRx7U0pHsuc"
|
|
||||||
#Define some simple functions
|
|
||||||
|
|
||||||
pbcheck(){
|
|
||||||
[[ $UPLOAD = "no" ]] && return
|
|
||||||
|
|
||||||
if [[ -z $PASTEBIN ]]; then
|
|
||||||
[[ $(ping -c1 www.alsa-project.org) ]] || KEEP_FILES="yes" UPLOAD="no" PBERROR="yes"
|
|
||||||
else
|
|
||||||
[[ $(ping -c1 www.pastebin.ca) ]] || KEEP_FILES="yes" UPLOAD="no" PBERROR="yes"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
update() {
|
|
||||||
SHFILE=`mktemp -t alsa-info.XXXXXXXXXX` || exit 1
|
|
||||||
wget -O $SHFILE "http://www.alsa-project.org/alsa-info.sh" >/dev/null 2>&1
|
|
||||||
REMOTE_VERSION=`grep SCRIPT_VERSION $SHFILE |head -n1 |sed 's/.*=//'`
|
|
||||||
if [ "$REMOTE_VERSION" != "$SCRIPT_VERSION" ]; then
|
|
||||||
if [[ -n $DIALOG ]]
|
|
||||||
then
|
|
||||||
OVERWRITE=
|
|
||||||
if [ -w $0 ]; then
|
|
||||||
dialog --yesno "Newer version of ALSA-Info has been found\n\nDo you wish to install it?\nNOTICE: The original file $0 will be overwritten!" 0 0
|
|
||||||
DIALOG_EXIT_CODE=$?
|
|
||||||
if [[ $DIALOG_EXIT_CODE = 0 ]]; then
|
|
||||||
OVERWRITE=yes
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
if [ -z "$OVERWRITE" ]; then
|
|
||||||
dialog --yesno "Newer version of ALSA-Info has been found\n\nDo you wish to download it?" 0 0
|
|
||||||
DIALOG_EXIT_CODE=$?
|
|
||||||
fi
|
|
||||||
if [[ $DIALOG_EXIT_CODE = 0 ]]
|
|
||||||
then
|
|
||||||
echo "Newer version detected: $REMOTE_VERSION"
|
|
||||||
echo "To view the ChangeLog, please visit $CHANGELOG"
|
|
||||||
if [ "$OVERWRITE" = "yes" ]; then
|
|
||||||
cp $SHFILE $0
|
|
||||||
echo "ALSA-Info script has been updated to v $REMOTE_VERSION"
|
|
||||||
echo "Please re-run the script"
|
|
||||||
rm $SHFILE 2>/dev/null
|
|
||||||
else
|
|
||||||
echo "ALSA-Info script has been downloaded as $SHFILE."
|
|
||||||
echo "Please re-run the script from new location."
|
|
||||||
fi
|
|
||||||
exit
|
|
||||||
else
|
|
||||||
rm $SHFILE 2>/dev/null
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
echo "Newer version detected: $REMOTE_VERSION"
|
|
||||||
echo "To view the ChangeLog, please visit $CHANGELOG"
|
|
||||||
if [ -w $0 ]; then
|
|
||||||
echo "The original file $0 will be overwritten!"
|
|
||||||
echo -n "If you do not like to proceed, press Ctrl-C now.." ; read inp
|
|
||||||
cp $SHFILE $0
|
|
||||||
echo "ALSA-Info script has been updated. Please re-run it."
|
|
||||||
rm $SHFILE 2>/dev/null
|
|
||||||
else
|
|
||||||
echo "ALSA-Info script has been downloaded $SHFILE."
|
|
||||||
echo "Please, re-run it from new location."
|
|
||||||
fi
|
|
||||||
exit
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
rm $SHFILE 2>/dev/null
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
cleanup() {
|
|
||||||
if [ -n "$TEMPDIR" -a "$KEEP_FILES" != "yes" ]; then
|
|
||||||
rm -rf "$TEMPDIR" 2>/dev/null
|
|
||||||
fi
|
|
||||||
test -n "$KEEP_OUTPUT" || rm -f "$NFILE"
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
withaplay() {
|
|
||||||
echo "!!Aplay/Arecord output" >> $FILE
|
|
||||||
echo "!!--------------------" >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
echo "APLAY" >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
aplay -l >> $FILE 2>&1
|
|
||||||
echo "" >> $FILE
|
|
||||||
echo "ARECORD" >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
arecord -l >> $FILE 2>&1
|
|
||||||
echo "" >> $FILE
|
|
||||||
}
|
|
||||||
|
|
||||||
withlsmod() {
|
|
||||||
echo "!!All Loaded Modules" >> $FILE
|
|
||||||
echo "!!------------------" >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
lsmod |awk {'print $1'} >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
}
|
|
||||||
|
|
||||||
withamixer() {
|
|
||||||
echo "!!Amixer output" >> $FILE
|
|
||||||
echo "!!-------------" >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
for i in `grep "]: " /proc/asound/cards | awk -F ' ' '{ print $1} '` ; do
|
|
||||||
CARD_NAME=`grep "^ *$i " $TEMPDIR/alsacards.tmp|awk {'print $2'}`
|
|
||||||
echo "!!-------Mixer controls for card $i $CARD_NAME]" >> $FILE
|
|
||||||
echo "" >>$FILE
|
|
||||||
amixer -c$i info>> $FILE 2>&1
|
|
||||||
amixer -c$i>> $FILE 2>&1
|
|
||||||
echo "" >> $FILE
|
|
||||||
done
|
|
||||||
echo "" >> $FILE
|
|
||||||
}
|
|
||||||
|
|
||||||
withalsactl() {
|
|
||||||
echo "!!Alsactl output" >> $FILE
|
|
||||||
echo "!!--------------" >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
exe=""
|
|
||||||
if [ -x /usr/sbin/alsactl ]; then
|
|
||||||
exe="/usr/sbin/alsactl"
|
|
||||||
fi
|
|
||||||
if [ -x /usr/local/sbin/alsactl ]; then
|
|
||||||
exe="/usr/local/sbin/alsactl"
|
|
||||||
fi
|
|
||||||
if [ -z "$exe" ]; then
|
|
||||||
exe=`whereis alsactl | cut -d ' ' -f 2`
|
|
||||||
fi
|
|
||||||
$exe -f $TEMPDIR/alsactl.tmp store
|
|
||||||
echo "--startcollapse--" >> $FILE
|
|
||||||
cat $TEMPDIR/alsactl.tmp >> $FILE
|
|
||||||
echo "--endcollapse--" >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
}
|
|
||||||
|
|
||||||
withdevices() {
|
|
||||||
echo "!!ALSA Device nodes" >> $FILE
|
|
||||||
echo "!!-----------------" >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
ls -la /dev/snd/* >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
}
|
|
||||||
|
|
||||||
withconfigs() {
|
|
||||||
if [[ -e $HOME/.asoundrc ]] || [[ -e /etc/asound.conf ]] || [[ -e $HOME/.asoundrc.asoundconf ]]
|
|
||||||
then
|
|
||||||
echo "!!ALSA configuration files" >> $FILE
|
|
||||||
echo "!!------------------------" >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
|
|
||||||
#Check for ~/.asoundrc
|
|
||||||
if [[ -e $HOME/.asoundrc ]]
|
|
||||||
then
|
|
||||||
echo "!!User specific config file (~/.asoundrc)" >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
cat $HOME/.asoundrc >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
fi
|
|
||||||
#Check for .asoundrc.asoundconf (seems to be Ubuntu specific)
|
|
||||||
if [[ -e $HOME/.asoundrc.asoundconf ]]
|
|
||||||
then
|
|
||||||
echo "!!asoundconf-generated config file" >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
cat $HOME/.asoundrc.asoundconf >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
fi
|
|
||||||
#Check for /etc/asound.conf
|
|
||||||
if [[ -e /etc/asound.conf ]]
|
|
||||||
then
|
|
||||||
echo "!!System wide config file (/etc/asound.conf)" >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
cat /etc/asound.conf >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
withsysfs() {
|
|
||||||
local i f
|
|
||||||
local printed=""
|
|
||||||
for i in /sys/class/sound/*; do
|
|
||||||
case "$i" in
|
|
||||||
*/hwC?D?)
|
|
||||||
if [ -f $i/init_pin_configs ]; then
|
|
||||||
if [ -z "$printed" ]; then
|
|
||||||
echo "!!Sysfs Files" >> $FILE
|
|
||||||
echo "!!-----------" >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
fi
|
|
||||||
for f in init_pin_configs driver_pin_configs user_pin_configs init_verbs hints; do
|
|
||||||
echo "$i/$f:" >> $FILE
|
|
||||||
cat $i/$f >> $FILE
|
|
||||||
echo >> $FILE
|
|
||||||
done
|
|
||||||
printed=yes
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
if [ -n "$printed" ]; then
|
|
||||||
echo "" >> $FILE
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
withdmesg() {
|
|
||||||
echo "!!ALSA/HDA dmesg" >> $FILE
|
|
||||||
echo "!!--------------" >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
dmesg | grep -C1 -E 'ALSA|HDA|HDMI|snd[_-]|sound|hda.codec|hda.intel' >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
}
|
|
||||||
|
|
||||||
withall() {
|
|
||||||
withdevices
|
|
||||||
withconfigs
|
|
||||||
withaplay
|
|
||||||
withamixer
|
|
||||||
withalsactl
|
|
||||||
withlsmod
|
|
||||||
withsysfs
|
|
||||||
withdmesg
|
|
||||||
}
|
|
||||||
|
|
||||||
get_alsa_library_version() {
|
|
||||||
ALSA_LIB_VERSION=`grep VERSION_STR /usr/include/alsa/version.h 2>/dev/null|awk {'print $3'}|sed 's/"//g'`
|
|
||||||
|
|
||||||
if [ -z "$ALSA_LIB_VERSION" ]; then
|
|
||||||
if [ -f /etc/lsb-release ]; then
|
|
||||||
. /etc/lsb-release
|
|
||||||
case "$DISTRIB_ID" in
|
|
||||||
Ubuntu)
|
|
||||||
if which dpkg > /dev/null ; then
|
|
||||||
ALSA_LIB_VERSION=`dpkg -l libasound2 | tail -1 | awk '{print $3}' | cut -f 1 -d -`
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$ALSA_LIB_VERSION" = "<none>" ]; then
|
|
||||||
ALSA_LIB_VERSION=""
|
|
||||||
fi
|
|
||||||
return
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
return
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
elif [ -f /etc/debian_version ]; then
|
|
||||||
if which dpkg > /dev/null ; then
|
|
||||||
ALSA_LIB_VERSION=`dpkg -l libasound2 | tail -1 | awk '{print $3}' | cut -f 1 -d -`
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$ALSA_LIB_VERSION" = "<none>" ]; then
|
|
||||||
ALSA_LIB_VERSION=""
|
|
||||||
fi
|
|
||||||
return
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
#Run checks to make sure the programs we need are installed.
|
|
||||||
LSPCI=$(which lspci 2>/dev/null| sed 's|^[^/]*||' 2>/dev/null);
|
|
||||||
TPUT=$(which tput 2>/dev/null| sed 's|^[^/]*||' 2>/dev/null);
|
|
||||||
DIALOG=$(which dialog 2>/dev/null | sed 's|^[^/]*||' 2>/dev/null);
|
|
||||||
|
|
||||||
#Check to see if sysfs is enabled in the kernel. We'll need this later on
|
|
||||||
SYSFS=$(mount |grep sysfs|awk {'print $3'});
|
|
||||||
|
|
||||||
#Check modprobe config files for sound related options
|
|
||||||
SNDOPTIONS=$(modprobe -c|sed -n 's/^options \(snd[-_][^ ]*\)/\1:/p')
|
|
||||||
|
|
||||||
KEEP_OUTPUT=
|
|
||||||
NFILE=""
|
|
||||||
|
|
||||||
PASTEBIN=""
|
|
||||||
WWWSERVICE="www.alsa-project.org"
|
|
||||||
WELCOME="yes"
|
|
||||||
PROCEED="yes"
|
|
||||||
UPLOAD="ask"
|
|
||||||
REPEAT=""
|
|
||||||
while [ -z "$REPEAT" ]; do
|
|
||||||
REPEAT="no"
|
|
||||||
case "$1" in
|
|
||||||
--update|--help|--about)
|
|
||||||
WELCOME="no"
|
|
||||||
PROCEED="no"
|
|
||||||
;;
|
|
||||||
--upload)
|
|
||||||
UPLOAD="yes"
|
|
||||||
WELCOME="no"
|
|
||||||
;;
|
|
||||||
--no-upload)
|
|
||||||
UPLOAD="no"
|
|
||||||
WELCOME="no"
|
|
||||||
;;
|
|
||||||
--pastebin)
|
|
||||||
PASTEBIN="yes"
|
|
||||||
WWWSERVICE="pastebin"
|
|
||||||
;;
|
|
||||||
--no-dialog)
|
|
||||||
DIALOG=""
|
|
||||||
REPEAT=""
|
|
||||||
shift
|
|
||||||
;;
|
|
||||||
--stdout)
|
|
||||||
DIALOG=""
|
|
||||||
UPLOAD="no"
|
|
||||||
WELCOME="no"
|
|
||||||
TOSTDOUT="yes"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
|
|
||||||
|
|
||||||
#Script header output.
|
|
||||||
if [ "$WELCOME" = "yes" ]; then
|
|
||||||
greeting_message="\
|
|
||||||
|
|
||||||
This script visits the following commands/files to collect diagnostic
|
|
||||||
information about your ALSA installation and sound related hardware.
|
|
||||||
|
|
||||||
dmesg
|
|
||||||
lspci
|
|
||||||
lsmod
|
|
||||||
aplay
|
|
||||||
amixer
|
|
||||||
alsactl
|
|
||||||
/proc/asound/
|
|
||||||
/sys/class/sound/
|
|
||||||
~/.asoundrc (etc.)
|
|
||||||
|
|
||||||
See '$0 --help' for command line options.
|
|
||||||
"
|
|
||||||
if [ -n "$DIALOG" ]; then
|
|
||||||
dialog --backtitle "$BGTITLE" \
|
|
||||||
--title "ALSA-Info script v $SCRIPT_VERSION" \
|
|
||||||
--msgbox "$greeting_message" 20 80
|
|
||||||
else
|
|
||||||
echo "ALSA Information Script v $SCRIPT_VERSION"
|
|
||||||
echo "--------------------------------"
|
|
||||||
echo "$greeting_message"
|
|
||||||
fi # dialog
|
|
||||||
fi # WELCOME
|
|
||||||
|
|
||||||
#Set the output file
|
|
||||||
TEMPDIR=`mktemp -t -d alsa-info.XXXXXXXXXX` || exit 1
|
|
||||||
FILE="$TEMPDIR/alsa-info.txt"
|
|
||||||
if [ -z "$NFILE" ]; then
|
|
||||||
NFILE=`mktemp -t alsa-info.txt.XXXXXXXXXX` || exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
trap cleanup 0
|
|
||||||
|
|
||||||
if [ "$PROCEED" = "yes" ]; then
|
|
||||||
|
|
||||||
if [ -z "$LSPCI" ]; then
|
|
||||||
if [ -d /sys/bus/pci ]; then
|
|
||||||
echo "This script requires lspci. Please install it, and re-run this script."
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
#Fetch the info and store in temp files/variables
|
|
||||||
DISTRO=`grep -ihs "buntu\|SUSE\|Fedora\|PCLinuxOS\|MEPIS\|Mandriva\|Debian\|Damn\|Sabayon\|Slackware\|KNOPPIX\|Gentoo\|Zenwalk\|Mint\|Kubuntu\|FreeBSD\|Puppy\|Freespire\|Vector\|Dreamlinux\|CentOS\|Arch\|Xandros\|Elive\|SLAX\|Red\|BSD\|KANOTIX\|Nexenta\|Foresight\|GeeXboX\|Frugalware\|64\|SystemRescue\|Novell\|Solaris\|BackTrack\|KateOS\|Pardus" /etc/{issue,*release,*version}`
|
|
||||||
KERNEL_VERSION=`uname -r`
|
|
||||||
KERNEL_PROCESSOR=`uname -p`
|
|
||||||
KERNEL_MACHINE=`uname -m`
|
|
||||||
KERNEL_OS=`uname -o`
|
|
||||||
[[ `uname -v | grep SMP` ]] && KERNEL_SMP="Yes" || KERNEL_SMP="No"
|
|
||||||
ALSA_DRIVER_VERSION=`cat /proc/asound/version |head -n1|awk {'print $7'} |sed 's/\.$//'`
|
|
||||||
get_alsa_library_version
|
|
||||||
ALSA_UTILS_VERSION=`amixer -v |awk {'print $3'}`
|
|
||||||
LAST_CARD=$((`grep "]: " /proc/asound/cards | wc -l` - 1 ))
|
|
||||||
|
|
||||||
ESDINST=$(which esd 2>/dev/null| sed 's|^[^/]*||' 2>/dev/null)
|
|
||||||
PAINST=$(which pulseaudio 2>/dev/null| sed 's|^[^/]*||' 2>/dev/null)
|
|
||||||
ARTSINST=$(which artsd 2>/dev/null| sed 's|^[^/]*||' 2>/dev/null)
|
|
||||||
JACKINST=$(which jackd 2>/dev/null| sed 's|^[^/]*||' 2>/dev/null)
|
|
||||||
ROARINST=$(which roard 2>/dev/null| sed 's|^[^/]*||' 2>/dev/null)
|
|
||||||
DMIDECODE=$(which dmidecode 2>/dev/null| sed 's|^[^/]*||' 2>/dev/null)
|
|
||||||
|
|
||||||
#Check for DMI data
|
|
||||||
if [ -d /sys/class/dmi/id ]; then
|
|
||||||
# No root privileges are required when using sysfs method
|
|
||||||
DMI_SYSTEM_MANUFACTURER=$(cat /sys/class/dmi/id/sys_vendor 2>/dev/null)
|
|
||||||
DMI_SYSTEM_PRODUCT_NAME=$(cat /sys/class/dmi/id/product_name 2>/dev/null)
|
|
||||||
DMI_SYSTEM_PRODUCT_VERSION=$(cat /sys/class/dmi/id/product_version 2>/dev/null)
|
|
||||||
DMI_SYSTEM_FIRMWARE_VERSION=$(cat /sys/class/dmi/id/bios_version 2>/dev/null)
|
|
||||||
elif [ -x $DMIDECODE ]; then
|
|
||||||
DMI_SYSTEM_MANUFACTURER=$($DMIDECODE -s system-manufacturer 2>/dev/null)
|
|
||||||
DMI_SYSTEM_PRODUCT_NAME=$($DMIDECODE -s system-product-name 2>/dev/null)
|
|
||||||
DMI_SYSTEM_PRODUCT_VERSION=$($DMIDECODE -s system-version 2>/dev/null)
|
|
||||||
DMI_SYSTEM_FIRMWARE_VERSION=$($DMIDECODE -s bios-version 2>/dev/null)
|
|
||||||
fi
|
|
||||||
|
|
||||||
cat /proc/asound/modules 2>/dev/null|awk {'print $2'}>$TEMPDIR/alsamodules.tmp
|
|
||||||
cat /proc/asound/cards >$TEMPDIR/alsacards.tmp
|
|
||||||
if [[ ! -z "$LSPCI" ]]; then
|
|
||||||
lspci |grep -i "multi\|audio">$TEMPDIR/lspci.tmp
|
|
||||||
fi
|
|
||||||
|
|
||||||
#Check for HDA-Intel cards codec#*
|
|
||||||
cat /proc/asound/card*/codec\#* > $TEMPDIR/alsa-hda-intel.tmp 2> /dev/null
|
|
||||||
|
|
||||||
#Check for AC97 cards codec
|
|
||||||
cat /proc/asound/card*/codec97\#0/ac97\#0-0 > $TEMPDIR/alsa-ac97.tmp 2> /dev/null
|
|
||||||
cat /proc/asound/card*/codec97\#0/ac97\#0-0+regs > $TEMPDIR/alsa-ac97-regs.tmp 2> /dev/null
|
|
||||||
|
|
||||||
#Check for USB mixer setup
|
|
||||||
cat /proc/asound/card*/usbmixer > $TEMPDIR/alsa-usbmixer.tmp 2> /dev/null
|
|
||||||
|
|
||||||
#Fetch the info, and put it in $FILE in a nice readable format.
|
|
||||||
if [[ -z $PASTEBIN ]]; then
|
|
||||||
echo "upload=true&script=true&cardinfo=" > $FILE
|
|
||||||
else
|
|
||||||
echo "name=$USER&type=33&description=/tmp/alsa-info.txt&expiry=&s=Submit+Post&content=" > $FILE
|
|
||||||
fi
|
|
||||||
echo "!!################################" >> $FILE
|
|
||||||
echo "!!ALSA Information Script v $SCRIPT_VERSION" >> $FILE
|
|
||||||
echo "!!################################" >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
echo "!!Script ran on: `LANG=C TZ=UTC date`" >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
echo "!!Linux Distribution" >> $FILE
|
|
||||||
echo "!!------------------" >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
echo $DISTRO >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
echo "!!DMI Information" >> $FILE
|
|
||||||
echo "!!---------------" >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
echo "Manufacturer: $DMI_SYSTEM_MANUFACTURER" >> $FILE
|
|
||||||
echo "Product Name: $DMI_SYSTEM_PRODUCT_NAME" >> $FILE
|
|
||||||
echo "Product Version: $DMI_SYSTEM_PRODUCT_VERSION" >> $FILE
|
|
||||||
echo "Firmware Version: $DMI_SYSTEM_FIRMWARE_VERSION" >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
echo "!!Kernel Information" >> $FILE
|
|
||||||
echo "!!------------------" >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
echo "Kernel release: $KERNEL_VERSION" >> $FILE
|
|
||||||
echo "Operating System: $KERNEL_OS" >> $FILE
|
|
||||||
echo "Architecture: $KERNEL_MACHINE" >> $FILE
|
|
||||||
echo "Processor: $KERNEL_PROCESSOR" >> $FILE
|
|
||||||
echo "SMP Enabled: $KERNEL_SMP" >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
echo "!!ALSA Version" >> $FILE
|
|
||||||
echo "!!------------" >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
echo "Driver version: $ALSA_DRIVER_VERSION" >> $FILE
|
|
||||||
echo "Library version: $ALSA_LIB_VERSION" >> $FILE
|
|
||||||
echo "Utilities version: $ALSA_UTILS_VERSION" >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
echo "!!Loaded ALSA modules" >> $FILE
|
|
||||||
echo "!!-------------------" >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
cat $TEMPDIR/alsamodules.tmp >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
echo "!!Sound Servers on this system" >> $FILE
|
|
||||||
echo "!!----------------------------" >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
if [[ -n $PAINST ]];then
|
|
||||||
[[ `pgrep '^(.*/)?pulseaudio$'` ]] && PARUNNING="Yes" || PARUNNING="No"
|
|
||||||
echo "Pulseaudio:" >> $FILE
|
|
||||||
echo " Installed - Yes ($PAINST)" >> $FILE
|
|
||||||
echo " Running - $PARUNNING" >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
fi
|
|
||||||
if [[ -n $ESDINST ]];then
|
|
||||||
[[ `pgrep '^(.*/)?esd$'` ]] && ESDRUNNING="Yes" || ESDRUNNING="No"
|
|
||||||
echo "ESound Daemon:" >> $FILE
|
|
||||||
echo " Installed - Yes ($ESDINST)" >> $FILE
|
|
||||||
echo " Running - $ESDRUNNING" >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
fi
|
|
||||||
if [[ -n $ARTSINST ]];then
|
|
||||||
[[ `pgrep '^(.*/)?artsd$'` ]] && ARTSRUNNING="Yes" || ARTSRUNNING="No"
|
|
||||||
echo "aRts:" >> $FILE
|
|
||||||
echo " Installed - Yes ($ARTSINST)" >> $FILE
|
|
||||||
echo " Running - $ARTSRUNNING" >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
fi
|
|
||||||
if [[ -n $JACKINST ]];then
|
|
||||||
[[ `pgrep '^(.*/)?jackd$'` ]] && JACKRUNNING="Yes" || JACKRUNNING="No"
|
|
||||||
echo "Jack:" >> $FILE
|
|
||||||
echo " Installed - Yes ($JACKINST)" >> $FILE
|
|
||||||
echo " Running - $JACKRUNNING" >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
fi
|
|
||||||
if [[ -n $ROARINST ]];then
|
|
||||||
[[ `pgrep '^(.*/)?roard$'` ]] && ROARRUNNING="Yes" || ROARRUNNING="No"
|
|
||||||
echo "RoarAudio:" >> $FILE
|
|
||||||
echo " Installed - Yes ($ROARINST)" >> $FILE
|
|
||||||
echo " Running - $ROARRUNNING" >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
fi
|
|
||||||
if [[ -z "$PAINST" && -z "$ESDINST" && -z "$ARTSINST" && -z "$JACKINST" && -z "$ROARINST" ]];then
|
|
||||||
echo "No sound servers found." >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
fi
|
|
||||||
echo "" >> $FILE
|
|
||||||
echo "!!Soundcards recognised by ALSA" >> $FILE
|
|
||||||
echo "!!-----------------------------" >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
cat $TEMPDIR/alsacards.tmp >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
|
|
||||||
if [[ ! -z "$LSPCI" ]]; then
|
|
||||||
echo "!!PCI Soundcards installed in the system" >> $FILE
|
|
||||||
echo "!!--------------------------------------" >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
cat $TEMPDIR/lspci.tmp >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
echo "!!Advanced information - PCI Vendor/Device/Subsystem ID's" >> $FILE
|
|
||||||
echo "!!-------------------------------------------------------" >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
lspci -vvn |grep -A1 040[1-3] >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$SNDOPTIONS" ]
|
|
||||||
then
|
|
||||||
echo "!!Modprobe options (Sound related)" >> $FILE
|
|
||||||
echo "!!--------------------------------" >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
modprobe -c|sed -n 's/^options \(snd[-_][^ ]*\)/\1:/p' >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -d "$SYSFS" ]
|
|
||||||
then
|
|
||||||
echo "!!Loaded sound module options" >> $FILE
|
|
||||||
echo "!!---------------------------" >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
for mod in `cat /proc/asound/modules|awk {'print $2'}`;do
|
|
||||||
echo "!!Module: $mod" >> $FILE
|
|
||||||
for params in `echo $SYSFS/module/$mod/parameters/*`; do
|
|
||||||
echo -ne "\t";
|
|
||||||
echo "$params : `cat $params`" | sed 's:.*/::';
|
|
||||||
done >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
done
|
|
||||||
echo "" >> $FILE
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -s "$TEMPDIR/alsa-hda-intel.tmp" ]; then
|
|
||||||
echo "!!HDA-Intel Codec information" >> $FILE
|
|
||||||
echo "!!---------------------------" >> $FILE
|
|
||||||
echo "--startcollapse--" >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
cat $TEMPDIR/alsa-hda-intel.tmp >> $FILE
|
|
||||||
echo "--endcollapse--" >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -s "$TEMPDIR/alsa-ac97.tmp" ]; then
|
|
||||||
echo "!!AC97 Codec information" >> $FILE
|
|
||||||
echo "!!----------------------" >> $FILE
|
|
||||||
echo "--startcollapse--" >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
cat $TEMPDIR/alsa-ac97.tmp >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
cat $TEMPDIR/alsa-ac97-regs.tmp >> $FILE
|
|
||||||
echo "--endcollapse--" >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -s "$TEMPDIR/alsa-usbmixer.tmp" ]; then
|
|
||||||
echo "!!USB Mixer information" >> $FILE
|
|
||||||
echo "!!---------------------" >> $FILE
|
|
||||||
echo "--startcollapse--" >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
cat $TEMPDIR/alsa-usbmixer.tmp >> $FILE
|
|
||||||
echo "--endcollapse--" >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
fi
|
|
||||||
|
|
||||||
#If no command line options are specified, then run as though --with-all was specified
|
|
||||||
if [ -z "$1" ]; then
|
|
||||||
update
|
|
||||||
withall
|
|
||||||
pbcheck
|
|
||||||
fi
|
|
||||||
|
|
||||||
fi # proceed
|
|
||||||
|
|
||||||
#loop through command line arguments, until none are left.
|
|
||||||
if [ -n "$1" ]; then
|
|
||||||
until [ -z "$1" ]
|
|
||||||
do
|
|
||||||
case "$1" in
|
|
||||||
--pastebin)
|
|
||||||
update
|
|
||||||
withall
|
|
||||||
pbcheck
|
|
||||||
;;
|
|
||||||
--update)
|
|
||||||
update
|
|
||||||
exit
|
|
||||||
;;
|
|
||||||
--upload)
|
|
||||||
UPLOAD="yes"
|
|
||||||
withall
|
|
||||||
;;
|
|
||||||
--no-upload)
|
|
||||||
UPLOAD="no"
|
|
||||||
withall
|
|
||||||
;;
|
|
||||||
--output)
|
|
||||||
shift
|
|
||||||
NFILE="$1"
|
|
||||||
KEEP_OUTPUT="yes"
|
|
||||||
;;
|
|
||||||
--debug)
|
|
||||||
echo "Debugging enabled. $FILE and $TEMPDIR will not be deleted"
|
|
||||||
KEEP_FILES="yes"
|
|
||||||
echo ""
|
|
||||||
withall
|
|
||||||
;;
|
|
||||||
--with-all)
|
|
||||||
withall
|
|
||||||
;;
|
|
||||||
--with-aplay)
|
|
||||||
withaplay
|
|
||||||
;;
|
|
||||||
--with-amixer)
|
|
||||||
withamixer
|
|
||||||
;;
|
|
||||||
--with-alsactl)
|
|
||||||
withalsactl
|
|
||||||
;;
|
|
||||||
--with-devices)
|
|
||||||
withdevices
|
|
||||||
;;
|
|
||||||
--with-dmesg)
|
|
||||||
withdmesg
|
|
||||||
;;
|
|
||||||
--with-configs)
|
|
||||||
if [[ -e $HOME/.asoundrc ]] || [[ -e /etc/asound.conf ]]
|
|
||||||
then
|
|
||||||
echo "!!ALSA configuration files" >> $FILE
|
|
||||||
echo "!!------------------------" >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
|
|
||||||
#Check for ~/.asoundrc
|
|
||||||
if [[ -e $HOME/.asoundrc ]]
|
|
||||||
then
|
|
||||||
echo "!!User specific config file ($HOME/.asoundrc)" >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
cat $HOME/.asoundrc >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
fi
|
|
||||||
|
|
||||||
#Check for /etc/asound.conf
|
|
||||||
if [[ -e /etc/asound.conf ]]
|
|
||||||
then
|
|
||||||
echo "!!System wide config file (/etc/asound.conf)" >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
cat /etc/asound.conf >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
echo "" >> $FILE
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
--stdout)
|
|
||||||
UPLOAD="no"
|
|
||||||
withall
|
|
||||||
cat $FILE
|
|
||||||
rm $FILE
|
|
||||||
;;
|
|
||||||
--about)
|
|
||||||
echo "Written/Tested by the following users of #alsa on irc.freenode.net:"
|
|
||||||
echo ""
|
|
||||||
echo " wishie - Script author and developer / Testing"
|
|
||||||
echo " crimsun - Various script ideas / Testing"
|
|
||||||
echo " gnubien - Various script ideas / Testing"
|
|
||||||
echo " GrueMaster - HDA Intel specific items / Testing"
|
|
||||||
echo " olegfink - Script update function"
|
|
||||||
echo " TheMuso - display to stdout functionality"
|
|
||||||
exit 0
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
echo "alsa-info.sh version $SCRIPT_VERSION"
|
|
||||||
echo ""
|
|
||||||
echo "Available options:"
|
|
||||||
echo " --with-aplay (includes the output of aplay -l)"
|
|
||||||
echo " --with-amixer (includes the output of amixer)"
|
|
||||||
echo " --with-alsactl (includes the output of alsactl)"
|
|
||||||
echo " --with-configs (includes the output of ~/.asoundrc and"
|
|
||||||
echo " /etc/asound.conf if they exist)"
|
|
||||||
echo " --with-devices (shows the device nodes in /dev/snd/)"
|
|
||||||
echo " --with-dmesg (shows the ALSA/HDA kernel messages)"
|
|
||||||
echo ""
|
|
||||||
echo " --output FILE (specify the file to output for no-upload mode)"
|
|
||||||
echo " --update (check server for script updates)"
|
|
||||||
echo " --upload (upload contents to remote server)"
|
|
||||||
echo " --no-upload (do not upload contents to remote server)"
|
|
||||||
echo " --pastebin (use http://pastebin.ca) as remote server"
|
|
||||||
echo " instead www.alsa-project.org"
|
|
||||||
echo " --stdout (print alsa information to standard output"
|
|
||||||
echo " instead of a file)"
|
|
||||||
echo " --about (show some information about the script)"
|
|
||||||
echo " --debug (will run the script as normal, but will not"
|
|
||||||
echo " delete $FILE)"
|
|
||||||
exit 0
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
shift 1
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$PROCEED" = "no" ]; then
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$UPLOAD" = "ask" ]; then
|
|
||||||
if [ -n "$DIALOG" ]; then
|
|
||||||
dialog --backtitle "$BGTITLE" --title "Information collected" --yes-label " UPLOAD / SHARE " --no-label " SAVE LOCALLY " --defaultno --yesno "\n\nAutomatically upload ALSA information to $WWWSERVICE?" 10 80
|
|
||||||
DIALOG_EXIT_CODE=$?
|
|
||||||
if [ $DIALOG_EXIT_CODE != 0 ]; then
|
|
||||||
UPLOAD="no"
|
|
||||||
else
|
|
||||||
UPLOAD="yes"
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
echo -n "Automatically upload ALSA information to $WWWSERVICE? [y/N] : "
|
|
||||||
read -e CONFIRM
|
|
||||||
if [ "$CONFIRM" != "y" ]; then
|
|
||||||
UPLOAD="no"
|
|
||||||
else
|
|
||||||
UPLOAD="yes"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$UPLOAD" = "no" ]; then
|
|
||||||
|
|
||||||
if [ -z "$TOSTDOUT" ]; then
|
|
||||||
mv -f $FILE $NFILE || exit 1
|
|
||||||
KEEP_OUTPUT="yes"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ -n $DIALOG ]]
|
|
||||||
then
|
|
||||||
if [[ -n $PBERROR ]]; then
|
|
||||||
dialog --backtitle "$BGTITLE" --title "Information collected" --msgbox "An error occurred while contacting the $WWWSERVICE.\n Your information was NOT automatically uploaded.\n\nYour ALSA information is in $NFILE" 10 100
|
|
||||||
else
|
|
||||||
dialog --backtitle "$BGTITLE" --title "Information collected" --msgbox "\n\nYour ALSA information is in $NFILE" 10 60
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
echo
|
|
||||||
|
|
||||||
if [[ -n $PBERROR ]]; then
|
|
||||||
echo "An error occurred while contacting the $WWWSERVICE."
|
|
||||||
echo "Your information was NOT automatically uploaded."
|
|
||||||
echo ""
|
|
||||||
echo "Your ALSA information is in $NFILE"
|
|
||||||
echo ""
|
|
||||||
else
|
|
||||||
if [ -z "$TOSTDOUT" ]; then
|
|
||||||
echo ""
|
|
||||||
echo "Your ALSA information is in $NFILE"
|
|
||||||
echo ""
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
exit
|
|
||||||
|
|
||||||
fi # UPLOAD
|
|
||||||
|
|
||||||
#Test that wget is installed, and supports --post-file. Upload $FILE if it does, and prompt user to upload file if it doesnt.
|
|
||||||
if
|
|
||||||
WGET=$(which wget 2>/dev/null| sed 's|^[^/]*||' 2>/dev/null); [[ -n "${WGET}" ]] && [[ -x "${WGET}" ]] && [[ `wget --help |grep post-file` ]]
|
|
||||||
then
|
|
||||||
|
|
||||||
if [[ -n $DIALOG ]]
|
|
||||||
then
|
|
||||||
|
|
||||||
if [[ -z $PASTEBIN ]]; then
|
|
||||||
wget -O - --tries=5 --timeout=60 --post-file=$FILE "http://www.alsa-project.org/cardinfo-db/" &>$TEMPDIR/wget.tmp || echo "Upload failed; exit"
|
|
||||||
{ for i in 10 20 30 40 50 60 70 80 90; do
|
|
||||||
echo $i
|
|
||||||
sleep 0.2
|
|
||||||
done
|
|
||||||
echo; } |dialog --backtitle "$BGTITLE" --guage "Uploading information to www.alsa-project.org ..." 6 70 0
|
|
||||||
else
|
|
||||||
wget -O - --tries=5 --timeout=60 --post-file=$FILE "http://pastebin.ca/quiet-paste.php?api=$PASTEBINKEY&encrypt=t&encryptpw=blahblah" &>$TEMPDIR/wget.tmp || echo "Upload failed; exit"
|
|
||||||
{ for i in 10 20 30 40 50 60 70 80 90; do
|
|
||||||
echo $i
|
|
||||||
sleep 0.2
|
|
||||||
done
|
|
||||||
echo; } |dialog --backtitle "$BGTITLE" --guage "Uploading information to www.pastebin.ca ..." 6 70 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
dialog --backtitle "$BGTITLE" --title "Information uploaded" --yesno "Would you like to see the uploaded information?" 5 100
|
|
||||||
DIALOG_EXIT_CODE=$?
|
|
||||||
if [ $DIALOG_EXIT_CODE = 0 ]; then
|
|
||||||
grep -v "alsa-info.txt" $FILE >$TEMPDIR/uploaded.txt
|
|
||||||
dialog --backtitle "$BGTITLE" --textbox $TEMPDIR/uploaded.txt 0 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
clear
|
|
||||||
|
|
||||||
# no dialog
|
|
||||||
else
|
|
||||||
|
|
||||||
if [[ -z $PASTEBIN ]]; then
|
|
||||||
echo -n "Uploading information to www.alsa-project.org ... "
|
|
||||||
wget -O - --tries=5 --timeout=60 --post-file=$FILE http://www.alsa-project.org/cardinfo-db/ &>$TEMPDIR/wget.tmp &
|
|
||||||
else
|
|
||||||
echo -n "Uploading information to www.pastebin.ca ... "
|
|
||||||
wget -O - --tries=5 --timeout=60 --post-file=$FILE http://pastebin.ca/quiet-paste.php?api=$PASTEBINKEY &>$TEMPDIR/wget.tmp &
|
|
||||||
fi
|
|
||||||
|
|
||||||
#Progess spinner for wget transfer.
|
|
||||||
i=1
|
|
||||||
sp="/-\|"
|
|
||||||
echo -n ' '
|
|
||||||
while pgrep wget &>/dev/null
|
|
||||||
do
|
|
||||||
echo -en "\b${sp:i++%${#sp}:1}"
|
|
||||||
done
|
|
||||||
|
|
||||||
echo -e "\b Done!"
|
|
||||||
echo ""
|
|
||||||
|
|
||||||
fi #dialog
|
|
||||||
|
|
||||||
#See if tput is available, and use it if it is.
|
|
||||||
if [ -n "$TPUT" ]; then
|
|
||||||
if [[ -z $PASTEBIN ]]; then
|
|
||||||
FINAL_URL=`tput setaf 1; grep "SUCCESS:" $TEMPDIR/wget.tmp | cut -d ' ' -f 2 ; tput sgr0`
|
|
||||||
else
|
|
||||||
FINAL_URL=`tput setaf 1; grep "SUCCESS:" $TEMPDIR/wget.tmp | sed -n 's/.*\:\([0-9]\+\).*/http:\/\/pastebin.ca\/\1/p';tput sgr0`
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
if [[ -z $PASTEBIN ]]; then
|
|
||||||
FINAL_URL=`grep "SUCCESS:" $TEMPDIR/wget.tmp | cut -d ' ' -f 2`
|
|
||||||
else
|
|
||||||
FINAL_URL=`grep "SUCCESS:" $TEMPDIR/wget.tmp | sed -n 's/.*\:\([0-9]\+\).*/http:\/\/pastebin.ca\/\1/p'`
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Output the URL of the uploaded file.
|
|
||||||
echo "Your ALSA information is located at $FINAL_URL"
|
|
||||||
echo "Please inform the person helping you."
|
|
||||||
echo ""
|
|
||||||
|
|
||||||
# We couldnt find a suitable wget, so tell the user to upload manually.
|
|
||||||
else
|
|
||||||
mv -f $FILE $NFILE || exit 1
|
|
||||||
KEEP_OUTPUT="yes"
|
|
||||||
if [[ -z $DIALOG ]]
|
|
||||||
then
|
|
||||||
if [[ -z $PASTEBIN ]]; then
|
|
||||||
echo ""
|
|
||||||
echo "Could not automatically upload output to http://www.alsa-project.org"
|
|
||||||
echo "Possible reasons are:"
|
|
||||||
echo " 1. Couldnt find 'wget' in your PATH"
|
|
||||||
echo " 2. Your version of wget is less than 1.8.2"
|
|
||||||
echo ""
|
|
||||||
echo "Please manually upload $NFILE to http://www.alsa-project.org/cardinfo-db/ and submit your post."
|
|
||||||
echo ""
|
|
||||||
else
|
|
||||||
echo ""
|
|
||||||
echo "Could not automatically upload output to http://www.pastebin.ca"
|
|
||||||
echo "Possible reasons are:"
|
|
||||||
echo " 1. Couldnt find 'wget' in your PATH"
|
|
||||||
echo " 2. Your version of wget is less than 1.8.2"
|
|
||||||
echo ""
|
|
||||||
echo "Please manually upload $NFILE to http://www.pastebin.ca/upload.php and submit your post."
|
|
||||||
echo ""
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
if [[ -z $PASTEBIN ]]; then
|
|
||||||
dialog --backtitle "$BGTITLE" --msgbox "Could not automatically upload output to http://www.alsa-project.org.\nPossible reasons are:\n\n 1. Couldn't find 'wget' in your PATH\n 2. Your version of wget is less than 1.8.2\n\nPlease manually upload $NFILE to http://www.alsa-project,org/cardinfo-db/ and submit your post." 25 100
|
|
||||||
else
|
|
||||||
dialog --backtitle "$BGTITLE" --msgbox "Could not automatically upload output to http://www.pastebin.ca.\nPossible reasons are:\n\n 1. Couldn't find 'wget' in your PATH\n 2. Your version of wget is less than 1.8.2\n\nPlease manually upload $NFILE to http://www.pastebin.ca/upload.php and submit your post." 25 100
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
@ -1,3 +1,12 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Aug 12 16:02:33 CEST 2014 - tiwai@suse.de
|
||||||
|
|
||||||
|
- Backport upstream fixes for supporting the missing DSD formats:
|
||||||
|
0016-pcm-Fix-DSD-formats-userland-usability.patch
|
||||||
|
0017-Sync-include-sound-asound.h-with-3.17-rc1-kernel.patch
|
||||||
|
0018-pcm-Add-missing-signed-and-endianess-definitions-for.patch
|
||||||
|
- Remove alsa-info.sh from alsa.rpm; it's moved into alsa-utils
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Jul 31 17:41:50 CEST 2014 - tiwai@suse.de
|
Thu Jul 31 17:41:50 CEST 2014 - tiwai@suse.de
|
||||||
|
|
||||||
|
|||||||
@ -44,7 +44,6 @@ Source21: README.testwav
|
|||||||
Source30: all_notes_off
|
Source30: all_notes_off
|
||||||
Source31: all_notes_off.bin
|
Source31: all_notes_off.bin
|
||||||
Source32: all_notes_off.mid
|
Source32: all_notes_off.mid
|
||||||
Source33: alsa-info.sh
|
|
||||||
Source34: alsa-init.sh
|
Source34: alsa-init.sh
|
||||||
Source40: 50-alsa.conf
|
Source40: 50-alsa.conf
|
||||||
Source41: install-snd-module
|
Source41: install-snd-module
|
||||||
@ -65,6 +64,9 @@ Patch12: 0012-pcm-Fill-sw_params-proto-field.patch
|
|||||||
Patch13: 0013-pcm-route-Use-get32-for-multi-source-route-calculati.patch
|
Patch13: 0013-pcm-route-Use-get32-for-multi-source-route-calculati.patch
|
||||||
Patch14: 0014-pcm-Drop-snd_pcm_linear_-get-put-32_index.patch
|
Patch14: 0014-pcm-Drop-snd_pcm_linear_-get-put-32_index.patch
|
||||||
Patch15: 0015-pcm-pcm_local.h-include-time.h-to-enable-CLOCK_MONOT.patch
|
Patch15: 0015-pcm-pcm_local.h-include-time.h-to-enable-CLOCK_MONOT.patch
|
||||||
|
Patch16: 0016-pcm-Fix-DSD-formats-userland-usability.patch
|
||||||
|
Patch17: 0017-Sync-include-sound-asound.h-with-3.17-rc1-kernel.patch
|
||||||
|
Patch18: 0018-pcm-Add-missing-signed-and-endianess-definitions-for.patch
|
||||||
# rest suse patches
|
# rest suse patches
|
||||||
Patch99: alsa-lib-doxygen-avoid-crash-for-11.3.diff
|
Patch99: alsa-lib-doxygen-avoid-crash-for-11.3.diff
|
||||||
BuildRequires: doxygen
|
BuildRequires: doxygen
|
||||||
@ -148,6 +150,9 @@ Architecture.
|
|||||||
%patch13 -p1
|
%patch13 -p1
|
||||||
%patch14 -p1
|
%patch14 -p1
|
||||||
%patch15 -p1
|
%patch15 -p1
|
||||||
|
%patch16 -p1
|
||||||
|
%patch17 -p1
|
||||||
|
%patch18 -p1
|
||||||
%if 0%{?suse_version} == 1130
|
%if 0%{?suse_version} == 1130
|
||||||
%patch99 -p1
|
%patch99 -p1
|
||||||
%endif
|
%endif
|
||||||
@ -248,8 +253,6 @@ cp $RPM_SOURCE_DIR/README* %{buildroot}%{_docdir}/%{name}
|
|||||||
mkdir -p %{buildroot}%{_docdir}/%{name}/alsa-lib
|
mkdir -p %{buildroot}%{_docdir}/%{name}/alsa-lib
|
||||||
cp COPYING ChangeLog INSTALL TODO MEMORY-LEAK %{buildroot}%{_docdir}/%{name}/alsa-lib
|
cp COPYING ChangeLog INSTALL TODO MEMORY-LEAK %{buildroot}%{_docdir}/%{name}/alsa-lib
|
||||||
cp doc/asoundrc.txt %{buildroot}%{_docdir}/%{name}/alsa-lib
|
cp doc/asoundrc.txt %{buildroot}%{_docdir}/%{name}/alsa-lib
|
||||||
# install alsa-info.sh to sbindir
|
|
||||||
install -c -m 0755 %{SOURCE33} %{buildroot}%{_sbindir}
|
|
||||||
|
|
||||||
%post
|
%post
|
||||||
%if 0%{?suse_version} > 1310
|
%if 0%{?suse_version} > 1310
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user