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

DTV: do not assume __linux__ == HAVE_LINUX_DVB

This should fix DVB on *BSD.
(cherry picked from commit bfcefbf2b35650c8149ed9e94890f669187c8a50)
parent 826d649e
...@@ -192,6 +192,7 @@ libdtv_plugin_la_DEPENDENCIES = ...@@ -192,6 +192,7 @@ libdtv_plugin_la_DEPENDENCIES =
if HAVE_LINUX_DVB if HAVE_LINUX_DVB
libdtv_plugin_la_SOURCES += dtv/linux.c libdtv_plugin_la_SOURCES += dtv/linux.c
libdtv_plugin_la_CFLAGS += -DHAVE_LINUX_DVB
if HAVE_DVBPSI if HAVE_DVBPSI
libdtv_plugin_la_SOURCES += dtv/en50221.c dtv/en50221.h libdtv_plugin_la_SOURCES += dtv/en50221.c dtv/en50221.h
libdtv_plugin_la_CFLAGS += -DHAVE_DVBPSI $(DVBPSI_CFLAGS) libdtv_plugin_la_CFLAGS += -DHAVE_DVBPSI $(DVBPSI_CFLAGS)
......
...@@ -198,7 +198,7 @@ static const char *const polarization_user[] = { N_("Unspecified (0V)"), ...@@ -198,7 +198,7 @@ static const char *const polarization_user[] = { N_("Unspecified (0V)"),
"low noise block-downconverters (LNB) through a DiSEqC 1.0 switch, " \ "low noise block-downconverters (LNB) through a DiSEqC 1.0 switch, " \
"the correct LNB can be selected (1 to 4). " \ "the correct LNB can be selected (1 to 4). " \
"If there is no switch, this parameter should be 0.") "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 int satno_vlc[] = { 0, 1, 2, 3, 4 };
static const char *const satno_user[] = { N_("Unspecified"), static const char *const satno_user[] = { N_("Unspecified"),
"A/1", "B/2", "C/3", "D/4" }; "A/1", "B/2", "C/3", "D/4" };
...@@ -242,7 +242,7 @@ vlc_module_begin () ...@@ -242,7 +242,7 @@ vlc_module_begin ()
#endif #endif
) )
#ifdef __linux__ #ifdef HAVE_LINUX_DVB
add_integer ("dvb-adapter", 0, ADAPTER_TEXT, ADAPTER_LONGTEXT, false) add_integer ("dvb-adapter", 0, ADAPTER_TEXT, ADAPTER_LONGTEXT, false)
change_integer_range (0, 255) change_integer_range (0, 255)
change_safe () change_safe ()
...@@ -366,7 +366,7 @@ vlc_module_begin () ...@@ -366,7 +366,7 @@ vlc_module_begin ()
change_integer_range (0, 18) change_integer_range (0, 18)
change_private () change_private ()
change_safe () change_safe ()
#ifdef __linux__ #ifdef HAVE_LINUX_DVB
add_bool ("dvb-high-voltage", false, add_bool ("dvb-high-voltage", false,
HIGH_VOLTAGE_TEXT, HIGH_VOLTAGE_LONGTEXT, false) HIGH_VOLTAGE_TEXT, HIGH_VOLTAGE_LONGTEXT, false)
#endif #endif
...@@ -380,7 +380,7 @@ vlc_module_begin () ...@@ -380,7 +380,7 @@ vlc_module_begin ()
LNB_SWITCH_TEXT, LNB_SWITCH_LONGTEXT, true) LNB_SWITCH_TEXT, LNB_SWITCH_LONGTEXT, true)
change_integer_range (0, 0x7fffffff) change_integer_range (0, 0x7fffffff)
add_obsolete_integer ("dvb-lnb-slof") /* since 2.0.0 */ 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) add_integer ("dvb-satno", 0, SATNO_TEXT, SATNO_LONGTEXT, true)
change_integer_list (satno_vlc, satno_user) change_integer_list (satno_vlc, satno_user)
add_integer ("dvb-tone", -1, TONE_TEXT, TONE_LONGTEXT, true) add_integer ("dvb-tone", -1, TONE_TEXT, TONE_LONGTEXT, true)
......
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