Commit 0c6062ec authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

udev: use ALSA to find capture device names

This is a little bit more understandable than device numbers.
Unfortunately, hot plug is as flaky as before: udev reports the device
before it is ready. alsa-lib provides no event interface (that I know),
so we have to stick with udev for now though.

Also, alsa-lib is _not_ used to fetch the card name. In my opinion, the
udev vendor string is a lot better. Compare:
- "USB Device 0xccd:0x77" (alsa card name) with
  "TerraTec Electronic GmbH" (udev vendor), or
- "Intel ICH6" (alsa card name) with "Intel Corporation" (udev vendor).
parent 483379cd
...@@ -5,7 +5,15 @@ SOURCES_bonjour = bonjour.c ...@@ -5,7 +5,15 @@ SOURCES_bonjour = bonjour.c
SOURCES_podcast = podcast.c SOURCES_podcast = podcast.c
SOURCES_mtp = mtp.c SOURCES_mtp = mtp.c
SOURCES_mediadirs = mediadirs.c SOURCES_mediadirs = mediadirs.c
SOURCES_udev = udev.c
libudev_plugin_la_SOURCES = udev.c
libudev_plugin_la_CFLAGS = $(AM_CFLAGS) $(UDEV_CFLAGS)
libudev_plugin_la_LIBADD = $(AM_LIBADD) $(UDEV_LIBS)
libudev_plugin_la_DEPENDENCIES =
if HAVE_ALSA
libudev_plugin_la_CFLAGS += $(ALSA_CFLAGS) -DHAVE_ALSA
libudev_plugin_la_LIBADD += $(ALSA_LIBS)
endif
libxcb_apps_plugin_la_SOURCES = xcb_apps.c libxcb_apps_plugin_la_SOURCES = xcb_apps.c
libxcb_apps_plugin_la_CFLAGS = $(AM_CFLAGS) \ libxcb_apps_plugin_la_CFLAGS = $(AM_CFLAGS) \
...@@ -15,9 +23,11 @@ libxcb_apps_plugin_la_LIBADD = $(AM_LIBADD) \ ...@@ -15,9 +23,11 @@ libxcb_apps_plugin_la_LIBADD = $(AM_LIBADD) \
libxcb_apps_plugin_la_DEPENDENCIES = libxcb_apps_plugin_la_DEPENDENCIES =
EXTRA_LTLIBRARIES += \ EXTRA_LTLIBRARIES += \
libudev_plugin.la \
libxcb_apps_plugin.la libxcb_apps_plugin.la
libvlc_LTLIBRARIES += \ libvlc_LTLIBRARIES += \
libmediadirs_plugin.la \ libmediadirs_plugin.la \
libpodcast_plugin.la \ libpodcast_plugin.la \
libsap_plugin.la \ libsap_plugin.la \
$(LTLIBudev) \
$(LTLIBxcb_apps) $(LTLIBxcb_apps)
...@@ -435,7 +435,10 @@ int OpenV4L (vlc_object_t *obj) ...@@ -435,7 +435,10 @@ int OpenV4L (vlc_object_t *obj)
} }
#ifdef HAVE_ALSA
/*** Advanced Linux Sound Architecture support ***/ /*** Advanced Linux Sound Architecture support ***/
#include <alsa/asoundlib.h>
static int alsa_get_device (struct udev_device *dev, unsigned *restrict pcard, static int alsa_get_device (struct udev_device *dev, unsigned *restrict pcard,
unsigned *restrict pdevice) unsigned *restrict pdevice)
{ {
...@@ -469,22 +472,30 @@ static char *alsa_get_mrl (struct udev_device *dev) ...@@ -469,22 +472,30 @@ static char *alsa_get_mrl (struct udev_device *dev)
static char *alsa_get_name (struct udev_device *dev) static char *alsa_get_name (struct udev_device *dev)
{ {
const char *model = NULL; char *name = NULL;
char *name;
unsigned card, device; unsigned card, device;
if (alsa_get_device (dev, &card, &device)) if (alsa_get_device (dev, &card, &device))
return NULL; return NULL;
dev = udev_device_get_parent (dev); char card_name[4 + 3 * sizeof (int)];
if (dev != NULL) snprintf (card_name, sizeof (card_name), "hw:%u", card);
model = udev_device_get_property_value (dev,
"ID_MODEL_FROM_DATABASE"); snd_ctl_t *ctl;
if (model == NULL) if (snd_ctl_open (&ctl, card_name, 0))
model = _("Device"); return NULL;
if (asprintf (&name, "%s (%u)", model, device) == -1) snd_pcm_info_t *pcm_info;
name = NULL; snd_pcm_info_alloca (&pcm_info);
snd_pcm_info_set_device (pcm_info, device);
snd_pcm_info_set_subdevice (pcm_info, 0);
snd_pcm_info_set_stream (pcm_info, SND_PCM_STREAM_CAPTURE);
if (snd_ctl_pcm_info (ctl, pcm_info))
goto out;
name = strdup (snd_pcm_info_get_name (pcm_info));
out:
snd_ctl_close (ctl);
return name; return name;
} }
...@@ -511,6 +522,7 @@ int OpenALSA (vlc_object_t *obj) ...@@ -511,6 +522,7 @@ int OpenALSA (vlc_object_t *obj)
return Open (obj, &subsys); return Open (obj, &subsys);
} }
#endif /* HAVE_ALSA */
/*** Discs support ***/ /*** Discs support ***/
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment