[vlc-commits] DVB: privatize scan_service

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Mar  5 16:15:41 2011 +0200| [60264b63ae24ff6f6a5106ffd159ac13ca7fa5c7] | committer: Rémi Denis-Courmont

DVB: privatize scan_service

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

 modules/access/dvb/scan.c |   32 ++++++++++++++++++++++++++++++--
 modules/access/dvb/scan.h |   30 ------------------------------
 2 files changed, 30 insertions(+), 32 deletions(-)

diff --git a/modules/access/dvb/scan.c b/modules/access/dvb/scan.c
index 8cfe306..31b9f00 100644
--- a/modules/access/dvb/scan.c
+++ b/modules/access/dvb/scan.c
@@ -48,6 +48,33 @@
 #include "dvb.h"
 #include "scan.h"
 
+typedef enum
+{
+    SERVICE_UNKNOWN = 0,
+    SERVICE_DIGITAL_RADIO,
+    SERVICE_DIGITAL_TELEVISION,
+    SERVICE_DIGITAL_TELEVISION_AC_SD,
+    SERVICE_DIGITAL_TELEVISION_AC_HD,
+} scan_service_type_t;
+
+typedef struct
+{
+    int  i_program;     /* program number (service id) */
+    scan_configuration_t cfg;
+    int i_snr;
+
+    scan_service_type_t type;
+    char *psz_name;     /* channel name in utf8 or NULL */
+    int  i_channel;     /* -1 if unknown */
+    bool b_crypted;     /* True if potentially crypted */
+
+    int i_network_id;
+
+    int i_nit_version;
+    int i_sdt_version;
+
+} scan_service_t;
+
 struct scan_t
 {
     vlc_object_t *p_obj;
@@ -61,7 +88,8 @@ struct scan_t
 };
 
 /* */
-scan_service_t *scan_service_New( int i_program, const scan_configuration_t *p_cfg  )
+static scan_service_t *scan_service_New( int i_program,
+                                         const scan_configuration_t *p_cfg )
 {
     scan_service_t *p_srv = malloc( sizeof(*p_srv) );
     if( !p_srv )
@@ -83,7 +111,7 @@ scan_service_t *scan_service_New( int i_program, const scan_configuration_t *p_c
     return p_srv;
 }
 
-void scan_service_Delete( scan_service_t *p_srv )
+static void scan_service_Delete( scan_service_t *p_srv )
 {
     free( p_srv->psz_name );
     free( p_srv );
diff --git a/modules/access/dvb/scan.h b/modules/access/dvb/scan.h
index 67f365f..878962a 100644
--- a/modules/access/dvb/scan.h
+++ b/modules/access/dvb/scan.h
@@ -94,33 +94,6 @@ typedef struct
     char c_polarization;
 } scan_configuration_t;
 
-typedef enum
-{
-    SERVICE_UNKNOWN = 0,
-    SERVICE_DIGITAL_RADIO,
-    SERVICE_DIGITAL_TELEVISION,
-    SERVICE_DIGITAL_TELEVISION_AC_SD,
-    SERVICE_DIGITAL_TELEVISION_AC_HD,
-} scan_service_type_t;
-
-typedef struct
-{
-    int  i_program;     /* program number (service id) */
-    scan_configuration_t cfg;
-    int i_snr;
-
-    scan_service_type_t type;
-    char *psz_name;     /* channel name in utf8 or NULL */
-    int  i_channel;     /* -1 if unknown */
-    bool b_crypted;     /* True if potentially crypted */
-
-    int i_network_id;
-
-    int i_nit_version;
-    int i_sdt_version;
-
-} scan_service_t;
-
 typedef struct
 {
     vlc_object_t *p_obj;
@@ -142,9 +115,6 @@ typedef struct
 
 } scan_session_t;
 
-scan_service_t *scan_service_New( int i_program, const scan_configuration_t *p_cfg  );
-void scan_service_Delete( scan_service_t *p_srv );
-
 scan_t *scan_New( vlc_object_t *p_obj, const scan_parameter_t *p_parameter );
 void scan_Destroy( scan_t *p_scan );