lower case the module_* functions

[vlc] / modules / access / vcdx / demux.c

diff --git a/modules/access/vcdx/demux.c b/modules/access/vcdx/demux.c
index 55d1c6af4257d818c175bd50fa62ae8601dd711b..b89d55b08c84aeb554ac408f3e1ae12cb59d3e43 100644 (file)
--- a/modules/access/vcdx/demux.c
+++ b/modules/access/vcdx/demux.c
@@ -24,12 +24,15 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 
-#include <vlc/vlc.h>
-#include <<vlc_input.h>>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <stddef.h>
+#include <vlc_common.h>
+#include <vlc_input.h>
+#include <vlc_access.h>
 #include <vlc_interface.h>
 
 #ifdef HAVE_UNISTD_H
@@ -39,7 +42,6 @@
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <string.h>
 #include <errno.h>
 
 #ifdef STRNCASECMP_IN_STRINGS_H
@@ -72,14 +74,14 @@ struct demux_sys_t
 /*****************************************************************************
  * VCDInit: initializes structures
  *****************************************************************************/
-int E_(VCDInit) ( vlc_object_t *p_this )
+int VCDInit ( vlc_object_t *p_this )
 {
     input_thread_t *p_input = (input_thread_t *)p_this;
     vcd_data_t *    p_vcd = (vcd_data_t *)p_input->p_sys;
     demux_sys_t *   p_demux;
 
     printf("++++ VCDInit CALLED\n");
-    
+ 
 
     if( p_input->stream.i_method != INPUT_METHOD_VCD )
     {
@@ -93,7 +95,7 @@ int E_(VCDInit) ( vlc_object_t *p_this )
     }
 
     p_input->p_private = (void*)&p_demux->mpeg;
-    p_demux->p_module = module_Need( p_input, "mpeg-system", NULL, 0 );
+    p_demux->p_module = module_need( p_input, "mpeg-system", NULL, 0 );
     if( p_demux->p_module == NULL )
     {
         free( p_input->p_demux_data );
@@ -115,7 +117,7 @@ int E_(VCDInit) ( vlc_object_t *p_this )
 /*****************************************************************************
  * VCDEnd: frees unused data
  *****************************************************************************/
-void E_(VCDEnd) ( vlc_object_t *p_this )
+void VCDEnd ( vlc_object_t *p_this )
 {
     input_thread_t *p_input = (input_thread_t *)p_this;
     vcd_data_t *    p_vcd = p_input->p_demux_data->p_vcd;
@@ -127,12 +129,12 @@ void E_(VCDEnd) ( vlc_object_t *p_this )
         intf_StopThread( p_intf );
         vlc_object_detach( p_intf );
         vlc_object_release( p_intf );
-        intf_Destroy( p_intf );
+        vlc_object_release( p_intf );
     }
 
     p_vcd->p_intf = NULL;
 
-    module_Unneed( p_input, p_input->p_demux_data->p_module );
+    module_unneed( p_input, p_input->p_demux_data->p_module );
     free( p_input->p_demux_data );
 }