* Ported Glide and MGA plugins to the new module API. MGA never worked,

[vlc] / plugins / esd / esd.c

diff --git a/plugins/esd/esd.c b/plugins/esd/esd.c
index cefa673d590e47c59abdb4d1ae94d61577dce7b6..4595ec8350cf779095bf2ce80d2022fed4cf62b9 100644 (file)
--- a/plugins/esd/esd.c
+++ b/plugins/esd/esd.c
@@ -21,6 +21,7 @@
  *****************************************************************************/
 
 #define MODULE_NAME esd
+#include "modules_inner.h"
 
 /*****************************************************************************
  * Preamble
@@ -36,7 +37,6 @@
 #include "mtime.h"
 
 #include "modules.h"
-#include "modules_inner.h"
 
 /*****************************************************************************
  * Build configuration tree.
@@ -50,7 +50,7 @@ MODULE_CONFIG_END
 /*****************************************************************************
  * Capabilities defined in the other files.
  *****************************************************************************/
-extern void aout_getfunctions( function_list_t * p_function_list );
+void _M( aout_getfunctions )( function_list_t * p_function_list );
 
 /*****************************************************************************
  * InitModule: get the module structure and configuration.
@@ -60,7 +60,7 @@ extern void aout_getfunctions( function_list_t * p_function_list );
  * be unloaded later to save memory, and we want to be able to access this
  * data even after the module has been unloaded.
  *****************************************************************************/
-int InitModule( module_t * p_module )
+MODULE_INIT
 {
     p_module->psz_name = MODULE_STRING;
     p_module->psz_longname = "EsounD audio module";
@@ -80,7 +80,7 @@ int InitModule( module_t * p_module )
  * be set to 0 and calls to NeedModule() be made to increment it. To unload
  * the module, one has to wait until i_usage == 0 and call DeactivateModule().
  *****************************************************************************/
-int ActivateModule( module_t * p_module )
+MODULE_ACTIVATE
 {
     p_module->p_functions = malloc( sizeof( module_functions_t ) );
     if( p_module->p_functions == NULL )
@@ -88,7 +88,7 @@ int ActivateModule( module_t * p_module )
         return( -1 );
     }
 
-    aout_getfunctions( &p_module->p_functions->aout );
+    _M( aout_getfunctions )( &p_module->p_functions->aout );
 
     p_module->p_config = p_config;
 
@@ -102,7 +102,7 @@ int ActivateModule( module_t * p_module )
  * returns, i_usage can be set to -1 and the module unloaded. Be careful to
  * lock usage_lock during the whole process.
  *****************************************************************************/
-int DeactivateModule( module_t * p_module )
+MODULE_DEACTIVATE
 {
     free( p_module->p_functions );