This commit is contained in:
OBS User unknown
Git OBS Bridge
parent
81799e8f82
commit
1cf65e010f
60
alsa-info.sh
60
alsa-info.sh
@ -1,6 +1,6 @@
|
||||
#!/bin/bash
|
||||
|
||||
SCRIPT_VERSION=0.4.36
|
||||
SCRIPT_VERSION=0.4.41
|
||||
CHANGELOG="http://hg.alsa-project.org/alsa/log/tip/alsa-info.sh"
|
||||
|
||||
#################################################################################
|
||||
@ -98,8 +98,8 @@ withamixer() {
|
||||
echo "!!Amixer output" >> $FILE
|
||||
echo "!!-------------" >> $FILE
|
||||
echo "" >> $FILE
|
||||
for i in `seq 0 $LAST_CARD`;do
|
||||
CARD_NAME=`grep "^ $i" /tmp/alsainfo/alsacards.tmp|awk {'print $2'}`
|
||||
for i in `grep "]: " /proc/asound/cards | awk -F ' ' '{ print $1} '` ; do
|
||||
CARD_NAME=`grep "^ *$i " /tmp/alsainfo/alsacards.tmp|awk {'print $2'}`
|
||||
echo "!!-------Mixer controls for card $i $CARD_NAME]" >> $FILE
|
||||
echo "" >>$FILE
|
||||
amixer -c$i>> $FILE
|
||||
@ -123,7 +123,9 @@ withalsactl() {
|
||||
exe=`whereis alsactl | cut -d ' ' -f 2`
|
||||
fi
|
||||
$exe -f /tmp/alsainfo/alsactl.tmp store
|
||||
echo "--startcollapse--" >> $FILE
|
||||
cat /tmp/alsainfo/alsactl.tmp >> $FILE
|
||||
echo "--endcollapse--" >> $FILE
|
||||
echo "" >> $FILE
|
||||
echo "" >> $FILE
|
||||
}
|
||||
@ -188,19 +190,36 @@ SNDOPTIONS=$(modprobe -c|sed -n 's/^options \(snd[-_][^ ]*\)/\1:/p')
|
||||
|
||||
QUESTION="yes"
|
||||
PROCEED="yes"
|
||||
NOUPLOAD=""
|
||||
REPEAT=""
|
||||
while [ -z "$REPEAT" ]; do
|
||||
REPEAT="no"
|
||||
case "$1" in
|
||||
--update|--help|--about)
|
||||
QUESTION="no"
|
||||
PROCEED="no"
|
||||
;;
|
||||
--no-upload)
|
||||
NOUPLOAD="yes"
|
||||
;;
|
||||
--no-dialog)
|
||||
DIALOG=""
|
||||
REPEAT=""
|
||||
shift
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
|
||||
#Script header output.
|
||||
if [ "$QUESTION" = "yes" ]; then
|
||||
if [[ -n "$DIALOG" ]]
|
||||
then
|
||||
if [ -z "NOUPLOAD" ]; then
|
||||
dialog --backtitle "$BGTITLE" --title "ALSA-Info script v $SCRIPT_VERSION" --yesno "\nThis script will collect information about your ALSA installation and sound related hardware, to help diagnose your problem\n\nBy default, this script will AUTOMATICALLY UPLOAD your information to a pastebin site.\n\nSee $0 --help for options\n\nDo you want to run this script?" 0 0
|
||||
else
|
||||
dialog --backtitle "$BGTITLE" --title "ALSA-Info script v $SCRIPT_VERSION" --yesno "\nThis script will collect information about your ALSA installation and sound related hardware, to help diagnose your problem\n\nSee $0 --help for options\n\nDo you want to run this script?" 0 0
|
||||
fi
|
||||
DIALOG_EXIT_CODE=$?
|
||||
if [ $DIALOG_EXIT_CODE != 0 ]; then
|
||||
echo "Thank you for using the ALSA-Info Script"
|
||||
@ -213,6 +232,7 @@ echo "--------------------------------"
|
||||
echo ""
|
||||
echo "This script will collect information about your ALSA installation and sound related hardware, to help diagnose your problem."
|
||||
echo ""
|
||||
if [ -z "$NOUPLOAD" ]; then
|
||||
if [[ -n "$TPUT" ]]; then
|
||||
tput bold
|
||||
echo "By default, the collected information will be AUTOMATICALLY uploaded to a pastebin site."
|
||||
@ -223,9 +243,10 @@ echo "By default, the collected information will be AUTOMATICALLY uploaded to a
|
||||
echo "If you do not wish for this to occur, run the script with the --no-upload argument"
|
||||
fi
|
||||
echo ""
|
||||
fi # NOUPLOAD
|
||||
echo -n "Do you want to run this script? [y/n] : "
|
||||
read -e CONFIRM
|
||||
if [ $CONFIRM != "y" ]; then
|
||||
if [ "$CONFIRM" != "y" ]; then
|
||||
echo ""
|
||||
echo "Thank you for using the ALSA-Info Script"
|
||||
exit 0;
|
||||
@ -265,8 +286,12 @@ cat /proc/asound/modules 2>/dev/null|awk {'print $2'}>/tmp/alsainfo/alsamodules.
|
||||
cat /proc/asound/cards >/tmp/alsainfo/alsacards.tmp
|
||||
lspci |grep -i "multi\|audio">/tmp/alsainfo/lspci.tmp
|
||||
|
||||
#Check for HDA-Intel cards codec#0
|
||||
cat /proc/asound/card0/codec\#* > /tmp/alsainfo/alsa-hda-intel.tmp 2> /dev/null
|
||||
#Check for HDA-Intel cards codec#*
|
||||
cat /proc/asound/card*/codec\#* > /tmp/alsainfo/alsa-hda-intel.tmp 2> /dev/null
|
||||
|
||||
#Check for AC97 cards codec
|
||||
cat /proc/asound/card*/codec97\#0/ac97\#0-0 > /tmp/alsainfo/alsa-ac97.tmp 2> /dev/null
|
||||
cat /proc/asound/card*/codec97\#0/ac97\#0-0+regs > /tmp/alsainfo/alsa-ac97-regs.tmp 2> /dev/null
|
||||
|
||||
#Fetch the info, and put it in $FILE in a nice readable format.
|
||||
echo "name=$USER&type=33&description=/tmp/alsa-info.txt&expiry=&s=Submit+Post&content=" > $FILE
|
||||
@ -353,12 +378,29 @@ if [ -s "/tmp/alsainfo/alsa-hda-intel.tmp" ]
|
||||
then
|
||||
echo "!!HDA-Intel Codec information" >> $FILE
|
||||
echo "!!---------------------------" >> $FILE
|
||||
echo "--startcollapse--" >> $FILE
|
||||
echo "" >> $FILE
|
||||
cat /tmp/alsainfo/alsa-hda-intel.tmp >> $FILE
|
||||
echo "--endcollapse--" >> $FILE
|
||||
echo "" >> $FILE
|
||||
echo "" >> $FILE
|
||||
fi
|
||||
|
||||
if [ -s "/tmp/alsainfo/alsa-ac97.tmp" ]
|
||||
then
|
||||
echo "!!AC97 Codec information" >> $FILE
|
||||
echo "!!---------------------------" >> $FILE
|
||||
echo "--startcollapse--" >> $FILE
|
||||
echo "" >> $FILE
|
||||
cat /tmp/alsainfo/alsa-ac97.tmp >> $FILE
|
||||
echo "" >> $FILE
|
||||
cat /tmp/alsainfo/alsa-ac97-regs.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
|
||||
@ -370,7 +412,7 @@ then
|
||||
withalsactl
|
||||
withlsmod
|
||||
#Workaround, while we sort out pastebin location, since pastebin.ca blocked us.
|
||||
#NOUPLOAD="1"
|
||||
#NOUPLOAD="yes"
|
||||
|
||||
fi
|
||||
|
||||
@ -387,7 +429,7 @@ then
|
||||
exit
|
||||
;;
|
||||
--no-upload)
|
||||
NOUPLOAD="1"
|
||||
NOUPLOAD="yes"
|
||||
KEEP_FILES="yes"
|
||||
withdevices
|
||||
withconfigs
|
||||
@ -565,6 +607,7 @@ then
|
||||
dialog --backtitle "$BGTITLE" --textbox /tmp/alsainfo/uploaded.txt 0 0
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
clear
|
||||
if [[ -n $NOUPLOAD ]]; then
|
||||
echo "You requested that your information was NOT automatically uploaded to the pastebin"
|
||||
@ -576,7 +619,6 @@ if [[ -z $NOUPLOAD ]]; then
|
||||
echo "Your ALSA information is located at $FINAL_URL"
|
||||
echo "Please inform the person helping you."
|
||||
echo ""
|
||||
fi
|
||||
fi
|
||||
#We posted the file to pastebin.ca , so we dont need it anymore. delete it.
|
||||
if [ -z $KEEP_FILES ]
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
diff -r b1dfac5a4d55 configure.in
|
||||
--- a/configure.in Tue Feb 05 10:08:09 2008 +0100
|
||||
+++ b/configure.in Mon Mar 03 10:13:04 2008 +0100
|
||||
+++ b/configure.in Mon Mar 10 13:08:39 2008 +0100
|
||||
@@ -575,8 +575,8 @@ if test ! -L "$srcdir"/include/alsa ; th
|
||||
ln -sf . "$srcdir"/include/alsa
|
||||
fi
|
||||
@ -14,7 +14,7 @@ diff -r b1dfac5a4d55 configure.in
|
||||
src/rawmidi/Makefile src/timer/Makefile \
|
||||
diff -r b1dfac5a4d55 doc/Makefile.am
|
||||
--- a/doc/Makefile.am Tue Feb 05 10:08:09 2008 +0100
|
||||
+++ b/doc/Makefile.am Mon Mar 03 10:13:04 2008 +0100
|
||||
+++ b/doc/Makefile.am Mon Mar 10 13:08:39 2008 +0100
|
||||
@@ -5,6 +5,7 @@ INCLUDES=-I$(top_srcdir)/include
|
||||
INCLUDES=-I$(top_srcdir)/include
|
||||
|
||||
@ -148,7 +148,7 @@ diff -r b1dfac5a4d55 doc/doxygen.cfg
|
||||
-#FILTER_SOURCE_FILES = YES
|
||||
diff -r b1dfac5a4d55 doc/doxygen.cfg.in
|
||||
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
|
||||
+++ b/doc/doxygen.cfg.in Mon Mar 03 10:13:04 2008 +0100
|
||||
+++ b/doc/doxygen.cfg.in Mon Mar 10 13:08:39 2008 +0100
|
||||
@@ -0,0 +1,119 @@
|
||||
+PROJECT_NAME = "ALSA project - the C library reference"
|
||||
+OUTPUT_DIRECTORY = doxygen
|
||||
@ -271,7 +271,7 @@ diff -r b1dfac5a4d55 doc/doxygen.cfg.in
|
||||
+#FILTER_SOURCE_FILES = YES
|
||||
diff -r b1dfac5a4d55 include/asoundef.h
|
||||
--- a/include/asoundef.h Tue Feb 05 10:08:09 2008 +0100
|
||||
+++ b/include/asoundef.h Mon Mar 03 10:13:04 2008 +0100
|
||||
+++ b/include/asoundef.h Mon Mar 10 13:08:39 2008 +0100
|
||||
@@ -121,6 +121,14 @@ extern "C" {
|
||||
#define IEC958_AES3_CON_CLOCK_1000PPM (0<<4) /**< 1000 ppm */
|
||||
#define IEC958_AES3_CON_CLOCK_50PPM (1<<4) /**< 50 ppm */
|
||||
@ -289,7 +289,7 @@ diff -r b1dfac5a4d55 include/asoundef.h
|
||||
|
||||
diff -r b1dfac5a4d55 include/iatomic.h
|
||||
--- a/include/iatomic.h Tue Feb 05 10:08:09 2008 +0100
|
||||
+++ b/include/iatomic.h Mon Mar 03 10:13:04 2008 +0100
|
||||
+++ b/include/iatomic.h Mon Mar 10 13:08:39 2008 +0100
|
||||
@@ -1010,6 +1010,75 @@ static __inline__ void atomic_clear_mask
|
||||
|
||||
#endif /* __arm__ */
|
||||
@ -368,7 +368,7 @@ diff -r b1dfac5a4d55 include/iatomic.h
|
||||
* non supported architecture.
|
||||
diff -r b1dfac5a4d55 include/pcm.h
|
||||
--- a/include/pcm.h Tue Feb 05 10:08:09 2008 +0100
|
||||
+++ b/include/pcm.h Mon Mar 03 10:13:04 2008 +0100
|
||||
+++ b/include/pcm.h Mon Mar 10 13:08:39 2008 +0100
|
||||
@@ -1105,6 +1105,8 @@ int snd_pcm_sw_params_get_xfer_align(con
|
||||
int snd_pcm_sw_params_get_xfer_align(const snd_pcm_sw_params_t *params, snd_pcm_uframes_t *val) __attribute__((deprecated));
|
||||
int snd_pcm_sw_params_set_sleep_min(snd_pcm_t *pcm, snd_pcm_sw_params_t *params, unsigned int val) __attribute__((deprecated));
|
||||
@ -389,7 +389,7 @@ diff -r b1dfac5a4d55 include/pcm.h
|
||||
|
||||
diff -r b1dfac5a4d55 include/seq.h
|
||||
--- a/include/seq.h Tue Feb 05 10:08:09 2008 +0100
|
||||
+++ b/include/seq.h Mon Mar 03 10:13:04 2008 +0100
|
||||
+++ b/include/seq.h Mon Mar 10 13:08:39 2008 +0100
|
||||
@@ -152,6 +152,11 @@ void snd_seq_client_info_set_broadcast_f
|
||||
void snd_seq_client_info_set_broadcast_filter(snd_seq_client_info_t *info, int val);
|
||||
void snd_seq_client_info_set_error_bounce(snd_seq_client_info_t *info, int val);
|
||||
@ -412,7 +412,7 @@ diff -r b1dfac5a4d55 include/seq.h
|
||||
|
||||
diff -r b1dfac5a4d55 include/sound/asound.h
|
||||
--- a/include/sound/asound.h Tue Feb 05 10:08:09 2008 +0100
|
||||
+++ b/include/sound/asound.h Mon Mar 03 10:13:04 2008 +0100
|
||||
+++ b/include/sound/asound.h Mon Mar 10 13:08:39 2008 +0100
|
||||
@@ -59,6 +59,7 @@
|
||||
#ifndef __KERNEL__
|
||||
#include <sys/time.h>
|
||||
@ -421,9 +421,115 @@ diff -r b1dfac5a4d55 include/sound/asound.h
|
||||
#endif
|
||||
|
||||
/*
|
||||
diff -r b1dfac5a4d55 modules/mixer/simple/Makefile.am
|
||||
--- a/modules/mixer/simple/Makefile.am Tue Feb 05 10:08:09 2008 +0100
|
||||
+++ b/modules/mixer/simple/Makefile.am Mon Mar 10 13:08:39 2008 +0100
|
||||
@@ -1,4 +1,5 @@ pkglibdir = @ALSA_PLUGIN_DIR@/smixer
|
||||
-pkglibdir = @ALSA_PLUGIN_DIR@/smixer
|
||||
+alsaplugindir = @ALSA_PLUGIN_DIR@
|
||||
+pkglibdir = $(alsaplugindir)/smixer
|
||||
pythonlibs = @PYTHON_LIBS@
|
||||
pythonincludes = @PYTHON_INCLUDES@
|
||||
|
||||
diff -r b1dfac5a4d55 src/conf/Makefile.am
|
||||
--- a/src/conf/Makefile.am Tue Feb 05 10:08:09 2008 +0100
|
||||
+++ b/src/conf/Makefile.am Mon Mar 10 13:08:39 2008 +0100
|
||||
@@ -10,5 +10,6 @@ endif
|
||||
|
||||
EXTRA_DIST = $(cfg_files)
|
||||
|
||||
-alsadir = @ALSA_CONFIG_DIR@
|
||||
+alsaconfigdir = @ALSA_CONFIG_DIR@
|
||||
+alsadir = $(alsaconfigdir)
|
||||
alsa_DATA = $(cfg_files)
|
||||
diff -r b1dfac5a4d55 src/conf/alsa.conf
|
||||
--- a/src/conf/alsa.conf Tue Feb 05 10:08:09 2008 +0100
|
||||
+++ b/src/conf/alsa.conf Mon Mar 10 13:08:39 2008 +0100
|
||||
@@ -125,6 +125,7 @@ pcm.surround71 cards.pcm.surround71
|
||||
pcm.surround71 cards.pcm.surround71
|
||||
pcm.iec958 cards.pcm.iec958
|
||||
pcm.spdif iec958
|
||||
+pcm.hdmi cards.pcm.hdmi
|
||||
pcm.dmix cards.pcm.dmix
|
||||
pcm.dsnoop cards.pcm.dsnoop
|
||||
pcm.modem cards.pcm.modem
|
||||
diff -r b1dfac5a4d55 src/conf/cards/HDA-Intel.conf
|
||||
--- a/src/conf/cards/HDA-Intel.conf Tue Feb 05 10:08:09 2008 +0100
|
||||
+++ b/src/conf/cards/HDA-Intel.conf Mon Mar 10 13:08:39 2008 +0100
|
||||
@@ -137,6 +137,51 @@ HDA-Intel.pcm.iec958.0 {
|
||||
hint.device 1
|
||||
}
|
||||
|
||||
+<confdir:pcm/hdmi.conf>
|
||||
+
|
||||
+HDA-Intel.pcm.hdmi.0 {
|
||||
+ @args [ CARD AES0 AES1 AES2 AES3 ]
|
||||
+ @args.CARD {
|
||||
+ type string
|
||||
+ }
|
||||
+ @args.AES0 {
|
||||
+ type integer
|
||||
+ }
|
||||
+ @args.AES1 {
|
||||
+ type integer
|
||||
+ }
|
||||
+ @args.AES2 {
|
||||
+ type integer
|
||||
+ }
|
||||
+ @args.AES3 {
|
||||
+ type integer
|
||||
+ }
|
||||
+ type hooks
|
||||
+ slave.pcm {
|
||||
+ type hw
|
||||
+ card $CARD
|
||||
+ device 3
|
||||
+ }
|
||||
+ hooks.0 {
|
||||
+ type ctl_elems
|
||||
+ hook_args [
|
||||
+ {
|
||||
+ name "IEC958 Playback Default"
|
||||
+ lock true
|
||||
+ preserve true
|
||||
+ value [ $AES0 $AES1 $AES2 $AES3 ]
|
||||
+ }
|
||||
+ {
|
||||
+ name "IEC958 Playback Switch"
|
||||
+ lock true
|
||||
+ preserve true
|
||||
+ value true
|
||||
+ }
|
||||
+ ]
|
||||
+ }
|
||||
+ hint.device 3
|
||||
+}
|
||||
+
|
||||
<confdir:pcm/modem.conf>
|
||||
|
||||
HDA-Intel.pcm.modem.0 {
|
||||
diff -r b1dfac5a4d55 src/conf/cards/Makefile.am
|
||||
--- a/src/conf/cards/Makefile.am Tue Feb 05 10:08:09 2008 +0100
|
||||
+++ b/src/conf/cards/Makefile.am Mon Mar 10 13:08:39 2008 +0100
|
||||
@@ -1,4 +1,5 @@ alsadir = @ALSA_CONFIG_DIR@/cards
|
||||
-alsadir = @ALSA_CONFIG_DIR@/cards
|
||||
+alsaconfigdir = @ALSA_CONFIG_DIR@
|
||||
+alsadir = $(alsaconfigdir)/cards
|
||||
cfg_files = aliases.conf \
|
||||
AACI.conf \
|
||||
ATIIXP.conf \
|
||||
@@ -58,7 +59,7 @@ alsa_DATA = $(cfg_files)
|
||||
alsa_DATA = $(cfg_files)
|
||||
|
||||
if BUILD_ALISP
|
||||
-SI7018dir = @ALSA_CONFIG_DIR@/cards/SI7018
|
||||
+SI7018dir = $(alsaconfigdir)/cards/SI7018
|
||||
SI7018_files = \
|
||||
SI7018/sndoc-mixer.alisp \
|
||||
SI7018/sndop-mixer.alisp
|
||||
diff -r b1dfac5a4d55 src/conf/cards/NFORCE.conf
|
||||
--- a/src/conf/cards/NFORCE.conf Tue Feb 05 10:08:09 2008 +0100
|
||||
+++ b/src/conf/cards/NFORCE.conf Mon Mar 03 10:13:04 2008 +0100
|
||||
+++ b/src/conf/cards/NFORCE.conf Mon Mar 10 13:08:39 2008 +0100
|
||||
@@ -171,6 +171,79 @@ NFORCE.pcm.surround51.0 {
|
||||
}
|
||||
}
|
||||
@ -504,9 +610,182 @@ diff -r b1dfac5a4d55 src/conf/cards/NFORCE.conf
|
||||
<confdir:pcm/iec958.conf>
|
||||
|
||||
NFORCE.pcm.iec958.0 {
|
||||
diff -r b1dfac5a4d55 src/conf/pcm/Makefile.am
|
||||
--- a/src/conf/pcm/Makefile.am Tue Feb 05 10:08:09 2008 +0100
|
||||
+++ b/src/conf/pcm/Makefile.am Mon Mar 10 13:08:39 2008 +0100
|
||||
@@ -1,11 +1,12 @@ cfg_files = default.conf front.conf rear
|
||||
cfg_files = default.conf front.conf rear.conf center_lfe.conf side.conf\
|
||||
surround40.conf surround41.conf \
|
||||
surround50.conf surround51.conf \
|
||||
- surround71.conf iec958.conf modem.conf \
|
||||
+ surround71.conf iec958.conf hdmi.conf modem.conf \
|
||||
dmix.conf dsnoop.conf \
|
||||
dpl.conf
|
||||
|
||||
EXTRA_DIST = $(cfg_files)
|
||||
|
||||
-alsadir = @ALSA_CONFIG_DIR@/pcm
|
||||
+alsaconfigdir = @ALSA_CONFIG_DIR@
|
||||
+alsadir = $(alsaconfigdir)/pcm
|
||||
alsa_DATA = $(cfg_files)
|
||||
diff -r b1dfac5a4d55 src/conf/pcm/hdmi.conf
|
||||
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
|
||||
+++ b/src/conf/pcm/hdmi.conf Mon Mar 10 13:08:39 2008 +0100
|
||||
@@ -0,0 +1,83 @@
|
||||
+#
|
||||
+# Hardware output from HDMI
|
||||
+#
|
||||
+
|
||||
+pcm.!hdmi {
|
||||
+ @args [ CARD DEV AES0 AES1 AES2 AES3 ]
|
||||
+ @args.CARD {
|
||||
+ type string
|
||||
+ default {
|
||||
+ @func getenv
|
||||
+ vars [
|
||||
+ ALSA_IEC958_CARD
|
||||
+ ALSA_PCM_CARD
|
||||
+ ALSA_CARD
|
||||
+ ]
|
||||
+ default {
|
||||
+ @func refer
|
||||
+ name defaults.pcm.iec958.card
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+ @args.DEV {
|
||||
+ type integer
|
||||
+ default {
|
||||
+ @func igetenv
|
||||
+ vars [
|
||||
+ ALSA_IEC958_DEVICE
|
||||
+ ]
|
||||
+ default {
|
||||
+ @func refer
|
||||
+ name defaults.pcm.iec958.device
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+ @args.AES0 {
|
||||
+ type integer
|
||||
+ # consumer, not-copyright, emphasis-none, mode=0
|
||||
+ default 0x04
|
||||
+ }
|
||||
+ @args.AES1 {
|
||||
+ type integer
|
||||
+ # original, PCM coder
|
||||
+ default 0x82
|
||||
+ }
|
||||
+ @args.AES2 {
|
||||
+ type integer
|
||||
+ # source and channel
|
||||
+ default 0x00
|
||||
+ }
|
||||
+ @args.AES3 {
|
||||
+ type integer
|
||||
+ # fs=48000Hz, clock accuracy=1000ppm
|
||||
+ default 0x02
|
||||
+ }
|
||||
+ type empty
|
||||
+ slave.pcm {
|
||||
+ @func refer
|
||||
+ name {
|
||||
+ @func concat
|
||||
+ strings [
|
||||
+ "cards."
|
||||
+ {
|
||||
+ @func card_driver
|
||||
+ card $CARD
|
||||
+ }
|
||||
+ ".pcm.hdmi." $DEV ":"
|
||||
+ "CARD=" $CARD ","
|
||||
+ "AES0=" $AES0 ","
|
||||
+ "AES1=" $AES1 ","
|
||||
+ "AES2=" $AES2 ","
|
||||
+ "AES3=" $AES3
|
||||
+ ]
|
||||
+ }
|
||||
+ }
|
||||
+ hint {
|
||||
+ show {
|
||||
+ @func refer
|
||||
+ name defaults.namehint.basic
|
||||
+ }
|
||||
+ description "HDMI Audio Output"
|
||||
+ device $DEV
|
||||
+ }
|
||||
+}
|
||||
diff -r b1dfac5a4d55 src/control/namehint.c
|
||||
--- a/src/control/namehint.c Tue Feb 05 10:08:09 2008 +0100
|
||||
+++ b/src/control/namehint.c Mon Mar 10 13:08:39 2008 +0100
|
||||
@@ -197,10 +197,11 @@ static char *get_dev_name(struct hint_li
|
||||
free(str1);
|
||||
return res;
|
||||
}
|
||||
- } else {
|
||||
- return strdup(list->cardname);
|
||||
}
|
||||
- return NULL;
|
||||
+ /* if the specified device doesn't exist, skip this entry */
|
||||
+ if (list->device_input >= 0 || list->device_output >= 0)
|
||||
+ return NULL;
|
||||
+ return strdup(list->cardname);
|
||||
}
|
||||
|
||||
#ifndef DOC_HIDDEN
|
||||
@@ -304,8 +305,8 @@ static int try_config(struct hint_list *
|
||||
err = -EINVAL;
|
||||
goto __cleanup;
|
||||
}
|
||||
- list->device_input = -1;
|
||||
- list->device_output = -1;
|
||||
+ list->device_input = dev;
|
||||
+ list->device_output = dev;
|
||||
}
|
||||
if (snd_config_search(cfg, "device_input", &n) >= 0) {
|
||||
if (snd_config_get_integer(n, &list->device_input) < 0) {
|
||||
diff -r b1dfac5a4d55 src/pcm/pcm_dmix.c
|
||||
--- a/src/pcm/pcm_dmix.c Tue Feb 05 10:08:09 2008 +0100
|
||||
+++ b/src/pcm/pcm_dmix.c Mon Mar 10 13:08:39 2008 +0100
|
||||
@@ -311,9 +311,9 @@ static void snd_pcm_dmix_sync_area(snd_p
|
||||
if (size >= pcm->boundary / 2)
|
||||
size = pcm->boundary - size;
|
||||
|
||||
- /* the slave_app_ptr can be far behing the slave_hw_ptr */
|
||||
+ /* the slave_app_ptr can be far behind the slave_hw_ptr */
|
||||
/* reduce mixing and errors here - just skip not catched writes */
|
||||
- if (dmix->slave_hw_ptr < dmix->slave_appl_ptr)
|
||||
+ if (dmix->slave_hw_ptr <= dmix->slave_appl_ptr)
|
||||
slave_size = dmix->slave_appl_ptr - dmix->slave_hw_ptr;
|
||||
else
|
||||
slave_size = dmix->slave_appl_ptr + (dmix->slave_boundary - dmix->slave_hw_ptr);
|
||||
diff -r b1dfac5a4d55 src/pcm/pcm_file.c
|
||||
--- a/src/pcm/pcm_file.c Tue Feb 05 10:08:09 2008 +0100
|
||||
+++ b/src/pcm/pcm_file.c Mon Mar 10 13:08:39 2008 +0100
|
||||
@@ -469,7 +469,7 @@ int snd_pcm_file_open(snd_pcm_t **pcmp,
|
||||
pcm->poll_fd = slave->poll_fd;
|
||||
pcm->poll_events = slave->poll_events;
|
||||
pcm->mmap_shadow = 1;
|
||||
-#ifdef HAVE_CLOCK_GETTIME
|
||||
+#if defined(HAVE_CLOCK_GETTIME) && defined(CLOCK_MONOTONIC)
|
||||
pcm->monotonic = clock_gettime(CLOCK_MONOTONIC, ×pec) == 0;
|
||||
#else
|
||||
pcm->monotonic = 0;
|
||||
diff -r b1dfac5a4d55 src/pcm/pcm_hw.c
|
||||
--- a/src/pcm/pcm_hw.c Tue Feb 05 10:08:09 2008 +0100
|
||||
+++ b/src/pcm/pcm_hw.c Mon Mar 10 13:08:39 2008 +0100
|
||||
@@ -994,7 +994,7 @@ int snd_pcm_hw_open_fd(snd_pcm_t **pcmp,
|
||||
if (SNDRV_PROTOCOL_INCOMPATIBLE(ver, SNDRV_PCM_VERSION_MAX))
|
||||
return -SND_ERROR_INCOMPATIBLE_VERSION;
|
||||
|
||||
-#ifdef HAVE_CLOCK_GETTIME
|
||||
+#if defined(HAVE_CLOCK_GETTIME) && defined(CLOCK_MONOTONIC)
|
||||
if (SNDRV_PROTOCOL_VERSION(2, 0, 9) <= ver) {
|
||||
struct timespec timespec;
|
||||
if (clock_gettime(CLOCK_MONOTONIC, ×pec) == 0) {
|
||||
diff -r b1dfac5a4d55 src/pcm/pcm_ioplug.c
|
||||
--- a/src/pcm/pcm_ioplug.c Tue Feb 05 10:08:09 2008 +0100
|
||||
+++ b/src/pcm/pcm_ioplug.c Mon Mar 03 10:13:04 2008 +0100
|
||||
+++ b/src/pcm/pcm_ioplug.c Mon Mar 10 13:08:39 2008 +0100
|
||||
@@ -484,7 +484,7 @@ static int snd_pcm_ioplug_pause(snd_pcm_
|
||||
{
|
||||
ioplug_priv_t *io = pcm->private_data;
|
||||
@ -516,9 +795,30 @@ diff -r b1dfac5a4d55 src/pcm/pcm_ioplug.c
|
||||
};
|
||||
int prev, err;
|
||||
|
||||
diff -r b1dfac5a4d55 src/pcm/pcm_local.h
|
||||
--- a/src/pcm/pcm_local.h Tue Feb 05 10:08:09 2008 +0100
|
||||
+++ b/src/pcm/pcm_local.h Mon Mar 10 13:08:39 2008 +0100
|
||||
@@ -944,13 +944,17 @@ typedef union snd_tmp_double {
|
||||
/* get the current timestamp */
|
||||
static inline void gettimestamp(snd_htimestamp_t *tstamp, int monotonic)
|
||||
{
|
||||
+#if defined(HAVE_CLOCK_GETTIME) && defined(CLOCK_MONOTONIC)
|
||||
if (monotonic) {
|
||||
clock_gettime(CLOCK_MONOTONIC, tstamp);
|
||||
} else {
|
||||
+#endif
|
||||
struct timeval tv;
|
||||
|
||||
gettimeofday(&tv, 0);
|
||||
tstamp->tv_sec = tv.tv_sec;
|
||||
tstamp->tv_nsec = tv.tv_usec * 1000L;
|
||||
+#if defined(HAVE_CLOCK_GETTIME) && defined(CLOCK_MONOTONIC)
|
||||
}
|
||||
+#endif
|
||||
}
|
||||
diff -r b1dfac5a4d55 src/seq/seq.c
|
||||
--- a/src/seq/seq.c Tue Feb 05 10:08:09 2008 +0100
|
||||
+++ b/src/seq/seq.c Mon Mar 03 10:13:04 2008 +0100
|
||||
+++ b/src/seq/seq.c Mon Mar 10 13:08:39 2008 +0100
|
||||
@@ -1522,11 +1522,17 @@ int snd_seq_client_info_get_error_bounce
|
||||
}
|
||||
|
||||
@ -677,7 +977,7 @@ diff -r b1dfac5a4d55 src/seq/seq.c
|
||||
|
||||
diff -r b1dfac5a4d55 src/seq/seqmid.c
|
||||
--- a/src/seq/seqmid.c Tue Feb 05 10:08:09 2008 +0100
|
||||
+++ b/src/seq/seqmid.c Mon Mar 03 10:13:04 2008 +0100
|
||||
+++ b/src/seq/seqmid.c Mon Mar 10 13:08:39 2008 +0100
|
||||
@@ -251,8 +251,7 @@ int snd_seq_set_client_event_filter(snd_
|
||||
|
||||
if ((err = snd_seq_get_client_info(seq, &info)) < 0)
|
||||
@ -690,7 +990,7 @@ diff -r b1dfac5a4d55 src/seq/seqmid.c
|
||||
|
||||
diff -r b1dfac5a4d55 test/Makefile.am
|
||||
--- a/test/Makefile.am Tue Feb 05 10:08:09 2008 +0100
|
||||
+++ b/test/Makefile.am Mon Mar 03 10:13:04 2008 +0100
|
||||
+++ b/test/Makefile.am Mon Mar 10 13:08:39 2008 +0100
|
||||
@@ -1,6 +1,6 @@ check_PROGRAMS=control pcm pcm_min laten
|
||||
check_PROGRAMS=control pcm pcm_min latency seq \
|
||||
playmidi1 timer rawmidi midiloop \
|
||||
@ -709,7 +1009,7 @@ diff -r b1dfac5a4d55 test/Makefile.am
|
||||
INCLUDES=-I$(top_srcdir)/include
|
||||
diff -r b1dfac5a4d55 test/client_event_filter.c
|
||||
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
|
||||
+++ b/test/client_event_filter.c Mon Mar 03 10:13:04 2008 +0100
|
||||
+++ b/test/client_event_filter.c Mon Mar 10 13:08:39 2008 +0100
|
||||
@@ -0,0 +1,46 @@
|
||||
+#include <alsa/asoundlib.h>
|
||||
+
|
||||
|
||||
10
alsa.changes
10
alsa.changes
@ -1,3 +1,13 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 10 13:09:16 CET 2008 - tiwai@suse.de
|
||||
|
||||
- HG snapshot 20080310:
|
||||
* fix build with older glibc
|
||||
* fix the silence at the beginning of dmix playback
|
||||
* hdmi pcm definition (experimental)
|
||||
* fix name listing for non-existing devices
|
||||
- improved/fixed alsa-info.sh for non-HD devices
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 3 10:19:10 CET 2008 - tiwai@suse.de
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@ PreReq: %insserv_prereq %fillup_prereq
|
||||
AutoReqProv: on
|
||||
Summary: Advanced Linux Sound Architecture
|
||||
Version: 1.0.16
|
||||
Release: 16
|
||||
Release: 18
|
||||
Source: ftp://ftp.alsa-project.org/pub/lib/alsa-lib-%{package_version}.tar.bz2
|
||||
Source8: 40-alsa.rules
|
||||
Source11: alsasound
|
||||
@ -250,6 +250,13 @@ exit 0
|
||||
%{_datadir}/alsa
|
||||
|
||||
%changelog
|
||||
* Mon Mar 10 2008 tiwai@suse.de
|
||||
- HG snapshot 20080310:
|
||||
* fix build with older glibc
|
||||
* fix the silence at the beginning of dmix playback
|
||||
* hdmi pcm definition (experimental)
|
||||
* fix name listing for non-existing devices
|
||||
- improved/fixed alsa-info.sh for non-HD devices
|
||||
* Mon Mar 03 2008 tiwai@suse.de
|
||||
- fix a typo in configure option --enable-symbolic-functions
|
||||
- HG version (20080228):
|
||||
|
||||
Loading…
Reference in New Issue
Block a user