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
96991da8
Commit
96991da8
authored
Aug 11, 2012
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
DTV: do not assume __linux__ == HAVE_LINUX_DVB
This should fix DVB on *BSD. (cherry picked from commit
bfcefbf2
)
parent
826d649e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
4 deletions
+5
-4
modules/access/Modules.am
modules/access/Modules.am
+1
-0
modules/access/dtv/access.c
modules/access/dtv/access.c
+4
-4
No files found.
modules/access/Modules.am
View file @
96991da8
...
...
@@ -192,6 +192,7 @@ libdtv_plugin_la_DEPENDENCIES =
if HAVE_LINUX_DVB
libdtv_plugin_la_SOURCES += dtv/linux.c
libdtv_plugin_la_CFLAGS += -DHAVE_LINUX_DVB
if HAVE_DVBPSI
libdtv_plugin_la_SOURCES += dtv/en50221.c dtv/en50221.h
libdtv_plugin_la_CFLAGS += -DHAVE_DVBPSI $(DVBPSI_CFLAGS)
...
...
modules/access/dtv/access.c
View file @
96991da8
...
...
@@ -198,7 +198,7 @@ static const char *const polarization_user[] = { N_("Unspecified (0V)"),
"low noise block-downconverters (LNB) through a DiSEqC 1.0 switch, " \
"the correct LNB can be selected (1 to 4). " \
"If there is no switch, this parameter should be 0.")
#ifdef
__linux__
#ifdef
HAVE_LINUX_DVB
static
const
int
satno_vlc
[]
=
{
0
,
1
,
2
,
3
,
4
};
static
const
char
*
const
satno_user
[]
=
{
N_
(
"Unspecified"
),
"A/1"
,
"B/2"
,
"C/3"
,
"D/4"
};
...
...
@@ -242,7 +242,7 @@ vlc_module_begin ()
#endif
)
#ifdef
__linux__
#ifdef
HAVE_LINUX_DVB
add_integer
(
"dvb-adapter"
,
0
,
ADAPTER_TEXT
,
ADAPTER_LONGTEXT
,
false
)
change_integer_range
(
0
,
255
)
change_safe
()
...
...
@@ -366,7 +366,7 @@ vlc_module_begin ()
change_integer_range
(
0
,
18
)
change_private
()
change_safe
()
#ifdef
__linux__
#ifdef
HAVE_LINUX_DVB
add_bool
(
"dvb-high-voltage"
,
false
,
HIGH_VOLTAGE_TEXT
,
HIGH_VOLTAGE_LONGTEXT
,
false
)
#endif
...
...
@@ -380,7 +380,7 @@ vlc_module_begin ()
LNB_SWITCH_TEXT
,
LNB_SWITCH_LONGTEXT
,
true
)
change_integer_range
(
0
,
0x7fffffff
)
add_obsolete_integer
(
"dvb-lnb-slof"
)
/* since 2.0.0 */
#ifdef
__linux__
#ifdef
HAVE_LINUX_DVB
add_integer
(
"dvb-satno"
,
0
,
SATNO_TEXT
,
SATNO_LONGTEXT
,
true
)
change_integer_list
(
satno_vlc
,
satno_user
)
add_integer
(
"dvb-tone"
,
-
1
,
TONE_TEXT
,
TONE_LONGTEXT
,
true
)
...
...
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