Added check against NIT dvbpsi support.

It is not mandatory but NIT support is better.

diff --git a/modules/access/dvb/access.c b/modules/access/dvb/access.c
index b3b1be616113f809985ea37efb44807fe9de589f..a3e482a9b42dd55e60448a4d67b5e5103baddbf3 100644 (file)
--- a/modules/access/dvb/access.c
+++ b/modules/access/dvb/access.c
@@ -56,7 +56,6 @@
 #   include <dvbpsi/psi.h>
 #   include <dvbpsi/demux.h>
 #   include <dvbpsi/sdt.h>
-#   include <dvbpsi/nit.h>
 #else
 #   include "dvbpsi.h"
 #   include "descriptor.h"
@@ -66,7 +65,6 @@
 #   include "psi.h"
 #   include "demux.h"
 #   include "sdt.h"
-#   include "nit.h"
 #endif
 
 #ifdef ENABLE_HTTPD

diff --git a/modules/access/dvb/en50221.c b/modules/access/dvb/en50221.c
index 965ac4102bf7e3c7c27f17a316362cc6ef10dfb3..e00db711a73fc5c090a6f39cb8bffdbff236e858 100644 (file)
--- a/modules/access/dvb/en50221.c
+++ b/modules/access/dvb/en50221.c
@@ -57,7 +57,6 @@
 #   include <dvbpsi/psi.h>
 #   include <dvbpsi/demux.h>
 #   include <dvbpsi/sdt.h>
-#   include <dvbpsi/nit.h>
 #else
 #   include "dvbpsi.h"
 #   include "descriptor.h"
@@ -67,7 +66,6 @@
 #   include "psi.h"
 #   include "demux.h"
 #   include "sdt.h"
-#   include "nit.h"
 #endif
 
 #ifdef ENABLE_HTTPD

diff --git a/modules/access/dvb/http.c b/modules/access/dvb/http.c
index 21365ff361e3b15de582c7b08c8d99dd170f5a75..64c139d4126100d29efb908f1ce985721abe8663 100644 (file)
--- a/modules/access/dvb/http.c
+++ b/modules/access/dvb/http.c
@@ -50,7 +50,6 @@
 #   include <dvbpsi/psi.h>
 #   include <dvbpsi/demux.h>
 #   include <dvbpsi/sdt.h>
-#   include <dvbpsi/nit.h>
 #else
 #   include "dvbpsi.h"
 #   include "descriptor.h"
@@ -60,7 +59,6 @@
 #   include "psi.h"
 #   include "demux.h"
 #   include "sdt.h"
-#   include "nit.h"
 #endif
 
 #ifdef ENABLE_HTTPD

diff --git a/modules/access/dvb/linux_dvb.c b/modules/access/dvb/linux_dvb.c
index 01acde204d6ac76d1941ee240e05b4ca8042fade..d0dbcf4a2bf89ad5da4665a0b0cf000559df6da5 100644 (file)
--- a/modules/access/dvb/linux_dvb.c
+++ b/modules/access/dvb/linux_dvb.c
@@ -57,7 +57,6 @@
 #   include <dvbpsi/psi.h>
 #   include <dvbpsi/demux.h>
 #   include <dvbpsi/sdt.h>
-#   include <dvbpsi/nit.h>
 #else
 #   include "dvbpsi.h"
 #   include "descriptor.h"
@@ -67,7 +66,6 @@
 #   include "psi.h"
 #   include "demux.h"
 #   include "sdt.h"
-#   include "nit.h"
 #endif
 
 #ifdef ENABLE_HTTPD

diff --git a/modules/access/dvb/scan.c b/modules/access/dvb/scan.c
index 3ae5b7e972c609b7d690b799754a720855d84beb..42a72d1cbb9867eb16e535ff027845ca19e23736 100644 (file)
--- a/modules/access/dvb/scan.c
+++ b/modules/access/dvb/scan.c
@@ -52,7 +52,6 @@
 #   include <dvbpsi/psi.h>
 #   include <dvbpsi/demux.h>
 #   include <dvbpsi/sdt.h>
-#   include <dvbpsi/nit.h>
 #else
 #   include "dvbpsi.h"
 #   include "descriptor.h"
@@ -62,7 +61,6 @@
 #   include "psi.h"
 #   include "demux.h"
 #   include "sdt.h"
-#   include "nit.h"
 #endif
 
 #ifdef ENABLE_HTTPD
@@ -388,6 +386,7 @@ static void SDTCallBack( scan_session_t *p_session, dvbpsi_sdt_t *p_sdt )
     }
 }
 
+#ifdef DVBPSI_USE_NIT
 static void NITCallBack( scan_session_t *p_session, dvbpsi_nit_t *p_nit )
 {
     vlc_object_t *p_obj = p_session->p_obj;
@@ -498,13 +497,16 @@ static void NITCallBack( scan_session_t *p_session, dvbpsi_nit_t *p_nit )
         }
     }
 }
+#endif
 
 static void PSINewTableCallBack( scan_session_t *p_session, dvbpsi_handle h, uint8_t  i_table_id, uint16_t i_extension )
 {
     if( i_table_id == 0x42 )
         dvbpsi_AttachSDT( h, i_table_id, i_extension, (dvbpsi_sdt_callback)SDTCallBack, p_session );
+#ifdef DVBPSI_USE_NIT
     else if( i_table_id == 0x40 )
         dvbpsi_AttachNIT( h, i_table_id, i_extension, (dvbpsi_nit_callback)NITCallBack, p_session );
+#endif
 }
 
 
