* Fixed the BeOS compile typo.

[vlc] / plugins / sdl / sdl.c

diff --git a/plugins/sdl/sdl.c b/plugins/sdl/sdl.c
index 998069b7e4b577c0d4823c4c85aeec7def5a52cf..6cc8534a2b09da38c240e1866ca8b1e5381b8602 100644 (file)
--- a/plugins/sdl/sdl.c
+++ b/plugins/sdl/sdl.c
@@ -2,6 +2,7 @@
  * sdl.c : SDL plugin for vlc
  *****************************************************************************
  * Copyright (C) 2000, 2001 VideoLAN
+ * $Id: sdl.c,v 1.16 2001/05/30 17:03:12 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *          Pierre Baillet <oct@zoy.org>
@@ -23,6 +24,7 @@
  *****************************************************************************/
 
 #define MODULE_NAME sdl
+#include "modules_inner.h"
 
 /*****************************************************************************
  * Preamble
@@ -35,7 +37,6 @@
 #include "common.h"                                     /* boolean_t, byte_t */
 #include "threads.h"
 #include "mtime.h"
-#include "tests.h"
 
 #include "audio_output.h"
 
@@ -43,7 +44,13 @@
 #include "video_output.h"
 
 #include "modules.h"
-#include "modules_inner.h"
+#include "modules_export.h"
+
+/*****************************************************************************
+ * Capabilities defined in the other files.
+ *****************************************************************************/
+void _M( aout_getfunctions )( function_list_t * p_function_list );
+void _M( vout_getfunctions )( function_list_t * p_function_list );
 
 /*****************************************************************************
  * Building configuration tree
@@ -51,70 +58,20 @@
 MODULE_CONFIG_START
 ADD_WINDOW( "Configuration for SDL module" )
     ADD_COMMENT( "For now, the SDL module cannot be configured" )
-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 );
-
-/*****************************************************************************
- * InitModule: get the module structure and configuration.
- *****************************************************************************
- * We have to fill psz_name, psz_longname and psz_version. These variables
- * will be strdup()ed later by the main application because the module can
- * 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 )
-{
-    p_module->psz_name = MODULE_STRING;
-    p_module->psz_longname = "Simple DirectMedia Layer module";
-    p_module->psz_version = VERSION;
+MODULE_CONFIG_STOP
 
+MODULE_INIT_START
     p_module->i_capabilities = MODULE_CAPABILITY_NULL
                                 | MODULE_CAPABILITY_VOUT
                                 | MODULE_CAPABILITY_AOUT;
+    p_module->psz_longname = "Simple DirectMedia Layer module";
+MODULE_INIT_STOP
 
-    return( 0 );
-}
-
-/*****************************************************************************
- * ActivateModule: set the module to an usable state.
- *****************************************************************************
- * This function fills the capability functions and the configuration
- * structure. Once ActivateModule() has been called, the i_usage can
- * 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 )
-{
-    p_module->p_functions = 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 );
-
-    p_module->p_config = p_config;
-
-    return( 0 );
-}
-
-/*****************************************************************************
- * DeactivateModule: make sure the module can be unloaded.
- *****************************************************************************
- * This function must only be called when i_usage == 0. If it successfully
- * 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 )
-{
-    free( p_module->p_functions );
+MODULE_ACTIVATE_START
+    _M( aout_getfunctions )( &p_module->p_functions->aout );
+    _M( vout_getfunctions )( &p_module->p_functions->vout );
+MODULE_ACTIVATE_STOP
 
-    return( 0 );
-}
+MODULE_DEACTIVATE_START
+MODULE_DEACTIVATE_STOP