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

udev: do not list ALSA SD if PulseAudio SD exists (refs #7221)

parent 8942c7d9
...@@ -24,16 +24,19 @@ ...@@ -24,16 +24,19 @@
# include <config.h> # include <config.h>
#endif #endif
#include <errno.h>
#include <search.h>
#include <poll.h>
#include <libudev.h> #include <libudev.h>
#include <vlc_common.h> #include <vlc_common.h>
#include <vlc_services_discovery.h> #include <vlc_services_discovery.h>
#include <vlc_plugin.h> #include <vlc_plugin.h>
#include <vlc_url.h> #ifdef HAVE_ALSA
#ifdef HAVE_SEARCH_H # include <vlc_modules.h>
# include <search.h>
#endif #endif
#include <poll.h> #include <vlc_url.h>
#include <errno.h>
static int OpenV4L (vlc_object_t *); static int OpenV4L (vlc_object_t *);
#ifdef HAVE_ALSA #ifdef HAVE_ALSA
...@@ -91,8 +94,9 @@ static int vlc_sd_probe_Open (vlc_object_t *obj) ...@@ -91,8 +94,9 @@ static int vlc_sd_probe_Open (vlc_object_t *obj)
vlc_sd_probe_Add (probe, "v4l{longname=\"Video capture\"}", vlc_sd_probe_Add (probe, "v4l{longname=\"Video capture\"}",
N_("Video capture"), SD_CAT_DEVICES); N_("Video capture"), SD_CAT_DEVICES);
#ifdef HAVE_ALSA #ifdef HAVE_ALSA
vlc_sd_probe_Add (probe, "alsa{longname=\"Audio capture\"}", if (!module_exists ("pulselist"))
N_("Audio capture"), SD_CAT_DEVICES); vlc_sd_probe_Add (probe, "alsa{longname=\"Audio capture\"}",
N_("Audio capture"), SD_CAT_DEVICES);
#endif #endif
vlc_sd_probe_Add (probe, "disc{longname=\"Discs\"}", N_("Discs"), vlc_sd_probe_Add (probe, "disc{longname=\"Discs\"}", N_("Discs"),
SD_CAT_DEVICES); SD_CAT_DEVICES);
......
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