@@ -520,9 +522,10 @@ int scan_session_Init( vlc_object_t *p_obj, scan_session_t *p_session, const sca
     p_session->i_nit_pid = -1;
     p_session->sdt = NULL;
     p_session->p_sdt = NULL;
+#ifdef DVBPSI_USE_NIT
     p_session->nit = NULL;
     p_session->p_nit = NULL;
-
+#endif
     return VLC_SUCCESS;
 }
 
@@ -532,7 +535,10 @@ void scan_session_Clean( scan_t *p_scan, scan_session_t *p_session )
 
     dvbpsi_pat_t *p_pat = p_session->p_pat;
     dvbpsi_sdt_t *p_sdt = p_session->p_sdt;
+
+#ifdef DVBPSI_USE_NIT
     dvbpsi_nit_t *p_nit = p_session->p_nit;
+#endif
 
     if( p_pat )
     {
@@ -586,6 +592,7 @@ void scan_session_Clean( scan_t *p_scan, scan_session_t *p_session )
         }
     }
 
+#ifdef DVBPSI_USE_NIT
     /* Parse NIT */
     if( p_pat && p_nit )
     {
@@ -619,6 +626,7 @@ void scan_session_Clean( scan_t *p_scan, scan_session_t *p_session )
             }
         }
     }
+#endif
 
     /* */
     for( int i = i_service_start; i < p_scan->i_service; i++ )
@@ -626,13 +634,15 @@ void scan_session_Clean( scan_t *p_scan, scan_session_t *p_session )
         scan_service_t *p_srv = p_scan->pp_service[i];
 
         p_srv->i_snr = p_session->i_snr;
+        if( p_sdt )
+            p_srv->i_sdt_version = p_sdt->i_version;
+#ifdef DVBPSI_USE_NIT
         if( p_nit )
         {
             p_srv->i_network_id = p_nit->i_network_id;
             p_srv->i_nit_version = p_nit->i_version;
         }
-        if( p_sdt )
-            p_srv->i_sdt_version = p_sdt->i_version;
+#endif
     }
 
 
@@ -646,10 +656,12 @@ void scan_session_Clean( scan_t *p_scan, scan_session_t *p_session )
         dvbpsi_DetachDemux( p_session->sdt );
     if( p_session->p_sdt )
         dvbpsi_DeleteSDT( p_session->p_sdt );
+#ifdef DVBPSI_USE_NIT
     if( p_session->nit )
         dvbpsi_DetachDemux( p_session->nit );
     if( p_session->p_nit )
         dvbpsi_DeleteNIT( p_session->p_nit );
+#endif
 }
 
 static int ScanServiceCmp( const void *a, const void *b )
@@ -772,16 +784,23 @@ bool scan_session_Push( scan_session_t *p_scan, block_t *p_block )
     }
     else if( i_pid == p_scan->i_nit_pid )
     {
+#ifdef DVBPSI_USE_NIT
         if( !p_scan->nit )
             p_scan->nit = dvbpsi_AttachDemux( (dvbpsi_demux_new_cb_t)PSINewTableCallBack, p_scan );
 
         if( p_scan->nit )
             dvbpsi_PushPacket( p_scan->nit, p_block->p_buffer );
+#endif
     }
 
     block_Release( p_block );
 
-    return p_scan->p_pat && p_scan->p_sdt && p_scan->p_nit;
+    return p_scan->p_pat && p_scan->p_sdt && 
+#ifdef DVBPSI_USE_NIT
+        p_scan->p_nit;
+#else
+        true;
+#endif
 }
 
 void scan_service_SetSNR( scan_session_t *p_session, int i_snr )

diff --git a/modules/access/dvb/scan.h b/modules/access/dvb/scan.h
index c3d0ea03d114de2f38a1001d47736d80a8f8e063..cd5804299828b6dea90259989b13ac4c4cb2e9b1 100644 (file)
--- a/modules/access/dvb/scan.h
+++ b/modules/access/dvb/scan.h
@@ -20,6 +20,22 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA    02111, USA.
  *****************************************************************************/
 
+#ifdef HAVE_DVBPSI_DR_H
+#ifdef _DVBPSI_DR_43_H_
+#   define DVBPSI_USE_NIT 1
+#   include <dvbpsi/nit.h>
+#endif
+#else
+#ifdef _DVBPSI_DR_43_H_
+#   define DVBPSI_USE_NIT 1
+#   include "nit.h"
+#endif
+#endif
+
+#ifndef DVBPSI_USE_NIT
+#   warning NIT is not supported by your libdvbpsi version
+#endif
+
 typedef enum
 {
     SCAN_NONE,
@@ -101,8 +117,10 @@ typedef struct
     dvbpsi_handle sdt;
     dvbpsi_sdt_t *p_sdt;
 
+#ifdef DVBPSI_USE_NIT
     dvbpsi_handle nit;
     dvbpsi_nit_t *p_nit;
+#endif
 
 } scan_session_t;