[vlc-commits] DVB: make scanning fully independent of Linux DVB

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Mar  5 18:19:27 2011 +0200| [192f7f9b186e7038574856e9c9344e4265f69599] | committer: Rémi Denis-Courmont

DVB: make scanning fully independent of Linux DVB

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

 modules/access/dvb/dvb.h  |    9 ++++-----
 modules/access/dvb/scan.c |    2 +-
 modules/access/dvb/scan.h |    6 ++++--
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/modules/access/dvb/dvb.h b/modules/access/dvb/dvb.h
index 67f4235..056dcf1 100644
--- a/modules/access/dvb/dvb.h
+++ b/modules/access/dvb/dvb.h
@@ -48,12 +48,11 @@ typedef struct
     bool b_has_lock;
 } frontend_status_t;
 
-typedef struct scan_parameter_t scan_parameter_t;
-typedef struct scan_t scan_t;
-
 #define MAX_DEMUX 256
 
 #include "en50221.h"
+struct scan_t;
+struct scan_parameter_t;
 
 struct access_sys_t
 {
@@ -85,7 +84,7 @@ struct access_sys_t
 #endif
 
     /* Scan */
-    scan_t *scan;
+    struct scan_t *scan;
 };
 
 #define VIDEO0_TYPE     1
@@ -110,7 +109,7 @@ void FrontendStatus( access_t * );
 
 int  FrontendGetStatistic( access_t *, frontend_statistic_t * );
 void FrontendGetStatus( access_t *, frontend_status_t * );
-int  FrontendGetScanParameter( access_t *, scan_parameter_t * );
+int  FrontendGetScanParameter( access_t *, struct scan_parameter_t * );
 
 int DMXSetFilter( access_t *, int i_pid, int * pi_fd, int i_type );
 int DMXUnsetFilter( access_t *, int i_fd );
diff --git a/modules/access/dvb/scan.c b/modules/access/dvb/scan.c
index e794c16..ebb61e9 100644
--- a/modules/access/dvb/scan.c
+++ b/modules/access/dvb/scan.c
@@ -49,8 +49,8 @@
 #   include <dvbpsi/nit.h>
 #endif
 
-#include "dvb.h"
 #include "scan.h"
+#include "en50221.h" // FIXME
 
 typedef enum
 {
diff --git a/modules/access/dvb/scan.h b/modules/access/dvb/scan.h
index 10fe3b6..1dd67b6 100644
--- a/modules/access/dvb/scan.h
+++ b/modules/access/dvb/scan.h
@@ -37,7 +37,7 @@ typedef struct
     char c_polarization;
 } scan_dvbs_transponder_t;
 
-struct scan_parameter_t
+typedef struct scan_parameter_t
 {
     scan_type_t type;
     bool b_exhaustive;
@@ -71,7 +71,7 @@ struct scan_parameter_t
         scan_dvbs_transponder_t *p_transponders;
         int i_count;
     } sat_info;
-};
+} scan_parameter_t;
 
 typedef struct
 {
@@ -85,6 +85,8 @@ typedef struct
     char c_polarization;
 } scan_configuration_t;
 
+typedef struct scan_t scan_t;
+
 scan_t *scan_New( vlc_object_t *p_obj, const scan_parameter_t *p_parameter );
 void scan_Destroy( scan_t *p_scan );