access_dvb: constify.

[vlc] / modules / access / dvb / scan.h

diff --git a/modules/access/dvb/scan.h b/modules/access/dvb/scan.h
index c3d0ea03d114de2f38a1001d47736d80a8f8e063..d8e8c2a10adfb60060004ef33aa3f4e603054a3f 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,16 +117,18 @@ 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;
 
 typedef struct
 {
     vlc_object_t *p_obj;
+    struct dialog_progress_bar_t *p_dialog;
     int64_t i_index;
-    int i_dialog_id;
     scan_parameter_t parameter;
     int64_t i_time_start;