Hello community, here is the log from the commit of package alsa checked in at Thu Aug 7 01:08:07 CEST 2008. -------- --- alsa/alsa.changes 2008-07-28 18:17:09.000000000 +0200 +++ /mounts/work_src_done/STABLE/alsa/alsa.changes 2008-08-06 15:52:05.000000000 +0200 @@ -1,0 +2,8 @@ +Wed Aug 6 15:32:54 CEST 2008 - tiwai@suse.de + +- fix the detection of non-interleaved format in dmix code +- fix the detection of old timer tread support in dmix +- update IEC958 status bits for recent additions of consumer mode +- move alsa-info.sh to sbindir + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ alsa.spec ++++++ --- /var/tmp/diff_new_pack.x24162/_old 2008-08-07 01:07:43.000000000 +0200 +++ /var/tmp/diff_new_pack.x24162/_new 2008-08-07 01:07:43.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package alsa (Version 1.0.17) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -22,7 +29,7 @@ AutoReqProv: on Summary: Advanced Linux Sound Architecture Version: 1.0.17 -Release: 6 +Release: 10 Source: ftp://ftp.alsa-project.org/pub/lib/alsa-lib-%{package_version}.tar.bz2 Source8: 40-alsa.rules Source11: alsasound @@ -178,8 +185,8 @@ mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}/alsa-lib cp COPYING ChangeLog INSTALL TODO MEMORY-LEAK $RPM_BUILD_ROOT%{_docdir}/%{name}/alsa-lib cp doc/asoundrc.txt $RPM_BUILD_ROOT%{_docdir}/%{name}/alsa-lib -# install alsa-info.sh to docdir -install -c -m 0755 %{SOURCE33} $RPM_BUILD_ROOT%{_docdir}/%{name} +# install alsa-info.sh to sbindir +install -c -m 0755 %{SOURCE33} $RPM_BUILD_ROOT%{_sbindir} %post %{rename_sysconfig_variable START_ALSA_SEQ LOAD_SEQUENCER} @@ -252,6 +259,11 @@ %{_datadir}/alsa %changelog +* Wed Aug 06 2008 tiwai@suse.de +- fix the detection of non-interleaved format in dmix code +- fix the detection of old timer tread support in dmix +- update IEC958 status bits for recent additions of consumer mode +- move alsa-info.sh to sbindir * Mon Jul 28 2008 tiwai@suse.de - fix snd_pcm_rewind() and snd_pcm_forward() for plugins, mainly for pulseaudio ++++++ alsa-lib-git-fixes.diff ++++++ --- /var/tmp/diff_new_pack.x24162/_old 2008-08-07 01:07:43.000000000 +0200 +++ /var/tmp/diff_new_pack.x24162/_new 2008-08-07 01:07:43.000000000 +0200 @@ -1,3 +1,151 @@ +diff --git a/include/asoundef.h b/include/asoundef.h +index e780c65..c6c4eec 100644 +--- a/include/asoundef.h ++++ b/include/asoundef.h +@@ -69,35 +69,56 @@ extern "C" { + #define IEC958_AES1_PRO_USERBITS_UDEF (12<<4) /**< user defined application */ + #define IEC958_AES1_CON_CATEGORY 0x7f /**< consumer category */ + #define IEC958_AES1_CON_GENERAL 0x00 /**< general category */ +-#define IEC958_AES1_CON_EXPERIMENTAL 0x40 /**< experimental category */ +-#define IEC958_AES1_CON_SOLIDMEM_MASK 0x0f /**< ??? */ +-#define IEC958_AES1_CON_SOLIDMEM_ID 0x08 /**< ??? */ +-#define IEC958_AES1_CON_BROADCAST1_MASK 0x07 /**< ??? */ +-#define IEC958_AES1_CON_BROADCAST1_ID 0x04 /**< ??? */ +-#define IEC958_AES1_CON_DIGDIGCONV_MASK 0x07 /**< digital<->digital converter mask */ +-#define IEC958_AES1_CON_DIGDIGCONV_ID 0x02 /**< digital<->digital converter id */ +-#define IEC958_AES1_CON_ADC_COPYRIGHT_MASK 0x1f /**< ADC Copyright mask */ +-#define IEC958_AES1_CON_ADC_COPYRIGHT_ID 0x06 /**< ADC Copyright ID */ +-#define IEC958_AES1_CON_ADC_MASK 0x1f /**< ADC Mask */ +-#define IEC958_AES1_CON_ADC_ID 0x16 /**< ADC ID */ +-#define IEC958_AES1_CON_BROADCAST2_MASK 0x0f /**< Broadcast mask */ +-#define IEC958_AES1_CON_BROADCAST2_ID 0x0e /**< Broadcast ID */ + #define IEC958_AES1_CON_LASEROPT_MASK 0x07 /**< Laser-optical mask */ + #define IEC958_AES1_CON_LASEROPT_ID 0x01 /**< Laser-optical ID */ +-#define IEC958_AES1_CON_MUSICAL_MASK 0x07 /**< Musical device mask */ +-#define IEC958_AES1_CON_MUSICAL_ID 0x05 /**< Musical device ID */ +-#define IEC958_AES1_CON_MAGNETIC_MASK 0x07 /**< Magnetic device mask */ +-#define IEC958_AES1_CON_MAGNETIC_ID 0x03 /**< Magnetic device ID */ + #define IEC958_AES1_CON_IEC908_CD (IEC958_AES1_CON_LASEROPT_ID|0x00) /**< IEC958 CD compatible device */ + #define IEC958_AES1_CON_NON_IEC908_CD (IEC958_AES1_CON_LASEROPT_ID|0x08) /**< non-IEC958 CD compatible device */ ++#define IEC958_AES1_CON_MINI_DISC (IEC958_AES1_CON_LASEROPT_ID|0x48) /**< Mini-Disc device */ ++#define IEC958_AES1_CON_DVD (IEC958_AES1_CON_LASEROPT_ID|0x18) /**< DVD device */ ++#define IEC958_AES1_CON_LASTEROPT_OTHER (IEC958_AES1_CON_LASEROPT_ID|0x78) /**< Other laser-optical product */ ++#define IEC958_AES1_CON_DIGDIGCONV_MASK 0x07 /**< digital<->digital converter mask */ ++#define IEC958_AES1_CON_DIGDIGCONV_ID 0x02 /**< digital<->digital converter id */ + #define IEC958_AES1_CON_PCM_CODER (IEC958_AES1_CON_DIGDIGCONV_ID|0x00) /**< PCM coder */ +-#define IEC958_AES1_CON_SAMPLER (IEC958_AES1_CON_DIGDIGCONV_ID|0x20) /**< PCM sampler */ +-#define IEC958_AES1_CON_MIXER (IEC958_AES1_CON_DIGDIGCONV_ID|0x10) /**< Mixer */ ++#define IEC958_AES1_CON_MIXER (IEC958_AES1_CON_DIGDIGCONV_ID|0x10) /**< Digital signal mixer */ + #define IEC958_AES1_CON_RATE_CONVERTER (IEC958_AES1_CON_DIGDIGCONV_ID|0x18) /**< Rate converter */ +-#define IEC958_AES1_CON_SYNTHESIZER (IEC958_AES1_CON_MUSICAL_ID|0x00) /**< Synthesizer */ +-#define IEC958_AES1_CON_MICROPHONE (IEC958_AES1_CON_MUSICAL_ID|0x08) /**< Microphone */ ++#define IEC958_AES1_CON_SAMPLER (IEC958_AES1_CON_DIGDIGCONV_ID|0x20) /**< PCM sampler */ ++#define IEC958_AES1_CON_DSP (IEC958_AES1_CON_DIGDIGCONV_ID|0x28) /**< Digital sound processor */ ++#define IEC958_AES1_CON_DIGDIGCONV_OTHER (IEC958_AES1_CON_DIGDIGCONV_ID|0x78) /**< Other digital<->digital product */ ++#define IEC958_AES1_CON_MAGNETIC_MASK 0x07 /**< Magnetic device mask */ ++#define IEC958_AES1_CON_MAGNETIC_ID 0x03 /**< Magnetic device ID */ + #define IEC958_AES1_CON_DAT (IEC958_AES1_CON_MAGNETIC_ID|0x00) /**< Digital Audio Tape */ + #define IEC958_AES1_CON_VCR (IEC958_AES1_CON_MAGNETIC_ID|0x08) /**< Video recorder */ ++#define IEC958_AES1_CON_DCC (IEC958_AES1_CON_MAGNETIC_ID|0x40) /**< Digital compact cassette */ ++#define IEC958_AES1_CON_MAGNETIC_DISC (IEC958_AES1_CON_MAGNETIC_ID|0x18) /**< Magnetic disc digital audio device */ ++#define IEC958_AES1_CON_MAGNETIC_OTHER (IEC958_AES1_CON_MAGNETIC_ID|0x78) /**< Other magnetic device */ ++#define IEC958_AES1_CON_BROADCAST1_MASK 0x07 /**< Broadcast mask */ ++#define IEC958_AES1_CON_BROADCAST1_ID 0x04 /**< Broadcast ID */ ++#define IEC958_AES1_CON_DAB_JAPAN (IEC958_AES1_CON_BROADCAST1_ID|0x00) /**< Digital audio broadcast (Japan) */ ++#define IEC958_AES1_CON_DAB_EUROPE (IEC958_AES1_CON_BROADCAST1_ID|0x08) /**< Digital audio broadcast (Europe) */ ++#define IEC958_AES1_CON_DAB_USA (IEC958_AES1_CON_BROADCAST1_ID|0x60) /**< Digital audio broadcast (USA) */ ++#define IEC958_AES1_CON_SOFTWARE (IEC958_AES1_CON_BROADCAST1_ID|0x40) /**< Electronic software delivery */ ++#define IEC958_AES1_CON_IEC62105 (IEC958_AES1_CON_BROADCAST1_ID|0x20) /**< Used by another standard (IEC 62105) */ ++#define IEC958_AES1_CON_BROADCAST1_OTHER (IEC958_AES1_CON_BROADCAST1_ID|0x78) /**< Other broadcast product */ ++#define IEC958_AES1_CON_BROADCAST2_MASK 0x0f /**< Broadcast alternative mask */ ++#define IEC958_AES1_CON_BROADCAST2_ID 0x0e /**< Broadcast alternative ID */ ++#define IEC958_AES1_CON_MUSICAL_MASK 0x07 /**< Musical device mask */ ++#define IEC958_AES1_CON_MUSICAL_ID 0x05 /**< Musical device ID */ ++#define IEC958_AES1_CON_SYNTHESIZER (IEC958_AES1_CON_MUSICAL_ID|0x00) /**< Synthesizer */ ++#define IEC958_AES1_CON_MICROPHONE (IEC958_AES1_CON_MUSICAL_ID|0x08) /**< Microphone */ ++#define IEC958_AES1_CON_MUSICAL_OTHER (IEC958_AES1_CON_MUSICAL_ID|0x78) /**< Other musical device */ ++#define IEC958_AES1_CON_ADC_MASK 0x1f /**< ADC Mask */ ++#define IEC958_AES1_CON_ADC_ID 0x06 /**< ADC ID */ ++#define IEC958_AES1_CON_ADC (IEC958_AES1_CON_ADC_ID|0x00) /**< ADC without copyright information */ ++#define IEC958_AES1_CON_ADC_OTHER (IEC958_AES1_CON_ADC_ID|0x60) /**< Other ADC product (with no copyright information) */ ++#define IEC958_AES1_CON_ADC_COPYRIGHT_MASK 0x1f /**< ADC Copyright mask */ ++#define IEC958_AES1_CON_ADC_COPYRIGHT_ID 0x16 /**< ADC Copyright ID */ ++#define IEC958_AES1_CON_ADC_COPYRIGHT (IEC958_AES1_CON_ADC_COPYRIGHT_ID|0x00) /**< ADC with copyright information */ ++#define IEC958_AES1_CON_ADC_COPYRIGHT_OTHER (IEC958_AES1_CON_ADC_COPYRIGHT_ID|0x60) /**< Other ADC with copyright information product */ ++#define IEC958_AES1_CON_SOLIDMEM_MASK 0x0f /**< Solid memory based products mask */ ++#define IEC958_AES1_CON_SOLIDMEM_ID 0x08 /**< Solid memory based products ID */ ++#define IEC958_AES1_CON_SOLIDMEM_DIGITAL_RECORDER_PLAYER (IEC958_AES1_CON_SOLIDMEM_ID|0x00) /**< Digital audio recorder and player using solid state memory */ ++#define IEC958_AES1_CON_SOLIDMEM_OTHER (IEC958_AES1_CON_SOLIDMEM_ID|0x70) /**< Other solid state memory based product */ ++#define IEC958_AES1_CON_EXPERIMENTAL 0x40 /**< experimental category */ + #define IEC958_AES1_CON_ORIGINAL (1<<7) /**< this bits depends on the category code */ + #define IEC958_AES2_PRO_SBITS (7<<0) /**< mask - sample bits */ + #define IEC958_AES2_PRO_SBITS_20 (2<<0) /**< 20-bit - coordination */ +@@ -115,8 +136,16 @@ extern "C" { + #define IEC958_AES2_CON_CHANNEL_UNSPEC (0<<4) /**< channel number unspecified */ + #define IEC958_AES3_CON_FS (15<<0) /**< mask - sample frequency */ + #define IEC958_AES3_CON_FS_44100 (0<<0) /**< 44.1kHz */ ++#define IEC958_AES3_CON_FS_NOTID (1<<0) /**< sample frequency non indicated */ + #define IEC958_AES3_CON_FS_48000 (2<<0) /**< 48kHz */ + #define IEC958_AES3_CON_FS_32000 (3<<0) /**< 32kHz */ ++#define IEC958_AES3_CON_FS_22050 (4<<0) /**< 22.05kHz */ ++#define IEC958_AES3_CON_FS_24000 (6<<0) /**< 24kHz */ ++#define IEC958_AES3_CON_FS_88200 (8<<0) /**< 88.2kHz */ ++#define IEC958_AES3_CON_FS_768000 (9<<0) /**< 768kHz */ ++#define IEC958_AES3_CON_FS_96000 (10<<0) /**< 96kHz */ ++#define IEC958_AES3_CON_FS_176400 (12<<0) /**< 176.4kHz */ ++#define IEC958_AES3_CON_FS_192000 (14<<0) /**< 192kHz */ + #define IEC958_AES3_CON_CLOCK (3<<4) /**< mask - clock accuracy */ + #define IEC958_AES3_CON_CLOCK_1000PPM (0<<4) /**< 1000 ppm */ + #define IEC958_AES3_CON_CLOCK_50PPM (1<<4) /**< 50 ppm */ +@@ -129,6 +158,26 @@ extern "C" { + #define IEC958_AES4_CON_WORDLEN_23_19 (4<<1) /**< 23-bit or 19-bit */ + #define IEC958_AES4_CON_WORDLEN_24_20 (5<<1) /**< 24-bit or 20-bit */ + #define IEC958_AES4_CON_WORDLEN_21_17 (6<<1) /**< 21-bit or 17-bit */ ++#define IEC958_AES4_CON_ORIGFS (15<<4) /**< mask - original sample frequency */ ++#define IEC958_AES4_CON_ORIGFS_NOTID (0<<4) /**< original sample frequency not indicated */ ++#define IEC958_AES4_CON_ORIGFS_192000 (1<<4) /**< 192kHz */ ++#define IEC958_AES4_CON_ORIGFS_12000 (2<<4) /**< 12kHz */ ++#define IEC958_AES4_CON_ORIGFS_176400 (3<<4) /**< 176.4kHz */ ++#define IEC958_AES4_CON_ORIGFS_96000 (5<<4) /**< 96kHz */ ++#define IEC958_AES4_CON_ORIGFS_8000 (6<<4) /**< 8kHz */ ++#define IEC958_AES4_CON_ORIGFS_88200 (7<<4) /**< 88.2kHz */ ++#define IEC958_AES4_CON_ORIGFS_16000 (8<<4) /**< 16kHz */ ++#define IEC958_AES4_CON_ORIGFS_24000 (9<<4) /**< 24kHz */ ++#define IEC958_AES4_CON_ORIGFS_11025 (10<<4) /**< 11.025kHz */ ++#define IEC958_AES4_CON_ORIGFS_22050 (11<<4) /**< 22.05kHz */ ++#define IEC958_AES4_CON_ORIGFS_32000 (12<<4) /**< 32kHz */ ++#define IEC958_AES4_CON_ORIGFS_48000 (13<<4) /**< 48kHz */ ++#define IEC958_AES4_CON_ORIGFS_44100 (15<<4) /**< 44.1kHz */ ++#define IEC958_AES5_CON_CGMSA (3<<0) /**< mask - CGMS-A */ ++#define IEC958_AES5_CON_CGMSA_COPYFREELY (0<<0) /**< copying is permitted without restriction */ ++#define IEC958_AES5_CON_CGMSA_COPYONCE (1<<0) /**< one generation of copies may be made */ ++#define IEC958_AES5_CON_CGMSA_COPYNOMORE (2<<0) /**< condition not be used */ ++#define IEC958_AES5_CON_CGMSA_COPYNEVER (3<<0) /**< no copying is permitted */ + + /** \} */ + +diff --git a/src/pcm/pcm_direct.c b/src/pcm/pcm_direct.c +index a884b12..1170963 100644 +--- a/src/pcm/pcm_direct.c ++++ b/src/pcm/pcm_direct.c +@@ -1107,7 +1107,7 @@ int snd_pcm_direct_initialize_poll_fd(snd_pcm_direct_t *dmix) + snd_pcm_info_get_subdevice(info) * 2 + capture); + ret = snd_timer_open(&dmix->timer, name, SND_TIMER_OPEN_NONBLOCK | SND_TIMER_OPEN_TREAD); + if (ret < 0) { +- dmix->tread = 1; ++ dmix->tread = 0; + ret = snd_timer_open(&dmix->timer, name, SND_TIMER_OPEN_NONBLOCK); + if (ret < 0) { + SNDERR("unable to open timer '%s'", name); +@@ -1293,7 +1293,7 @@ int snd_pcm_direct_check_interleave(snd_pcm_direct_t *dmix, snd_pcm_t *pcm) + const snd_pcm_channel_area_t *dst_areas; + const snd_pcm_channel_area_t *src_areas; + +- bits = snd_pcm_format_physical_width(dmix->type); ++ bits = snd_pcm_format_physical_width(pcm->format); + if ((bits % 8) != 0) + interleaved = 0; + channels = dmix->channels; diff --git a/src/pcm/pcm_plugin.c b/src/pcm/pcm_plugin.c index c73a02b..c4f5b4a 100644 --- a/src/pcm/pcm_plugin.c ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org