May 2009 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] asoundconf removed from alsa-utils?
by Susan Cragin 13 May '09

13 May '09

The message says that asoundconf is not present because alsa-utils is not installed. However, I have just installed the latest. 20090512. And the following alsa-utils work: arecord works, as well as alsamixer and alsactl. I hesitate to even report this, because I'm on karmic with 2.6.30-5-generic kernel, and I know there are bugs, and that I am pre-alpha. So this is FYI -- no response needed or expected. Susan

3 2

[alsa-devel] emu10k1 TRAM access ?
by mAdVax 13 May '09

13 May '09

Hello I would like to send some data to a DSP patch. I can use alsa controls (easy) but I need more : TRAM and lookup table. I read many lines of code, but all this is still quite obscure... Here are 3 questions : How can I fill the TRAM ? (from user space) How can I know which TRAM area has been allocated to a given patch ? Do 'lookup tables' work ? Some code samples will be greatly appreciated :) Thanks in advance. Xavier

1 0

[alsa-devel] ALSA 1.0.20 PCM Capture Problem (Does not happen on ALSA 1.0.19)
by Robert Vincent Krakora 13 May '09

13 May '09

Hello, I am utilizing an external mic on my machine in conjunction with a VF0560 Live! Cam Optia AF webcam. I am running CentOS 5.3 with the kernel listed below and ALSA 1.0.20. I using the machine to stream video with VLC 9.9 (see further below). VLC spits out the following on the console of my machine whist capturing A/V and serving it up on the network...ALSA 1.0.19 did not exhibit this problem while streaming it did lock up after 20 minutes or so (audio could be heard on the VLC or mplayer client with ALSA 1.0.19...just bits and pieces of audio every now and then with ALSA 1.0.20. V4L is not the culprit here as video streams and can be received without incident if I do not also capture audio. The mic is plugged into the onboard sound on the motherboard. I have not yet tried my USB mic with ALSA 1.0.20, but I will try it later tonight. Any and all help would be greatly appreciate. Thanks in advance. [00000473] main audio output warning: audio drift is too big (-146765), clearing out [00000473] main audio output warning: mixer start isn't output start (-29715) [00000473] main audio output warning: audio drift is too big (-150692), clearing out [00000473] main audio output warning: mixer start isn't output start (-30980) [00000493] main spu text debug: looking for text renderer module: 3 candidates [00000493] freetype spu text error: failed to load font file /usr/share/fonts/truetype/freefont/FreeSerifBold.ttf [00000493] main spu text debug: using text renderer module "svg" [00000493] main spu text debug: TIMER module_Need() : 29.750 ms - Total 29.750 ms / 1 intvls (Avg 29.750 ms) [00000492] main blend debug: looking for video blending module: 1 candidate [00000492] blend blend debug: chroma: YUVA -> I420 [00000492] main blend debug: using video blending module "blend" [00000492] main blend debug: TIMER module_Need() : 0.433 ms - Total 0.433 ms / 1 intvls (Avg 0.433 ms) [00000473] main audio output warning: audio drift is too big (-147017), clearing out [00000473] main audio output warning: mixer start isn't output start (-29763) [00000473] main audio output warning: audio drift is too big (-147157), clearing out [00000473] main audio output warning: mixer start isn't output start (-30302) [00000473] main audio output warning: audio drift is too big (-150434), clearing out [00000473] main audio output warning: mixer start isn't output start (-30931) [00000473] main audio output warning: buffer is 114796 in advance, triggering downsampling [00000473] main audio output warning: audio drift is too big (-261628), clearing out [00000473] main audio output warning: timing screwed, stopping resampling [00000473] main audio output warning: mixer start isn't output start (-53788) [00000473] main audio output warning: audio drift is too big (-146580), clearing out [00000473] main audio output warning: mixer start isn't output start (-29711) [00000473] main audio output warning: audio drift is too big (-150686), clearing out [00000473] main audio output warning: mixer start isn't output start (-30979) [00000473] main audio output warning: audio drift is too big (-146733), clearing out [00000473] main audio output warning: mixer start isn't output start (-29708) [00000473] main audio output warning: audio drift is too big (-146978), clearing out [00000473] main audio output warning: mixer start isn't output start (-30267) [00000473] main audio output warning: audio drift is too big (-150569), clearing out [00000473] main audio output warning: mixer start isn't output start (-30445) [00000473] main audio output warning: buffer is 114650 in advance, triggering downsampling [00000473] main audio output warning: audio drift is too big (-261447), clearing out [00000473] main audio output warning: timing screwed, stopping resampling [00000473] main audio output warning: mixer start isn't output start (-54265) [00000473] main audio output warning: audio drift is too big (-146518), clearing out [00000473] main audio output warning: mixer start isn't output start (-29699) [00000473] main audio output warning: audio drift is too big (-146731), clearing out [00000473] main audio output warning: mixer start isn't output start (-30220) [00000473] main audio output warning: audio drift is too big (-150880), clearing out [00000473] main audio output warning: mixer start isn't output start (-30505) [00000473] main audio output warning: audio drift is too big (-146644), clearing out [00000473] main audio output warning: mixer start isn't output start (-30203) [00000473] main audio output warning: audio drift is too big (-146701), clearing out [00000473] main audio output warning: mixer start isn't output start (-29702) [00000473] main audio output warning: audio drift is too big (-150683), clearing out [00000473] main audio output warning: mixer start isn't output start (-30979) [00000473] main audio output warning: audio drift is too big (-146706), clearing out [00000473] main audio output warning: mixer start isn't output start (-29703) [00000473] main audio output warning: audio drift is too big (-146916), clearing out [00000473] main audio output warning: mixer start isn't output start (-30255) [00000473] main audio output warning: audio drift is too big (-150819), clearing out [00000473] main audio output warning: mixer start isn't output start (-31005) [00000473] main audio output warning: audio drift is too big (-147003), clearing out [00000473] main audio output warning: mixer start isn't output start (-29760) [00000473] main audio output warning: audio drift is too big (-146886), clearing out [00000473] main audio output warning: mixer start isn't output start (-30250) [00000473] main audio output warning: audio drift is too big (-150552), clearing out [root@vizioroom105 ~]# uname -a Linux vizioroom105.msgnet.com 2.6.27.10 #2 SMP Thu Jan 22 09:09:44 EST 2009 x86_64 x86_64 x86_64 GNU/Linux [root@vizioroom105 ~]# arecord -l **** List of CAPTURE Hardware Devices **** card 0: AF [VF0560 Live! Cam Optia AF], device 0: USB Audio [USB Audio] Subdevices: 1/1 Subdevice #0: subdevice #0 card 1: SB [HDA ATI SB], device 0: ALC883 Analog [ALC883 Analog] Subdevices: 1/1 Subdevice #0: subdevice #0 card 1: SB [HDA ATI SB], device 1: ALC883 Digital [ALC883 Digital] Subdevices: 1/1 Subdevice #0: subdevice #0 card 1: SB [HDA ATI SB], device 2: ALC883 Analog [ALC883 Analog] Subdevices: 0/1 Subdevice #0: subdevice #0 [root@vizioroom105 ~]# su silentm -c "/usr/bin/vcamera -vvvvv -I dummy -V dummy --dscp=0x01 v4l2:// :v4l2-dev=/dev/video0 :v4l2-adev=hw.1,0 :v4l2-width=720 :v4l2-height=480 :v4l2-standard=0 --sout '#transcode{vcodec=mp4v,vb=6000,fps=30,scale=1,acodec=mpga,ab=32,channels=1}:duplicate{dst=rtp{mux=ts,port=1234,sdp=rtsp://192.168.1.179:8080/test.sdp}}' vlc://quit" Best Regards, -- Rob Krakora Senior Software Engineer MessageNet Systems 101 East Carmel Dr. Suite 105 Carmel, IN 46032 (317)566-1677 Ext. 206 (317)663-0808 Fax

3 2

[alsa-devel] patch to support Samsung NC10 mini notebook
by Chris Pockele 13 May '09

13 May '09

Hello, The attached file is a patch to support the sound hardware in the Samsung NC10 mini notebook. The Samsung NC10 is and Intel Atom-based notebook with Realtek ALC272 HDA codecs. Sound is supported partly in Linux depending on ALSA version, but there were always some issues (wrong mixer behaviour, PC beep always muted, ...). This patch tries to solve most of these issues. I updated the patch so it would work using the alsa-driver-20090509 snapshot from ftp.kernel.org/pub/linux/kernel/people/tiwai/snapshot/ (originally developed from alsa-driver-20090416 snapshot). Fixes: - mute internal speaker / microphone when plugging in external headphone / microphone - stereo capture from external microphone - separate volume controls for headphone and internal speakers + "Master" for both - "PC Beep" mixer control - "Mic boost" and "External mic boost" controls - ... A few issues remaining: - Recording PCM output does not work yet. It works on the version of Windows that comes with the NC10. - When choosing recording source "Internal Mic" while an external microphone is plugged in, the internal microphone will be used instead of the external one, as it should. However, when plugging in the external microphone after choosing the recording source setting, it WILL override the internal microphone. When replying, please note I am not on list. Regards, Chris http://users.skynet.be/chrisp/linux/

2 4

[alsa-devel] [PATCH] aoa: remove driver_data direct access of struct device
by Roel Kluin 13 May '09

13 May '09

To avoid direct access to the driver_data pointer in struct device, the functions dev_get_drvdata() and dev_set_drvdata() should be used. Signed-off-by: Roel Kluin <roel.kluin(a)gmail.com> --- diff --git a/sound/aoa/fabrics/layout.c b/sound/aoa/fabrics/layout.c index fbf5c93..586965f 100644 --- a/sound/aoa/fabrics/layout.c +++ b/sound/aoa/fabrics/layout.c @@ -1037,7 +1037,7 @@ static int aoa_fabric_layout_probe(struct soundbus_dev *sdev) } ldev->selfptr_headphone.ptr = ldev; ldev->selfptr_lineout.ptr = ldev; - sdev->ofdev.dev.driver_data = ldev; + dev_set_drvdata(&sdev->ofdev.dev, ldev); list_add(&ldev->list, &layouts_list); layouts_list_items++; @@ -1081,7 +1081,7 @@ static int aoa_fabric_layout_probe(struct soundbus_dev *sdev) static int aoa_fabric_layout_remove(struct soundbus_dev *sdev) { - struct layout_dev *ldev = sdev->ofdev.dev.driver_data; + struct layout_dev *ldev = dev_get_drvdata(&sdev->ofdev.dev); int i; for (i=0; i<MAX_CODECS_PER_BUS; i++) { @@ -1114,7 +1114,7 @@ static int aoa_fabric_layout_remove(struct soundbus_dev *sdev) #ifdef CONFIG_PM static int aoa_fabric_layout_suspend(struct soundbus_dev *sdev, pm_message_t state) { - struct layout_dev *ldev = sdev->ofdev.dev.driver_data; + struct layout_dev *ldev = dev_get_drvdata(&sdev->ofdev.dev); if (ldev->gpio.methods && ldev->gpio.methods->all_amps_off) ldev->gpio.methods->all_amps_off(&ldev->gpio); @@ -1124,7 +1124,7 @@ static int aoa_fabric_layout_suspend(struct soundbus_dev *sdev, pm_message_t sta static int aoa_fabric_layout_resume(struct soundbus_dev *sdev) { - struct layout_dev *ldev = sdev->ofdev.dev.driver_data; + struct layout_dev *ldev = dev_get_drvdata(&sdev->ofdev.dev); if (ldev->gpio.methods && ldev->gpio.methods->all_amps_off) ldev->gpio.methods->all_amps_restore(&ldev->gpio); diff --git a/sound/aoa/soundbus/i2sbus/core.c b/sound/aoa/soundbus/i2sbus/core.c index 418c84c..4e3b819 100644 --- a/sound/aoa/soundbus/i2sbus/core.c +++ b/sound/aoa/soundbus/i2sbus/core.c @@ -358,14 +358,14 @@ static int i2sbus_probe(struct macio_dev* dev, const struct of_device_id *match) return -ENODEV; } - dev->ofdev.dev.driver_data = control; + dev_set_drvdata(&dev->ofdev.dev, control); return 0; } static int i2sbus_remove(struct macio_dev* dev) { - struct i2sbus_control *control = dev->ofdev.dev.driver_data; + struct i2sbus_control *control = dev_get_drvdata(&dev->ofdev.dev); struct i2sbus_dev *i2sdev, *tmp; list_for_each_entry_safe(i2sdev, tmp, &control->list, item) @@ -377,7 +377,7 @@ static int i2sbus_remove(struct macio_dev* dev) #ifdef CONFIG_PM static int i2sbus_suspend(struct macio_dev* dev, pm_message_t state) { - struct i2sbus_control *control = dev->ofdev.dev.driver_data; + struct i2sbus_control *control = dev_get_drvdata(&dev->ofdev.dev); struct codec_info_item *cii; struct i2sbus_dev* i2sdev; int err, ret = 0; @@ -407,7 +407,7 @@ static int i2sbus_suspend(struct macio_dev* dev, pm_message_t state) static int i2sbus_resume(struct macio_dev* dev) { - struct i2sbus_control *control = dev->ofdev.dev.driver_data; + struct i2sbus_control *control = dev_get_drvdata(&dev->ofdev.dev); struct codec_info_item *cii; struct i2sbus_dev* i2sdev; int err, ret = 0;

3 5

[alsa-devel] pxa2xx-pcm and dma_request
by Robert Jarzmik 13 May '09

13 May '09

Hi Mark and Dimitry, I've been playing for some time with DMA on the PXA series. I was wondering if the behaviour of pxa2xx-pcm is correct. As far as I understand, in an asoc context, the __pxa2xx_pcm_open() is called, while in "arm context", pxa2xx_pcm_open() is called, which calls __pxa2xx_pcm_open(). This was introduced by commit a6d77317678148c973bb0131cc5a3a772f756d23 I think. One main difference is that in "arm context", pxa_dma_request() is called, while in "asoc context", it is not. I'd like one of you to cross-check, as I must admit I'm not following all the impacts of the pcm code split-up. Cheers. -- Robert

3 2

[alsa-devel] aplay as a Zombie shows up in systemsupervisor when starting Totem or Totem-xine.
by Kristoffer Grundström 13 May '09

13 May '09

I think I've identified the issue with my sound as aplay being a Zombie everytime I'm starting totem or totem-xine. When restarting ALSA with service alsa restart as root I get what's shown in this link: http://pastebin.mandriva.com/11255 3319 is Pulseaudio. Pulseaudio disappears when closing totem or totem-xine. This problem has to do with my earlier mentioned bugreport in this link: https://qa.mandriva.com/show_bug.cgi?id=49048 Thank you. /Kristoffer

1 0

[alsa-devel] [PATCH 2/4] pxa2xx-i2s: Handle SACR1_DRPL and SACR1_DREC separately
by Karl Beldan 12 May '09

12 May '09

- hw_params enables both RPL and REC functions each time, enable the appropriate function in pxa2xx_i2s_trigger. - pxa2xx_i2s_shutdown disables i2s anytime one of RPL or REC function is off, turn it off only when both functions are off. - do not put the clk_i2s for no reason in pxa2xx_i2s_shutdown. Signed-off-by: Karl Beldan <karl.beldan(a)mobile-devices.fr> --- sound/soc/pxa/pxa2xx-i2s.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sound/soc/pxa/pxa2xx-i2s.c b/sound/soc/pxa/pxa2xx-i2s.c index 52862dc..0e53d07 100644 --- a/sound/soc/pxa/pxa2xx-i2s.c +++ b/sound/soc/pxa/pxa2xx-i2s.c @@ -178,9 +178,7 @@ static int pxa2xx_i2s_hw_params(struct snd_pcm_substream *substream, /* is port used by another stream */ if (!(SACR0 & SACR0_ENB)) { - SACR0 = 0; - SACR1 = 0; if (pxa_i2s.master) SACR0 |= SACR0_BCKD; @@ -226,6 +224,10 @@ static int pxa2xx_i2s_trigger(struct snd_pcm_substream *substream, int cmd, switch (cmd) { case SNDRV_PCM_TRIGGER_START: + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) + SACR1 &= ~SACR1_DRPL; + else + SACR1 &= ~SACR1_DREC; SACR0 |= SACR0_ENB; break; case SNDRV_PCM_TRIGGER_RESUME: @@ -252,13 +254,11 @@ static void pxa2xx_i2s_shutdown(struct snd_pcm_substream *substream, SAIMR &= ~SAIMR_RFS; } - if (SACR1 & (SACR1_DREC | SACR1_DRPL)) { + if ((SACR1 & (SACR1_DREC | SACR1_DRPL)) == (SACR1_DREC | SACR1_DRPL)) { SACR0 &= ~SACR0_ENB; pxa_i2s_wait(); clk_disable(clk_i2s); } - - clk_put(clk_i2s); } #ifdef CONFIG_PM -- 1.6.3.rc1.34.g0be9b -- Karl

3 14

[alsa-devel] storm of emu10k1: unhandled interrupt: 0x00400000
by Daniel Drake 12 May '09

12 May '09

Hi, Martin von Gagern reported a bug in the emu10k1 driver while running 2.6.29: https://bugs.gentoo.org/show_bug.cgi?id=266657 This message is logged seemingly infinitely, to the point where the system became unusable. emu10k1: unhandled interrupt: 0x00400000 This is INTE_ADLIBENABLE. The bug is a one-off and unreproducible, this mail is really just for information only... or would people be happy with this flag being added to the "mask the interrupts that we don't handle" code below the code that prints the "unhandled interrupt" message? Daniel

1 0

[alsa-devel] [PATCH] control, hw, rawmidi: accept control device node as card identifier when opening
by Lennart Poettering 12 May '09

12 May '09

Heya! Traditionally low-level ALSA devices are opened with device strings like 'hw:CARD' where CARD is either a numeric index or a card name. This patch introduces a third syntax that allows you to specify the file name of the control device node. The purpose for this is to make ALSA a bit more like other Linux devices and allow implementaiton of udev device symlinks similar to how disks are currently handled, with /dev/disk/by-path/xxxx /dev/disk/by-id/xxxx and so on. With this patch this line: aplay -f CD -D hw:/dev/snd/controlC0 < /dev/urandom becomes equivalent to this line: aplay -f CD -D hw:0 < /dev/urandom A more useful example is this: aplay -f CD -D hw:/dev/snd/by-path/pci-0000:00:1a.7-usb-0:2:1.2 (this line requires a a few additional udev rules) This only works for control devices nodes, not for PCM or any other device nodes. Since the control device node is used as 'entry point' when opening PCM devices this is no limitation. Lennart --- include/pcm_plugin.h | 4 ++- src/control/cards.c | 20 ++++++++++-- src/control/control_hw.c | 69 +++++++++++++++++++++++++++++++++---------- src/control/control_local.h | 3 +- src/pcm/pcm_hw.c | 29 ++++++++++++------ src/rawmidi/rawmidi_hw.c | 30 ++++++++++++------ src/rawmidi/rawmidi_local.h | 6 ++- 7 files changed, 118 insertions(+), 43 deletions(-) diff --git a/include/pcm_plugin.h b/include/pcm_plugin.h index eea1d82..758144e 100644 --- a/include/pcm_plugin.h +++ b/include/pcm_plugin.h @@ -1,3 +1,4 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /** * \file include/pcm_plugin.h * \brief Common PCM plugin code @@ -66,7 +67,8 @@ typedef int snd_pcm_route_ttable_entry_t; * Hardware plugin */ int snd_pcm_hw_open(snd_pcm_t **pcmp, const char *name, - int card, int device, int subdevice, + int card, const char *control_device_node, + int device, int subdevice, snd_pcm_stream_t stream, int mode, int mmap_emulation, int sync_ptr_ioctl); int _snd_pcm_hw_open(snd_pcm_t **pcmp, const char *name, diff --git a/src/control/cards.c b/src/control/cards.c index 4d2c739..912e8c8 100644 --- a/src/control/cards.c +++ b/src/control/cards.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /** * \file control/cards.c * \brief Basic Soundcard Operations @@ -127,12 +128,25 @@ int snd_card_get_index(const char *string) return card; return err; } + + if (string[0] == '/') { + err = snd_ctl_hw_open(&handle, NULL, -1, string, 0); + + if (err < 0) + return err; + + card = snd_ctl_hw_card(handle); + snd_ctl_close(handle); + + return card; + } + for (card = 0; card < 32; card++) { #ifdef SUPPORT_ALOAD if (! snd_card_load(card)) continue; #endif - if (snd_ctl_hw_open(&handle, NULL, card, 0) < 0) + if (snd_ctl_hw_open(&handle, NULL, card, NULL, 0) < 0) continue; if (snd_ctl_card_info(handle, &info) < 0) { snd_ctl_close(handle); @@ -159,7 +173,7 @@ int snd_card_get_name(int card, char **name) if (name == NULL) return -EINVAL; - if ((err = snd_ctl_hw_open(&handle, NULL, card, 0)) < 0) + if ((err = snd_ctl_hw_open(&handle, NULL, card, NULL, 0)) < 0) return err; if ((err = snd_ctl_card_info(handle, &info)) < 0) { snd_ctl_close(handle); @@ -186,7 +200,7 @@ int snd_card_get_longname(int card, char **name) if (name == NULL) return -EINVAL; - if ((err = snd_ctl_hw_open(&handle, NULL, card, 0)) < 0) + if ((err = snd_ctl_hw_open(&handle, NULL, card, NULL, 0)) < 0) return err; if ((err = snd_ctl_card_info(handle, &info)) < 0) { snd_ctl_close(handle); diff --git a/src/control/control_hw.c b/src/control/control_hw.c index e9a6be2..3cead5e 100644 --- a/src/control/control_hw.c +++ b/src/control/control_hw.c @@ -1,4 +1,5 @@ -/* +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- + * * Control Interface - Hardware * Copyright (c) 1998,1999,2000 by Jaroslav Kysela <perex(a)perex.cz> * Copyright (c) 2000 by Abramo Bagnara <abramo(a)alsa-project.org> @@ -49,6 +50,12 @@ typedef struct { } snd_ctl_hw_t; #endif /* DOC_HIDDEN */ +int snd_ctl_hw_card(snd_ctl_t *handle) { + snd_ctl_hw_t *hw = handle->private_data; + + return hw->card; +} + static int snd_ctl_hw_close(snd_ctl_t *handle) { snd_ctl_hw_t *hw = handle->private_data; @@ -361,7 +368,7 @@ static const snd_ctl_ops_t snd_ctl_hw_ops = { .read = snd_ctl_hw_read, }; -int snd_ctl_hw_open(snd_ctl_t **handle, const char *name, int card, int mode) +int snd_ctl_hw_open(snd_ctl_t **handle, const char *name, int card, const char *devnode, int mode) { int fd, ver; char filename[sizeof(SNDRV_FILE_CONTROL) + 10]; @@ -370,13 +377,23 @@ int snd_ctl_hw_open(snd_ctl_t **handle, const char *name, int card, int mode) snd_ctl_hw_t *hw; int err; - *handle = NULL; + *handle = NULL; - if (CHECK_SANITY(card < 0 || card >= 32)) { + if (CHECK_SANITY(!!devnode == (card >= 0))) { + SNDMSG("Specified both card index and device node"); + return -EINVAL; + } + + if (CHECK_SANITY(card >= 32)) { SNDMSG("Invalid card index %d", card); return -EINVAL; } - sprintf(filename, SNDRV_FILE_CONTROL, card); + + if (!devnode) { + sprintf(filename, SNDRV_FILE_CONTROL, card); + devnode = filename; + } + if (mode & SND_CTL_READONLY) fmode = O_RDONLY; else @@ -385,13 +402,15 @@ int snd_ctl_hw_open(snd_ctl_t **handle, const char *name, int card, int mode) fmode |= O_NONBLOCK; if (mode & SND_CTL_ASYNC) fmode |= O_ASYNC; - fd = snd_open_device(filename, fmode); - if (fd < 0) { + fd = snd_open_device(devnode, fmode); + if (fd < 0 && card >= 0) { snd_card_load(card); - fd = snd_open_device(filename, fmode); - if (fd < 0) - return -errno; + fd = snd_open_device(devnode, fmode); } + + if (fd < 0) + return -errno; + #if 0 /* * this is bogus, an application have to care about open filedescriptors @@ -412,6 +431,19 @@ int snd_ctl_hw_open(snd_ctl_t **handle, const char *name, int card, int mode) close(fd); return -SND_ERROR_INCOMPATIBLE_VERSION; } + + if (card < 0) { + snd_ctl_card_info_t info; + + if (ioctl(fd, SNDRV_CTL_IOCTL_CARD_INFO, &info) < 0) { + err = -errno; + close(fd); + return err; + } + + card = info.card; + } + hw = calloc(1, sizeof(snd_ctl_hw_t)); if (hw == NULL) { close(fd); @@ -437,7 +469,7 @@ int _snd_ctl_hw_open(snd_ctl_t **handlep, char *name, snd_config_t *root ATTRIBU { snd_config_iterator_t i, next; long card = -1; - const char *str; + const char *str, *devnode = NULL; int err; snd_config_for_each(i, next, conf) { snd_config_t *n = snd_config_iterator_entry(i); @@ -454,16 +486,21 @@ int _snd_ctl_hw_open(snd_ctl_t **handlep, char *name, snd_config_t *root ATTRIBU err = snd_config_get_string(n, &str); if (err < 0) return -EINVAL; - card = snd_card_get_index(str); - if (card < 0) - return card; + if (str[0] == '/') + devnode = name; + else { + card = snd_card_get_index(str); + if (card < 0) + return card; + } + } continue; } return -EINVAL; } - if (card < 0) + if (card < 0 && !devnode) return -EINVAL; - return snd_ctl_hw_open(handlep, name, card, mode); + return snd_ctl_hw_open(handlep, name, card, devnode, mode); } SND_DLSYM_BUILD_VERSION(_snd_ctl_hw_open, SND_CONTROL_DLSYM_VERSION); diff --git a/src/control/control_local.h b/src/control/control_local.h index fd9f941..5088b5f 100644 --- a/src/control/control_local.h +++ b/src/control/control_local.h @@ -95,6 +95,7 @@ struct _snd_hctl { int snd_ctl_new(snd_ctl_t **ctlp, snd_ctl_type_t type, const char *name); int _snd_ctl_poll_descriptor(snd_ctl_t *ctl); #define _snd_ctl_async_descriptor _snd_ctl_poll_descriptor -int snd_ctl_hw_open(snd_ctl_t **handle, const char *name, int card, int mode); +int snd_ctl_hw_open(snd_ctl_t **handle, const char *name, int card, const char *devnode, int mode); +int snd_ctl_hw_card(snd_ctl_t *handle); int snd_ctl_shm_open(snd_ctl_t **handlep, const char *name, const char *sockname, const char *sname, int mode); int snd_ctl_async(snd_ctl_t *ctl, int sig, pid_t pid); diff --git a/src/pcm/pcm_hw.c b/src/pcm/pcm_hw.c index c46d14f..59734a1 100644 --- a/src/pcm/pcm_hw.c +++ b/src/pcm/pcm_hw.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /** * \file pcm/pcm_hw.c * \ingroup PCM_Plugins @@ -1260,7 +1261,8 @@ int snd_pcm_hw_open_fd(snd_pcm_t **pcmp, const char *name, * \brief Creates a new hw PCM * \param pcmp Returns created PCM handle * \param name Name of PCM - * \param card Number of card + * \param card Number of card (must be -1 if control_device_node is non-NULL) + * \param control_device_node Control device node in the file system (must be NULL if card is != -1) * \param device Number of device * \param subdevice Number of subdevice * \param stream PCM Stream @@ -1273,7 +1275,8 @@ int snd_pcm_hw_open_fd(snd_pcm_t **pcmp, const char *name, * changed in future. */ int snd_pcm_hw_open(snd_pcm_t **pcmp, const char *name, - int card, int device, int subdevice, + int card, const char *control_device_node, + int device, int subdevice, snd_pcm_stream_t stream, int mode, int mmap_emulation ATTRIBUTE_UNUSED, int sync_ptr_ioctl) @@ -1288,9 +1291,11 @@ int snd_pcm_hw_open(snd_pcm_t **pcmp, const char *name, assert(pcmp); - if ((ret = snd_ctl_hw_open(&ctl, NULL, card, 0)) < 0) + if ((ret = snd_ctl_hw_open(&ctl, NULL, card, control_device_node, 0)) < 0) return ret; + card = snd_ctl_hw_card(ctl); + switch (stream) { case SND_PCM_STREAM_PLAYBACK: filefmt = SNDRV_FILE_PCM_STREAM_PLAYBACK; @@ -1399,7 +1404,7 @@ int _snd_pcm_hw_open(snd_pcm_t **pcmp, const char *name, { snd_config_iterator_t i, next; long card = -1, device = 0, subdevice = -1; - const char *str; + const char *str, *devnode = NULL; int err, sync_ptr_ioctl = 0; int rate = 0, channels = 0; snd_pcm_format_t format = SND_PCM_FORMAT_UNKNOWN; @@ -1428,10 +1433,14 @@ int _snd_pcm_hw_open(snd_pcm_t **pcmp, const char *name, SNDERR("Invalid type for %s", id); return -EINVAL; } - card = snd_card_get_index(str); - if (card < 0) { - SNDERR("Invalid value for %s", id); - return card; + if (str[0] == '/') + devnode = str; + else { + card = snd_card_get_index(str); + if (card < 0) { + SNDERR("Invalid value for %s", id); + return card; + } } } continue; @@ -1498,11 +1507,11 @@ int _snd_pcm_hw_open(snd_pcm_t **pcmp, const char *name, SNDERR("Unknown field %s", id); return -EINVAL; } - if (card < 0) { + if (card < 0 && !devnode) { SNDERR("card is not defined"); return -EINVAL; } - err = snd_pcm_hw_open(pcmp, name, card, device, subdevice, stream, + err = snd_pcm_hw_open(pcmp, name, card, devnode, device, subdevice, stream, mode | (nonblock ? SND_PCM_NONBLOCK : 0), 0, sync_ptr_ioctl); if (err < 0) diff --git a/src/rawmidi/rawmidi_hw.c b/src/rawmidi/rawmidi_hw.c index 87829fd..f02d4cf 100644 --- a/src/rawmidi/rawmidi_hw.c +++ b/src/rawmidi/rawmidi_hw.c @@ -1,4 +1,5 @@ -/* +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- + * * RawMIDI - Hardware * Copyright (c) 2000 by Jaroslav Kysela <perex(a)perex.cz> * Abramo Bagnara <abramo(a)alsa-project.org> @@ -170,7 +171,9 @@ static const snd_rawmidi_ops_t snd_rawmidi_hw_ops = { int snd_rawmidi_hw_open(snd_rawmidi_t **inputp, snd_rawmidi_t **outputp, - const char *name, int card, int device, int subdevice, + const char *name, + int card, const char *control_device_node, + int device, int subdevice, int mode) { int fd, ver, ret; @@ -186,9 +189,12 @@ int snd_rawmidi_hw_open(snd_rawmidi_t **inputp, snd_rawmidi_t **outputp, *inputp = NULL; if (outputp) *outputp = NULL; - - if ((ret = snd_ctl_hw_open(&ctl, NULL, card, 0)) < 0) + + if ((ret = snd_ctl_hw_open(&ctl, NULL, card, control_device_node, 0)) < 0) return ret; + + card = snd_ctl_hw_card(ctl); + sprintf(filename, SNDRV_FILE_RAWMIDI, card, device); __again: @@ -330,7 +336,7 @@ int _snd_rawmidi_hw_open(snd_rawmidi_t **inputp, snd_rawmidi_t **outputp, { snd_config_iterator_t i, next; long card = -1, device = 0, subdevice = -1; - const char *str; + const char *str, *devnode = NULL; int err; snd_config_for_each(i, next, conf) { snd_config_t *n = snd_config_iterator_entry(i); @@ -345,9 +351,13 @@ int _snd_rawmidi_hw_open(snd_rawmidi_t **inputp, snd_rawmidi_t **outputp, err = snd_config_get_string(n, &str); if (err < 0) return -EINVAL; - card = snd_card_get_index(str); - if (card < 0) - return card; + if (str[0] == '/') + devnode = str; + else { + card = snd_card_get_index(str); + if (card < 0) + return card; + } } continue; } @@ -365,8 +375,8 @@ int _snd_rawmidi_hw_open(snd_rawmidi_t **inputp, snd_rawmidi_t **outputp, } return -EINVAL; } - if (card < 0) + if (card < 0 && !devnode) return -EINVAL; - return snd_rawmidi_hw_open(inputp, outputp, name, card, device, subdevice, mode); + return snd_rawmidi_hw_open(inputp, outputp, name, card, devnode, device, subdevice, mode); } SND_DLSYM_BUILD_VERSION(_snd_rawmidi_hw_open, SND_RAWMIDI_DLSYM_VERSION); diff --git a/src/rawmidi/rawmidi_local.h b/src/rawmidi/rawmidi_local.h index 3388502..ed2b7da 100644 --- a/src/rawmidi/rawmidi_local.h +++ b/src/rawmidi/rawmidi_local.h @@ -1,4 +1,4 @@ -/* +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- * Rawmidi interface - local header file * Copyright (c) 2000 by Abramo Bagnara <abramo(a)alsa-project.org> * @@ -51,7 +51,9 @@ struct _snd_rawmidi { }; int snd_rawmidi_hw_open(snd_rawmidi_t **input, snd_rawmidi_t **output, - const char *name, int card, int device, int subdevice, + const char *name, + int card, const char *control_device_node, + int device, int subdevice, int mode); int snd_rawmidi_virtual_open(snd_rawmidi_t **inputp, snd_rawmidi_t **outputp, -- 1.6.2.2 Lennart -- Lennart Poettering Red Hat, Inc. lennart [at] poettering [dot] net ICQ# 11060553 http://0pointer.net/lennart/ GnuPG 0x1A015CC4

2 9