Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
c85689ef
Commit
c85689ef
authored
Jul 25, 2012
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
udev: do not list ALSA SD if PulseAudio SD exists (refs #7221)
(cherry picked from commit
fbe71a66
)
parent
958f15fd
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
7 deletions
+11
-7
modules/services_discovery/udev.c
modules/services_discovery/udev.c
+11
-7
No files found.
modules/services_discovery/udev.c
View file @
c85689ef
...
...
@@ -24,16 +24,19 @@
# include <config.h>
#endif
#include <errno.h>
#include <search.h>
#include <poll.h>
#include <libudev.h>
#include <vlc_common.h>
#include <vlc_services_discovery.h>
#include <vlc_plugin.h>
#include <vlc_url.h>
#ifdef HAVE_SEARCH_H
# include <search.h>
#ifdef HAVE_ALSA
# include <vlc_modules.h>
#endif
#include <poll.h>
#include <errno.h>
#include <vlc_url.h>
static
int
OpenV4L
(
vlc_object_t
*
);
#ifdef HAVE_ALSA
...
...
@@ -91,8 +94,9 @@ static int vlc_sd_probe_Open (vlc_object_t *obj)
vlc_sd_probe_Add
(
probe
,
"v4l{longname=
\"
Video capture
\"
}"
,
N_
(
"Video capture"
),
SD_CAT_DEVICES
);
#ifdef HAVE_ALSA
vlc_sd_probe_Add
(
probe
,
"alsa{longname=
\"
Audio capture
\"
}"
,
N_
(
"Audio capture"
),
SD_CAT_DEVICES
);
if
(
!
module_exists
(
"pulselist"
))
vlc_sd_probe_Add
(
probe
,
"alsa{longname=
\"
Audio capture
\"
}"
,
N_
(
"Audio capture"
),
SD_CAT_DEVICES
);
#endif
vlc_sd_probe_Add
(
probe
,
"disc{longname=
\"
Discs
\"
}"
,
N_
(
"Discs"
),
SD_CAT_DEVICES
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment