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

[vlc] / plugins / beos / beos.cpp

diff --git a/plugins/beos/beos.cpp b/plugins/beos/beos.cpp
index 0fc6eba2848af5d23a80757d33494acf0ef3b0e8..27ee8f3e90c0e8b2a5202ff0d3a720917dbdca02 100644 (file)
--- a/plugins/beos/beos.cpp
+++ b/plugins/beos/beos.cpp
@@ -22,6 +22,7 @@
  *****************************************************************************/
 
 #define MODULE_NAME beos
+#include "modules_inner.h"
 
 /*****************************************************************************
  * Preamble
@@ -38,7 +39,6 @@ extern "C"
 #include "mtime.h"
 
 #include "modules.h"
-#include "modules_inner.h"
 
 /*****************************************************************************
  * Build configuration tree.
@@ -51,9 +51,9 @@ MODULE_CONFIG_END
 /*****************************************************************************
  * Capabilities defined in the other files.
  *****************************************************************************/
-extern void aout_getfunctions( function_list_t * p_function_list );
-extern void vout_getfunctions( function_list_t * p_function_list );
-extern void intf_getfunctions( function_list_t * p_function_list );
+void _M( aout_getfunctions )( function_list_t * p_function_list );
+void _M( vout_getfunctions )( function_list_t * p_function_list );
+void _M( intf_getfunctions )( function_list_t * p_function_list );
 
 /*****************************************************************************
  * InitModule: get the module structure and configuration.
@@ -63,7 +63,7 @@ extern void intf_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 = "BeOS standard API module";
@@ -85,17 +85,18 @@ 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 ) );
+    p_module->p_functions =
+                ( module_functions_t * )malloc( sizeof( module_functions_t ) );
     if( p_module->p_functions == NULL )
     {
         return( -1 );
     }
 
-    aout_getfunctions( &p_module->p_functions->aout );
-    vout_getfunctions( &p_module->p_functions->vout );
-    intf_getfunctions( &p_module->p_functions->intf );
+    _M( aout_getfunctions )( &p_module->p_functions->aout );
+    _M( vout_getfunctions )( &p_module->p_functions->vout );
+    _M( intf_getfunctions )( &p_module->p_functions->intf );
 
     p_module->p_config = p_config;
 
@@ -109,7 +110,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 );