[vlc-commits] Linux DVB: conditionally enable DVB-T2

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed May 11 20:12:56 2011 +0300| [1a5b4bf2b26f843f21cc4c31fdfa2bcd40d0f95e] | committer: Rémi Denis-Courmont

Linux DVB: conditionally enable DVB-T2

The missing definitions are 3-days old...

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1a5b4bf2b26f843f21cc4c31fdfa2bcd40d0f95e
---

 modules/access/dtv/linux.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/modules/access/dtv/linux.c b/modules/access/dtv/linux.c
index 57dc69e..c9d505b 100644
--- a/modules/access/dtv/linux.c
+++ b/modules/access/dtv/linux.c
@@ -707,7 +707,7 @@ static int dvb_parse_transmit_mode (int i)
 {
     static const dvb_int_map_t tab[] = {
         { -1, TRANSMISSION_MODE_AUTO },
-#if 0
+#if DVBv5(3)
         {  1, TRANSMISSION_MODE_1K   },
 #endif
         {  2, TRANSMISSION_MODE_2K   },
@@ -715,7 +715,7 @@ static int dvb_parse_transmit_mode (int i)
         {  4, TRANSMISSION_MODE_4K   },
 #endif
         {  8, TRANSMISSION_MODE_8K   },
-#if 0
+#if DVBv5(3)
         { 16, TRANSMISSION_MODE_16K  },
         { 32, TRANSMISSION_MODE_32K  },
 #endif
@@ -731,7 +731,7 @@ static int dvb_parse_guard (uint32_t guard)
         { VLC_GUARD(1,8),    GUARD_INTERVAL_1_8 },
         { VLC_GUARD(1,16),   GUARD_INTERVAL_1_16 },
         { VLC_GUARD(1,32),   GUARD_INTERVAL_1_32 },
-#if 0
+#if DVBv5(3)
         { VLC_GUARD(1,128),  GUARD_INTERVAL_1_128 },
         { VLC_GUARD(19,128), GUARD_INTERVAL_19_128 },
         { VLC_GUARD(19,256), GUARD_INTERVAL_19_256 },
@@ -780,7 +780,7 @@ int dvb_set_dvbt2 (dvb_device_t *d, uint32_t freq, const char *modstr,
                    uint32_t fec, uint32_t bandwidth,
                    int transmit_mode, uint32_t guard)
 {
-#if 0
+#if DVBv5(3)
     uint32_t mod = dvb_parse_modulation (modstr, QAM_AUTO);
     fec = dvb_parse_fec (fec);
     bandwidth *= 1000000;
@@ -793,6 +793,7 @@ int dvb_set_dvbt2 (dvb_device_t *d, uint32_t freq, const char *modstr,
                           DTV_TRANSMISSION_MODE, transmit_mode,
                           DTV_GUARD_INTERVAL, guard);
 #else
+# warning DVB-T2 needs Linux DVB version 5.3 or later.
     msg_Err (d->obj, "DVB-T2 support not compiled-in");
     (void) freq; (void) modstr; (void) fec; (void) bandwidth;
     (void) transmit_mode; (void) guard;