* Fixed the BeOS compile typo.

[vlc] / plugins / alsa / alsa.c

diff --git a/plugins/alsa/alsa.c b/plugins/alsa/alsa.c
index 16d4cf6061ffc42f7194d4cb8da6a73ca51ffb6c..edfe1fb7110625f19b307bbaf2160bbedef260f4 100644 (file)
--- a/plugins/alsa/alsa.c
+++ b/plugins/alsa/alsa.c
@@ -2,7 +2,7 @@
  * alsa.c : alsa plugin for vlc
  *****************************************************************************
  * Copyright (C) 2000 VideoLAN
- * $Id: alsa.c,v 1.9 2001/04/27 16:08:26 sam Exp $
+ * $Id: alsa.c,v 1.10 2001/05/30 17:03:11 sam Exp $
  *
  * Authors: Henri Fallon <henri@videolan.org>
  *
@@ -38,13 +38,7 @@
 #include "mtime.h"
 
 #include "modules.h"
-
-/*****************************************************************************
- * Build configuration tree.
- *****************************************************************************/
-MODULE_CONFIG_START
-    ADD_COMMENT( "Yeah, alsa rocks !" )
-MODULE_CONFIG_END     
+#include "modules_export.h"
 
 /*****************************************************************************
  * Capabilities defined in the other files.
@@ -52,59 +46,22 @@ MODULE_CONFIG_END
 void _M( aout_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.
+ * Build configuration tree.
  *****************************************************************************/
-MODULE_INIT
-{
-    p_module->psz_name = MODULE_STRING;
-    p_module->psz_longname = "Alsa audio module";
-    p_module->psz_version = VERSION;
+MODULE_CONFIG_START
+    ADD_COMMENT( "Yeah, alsa rocks !" )
+MODULE_CONFIG_STOP
+
+MODULE_INIT_START
     p_module->i_capabilities =  MODULE_CAPABILITY_NULL
                                 | MODULE_CAPABILITY_AOUT;
-    return( 0 );
-}
+    p_module->psz_longname = "Alsa audio module";
+MODULE_INIT_STOP
     
-
-/*****************************************************************************
- * 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().
- *****************************************************************************/
-MODULE_ACTIVATE
-{
-    p_module->p_functions = malloc( sizeof( module_functions_t ) );
-    if( p_module->p_functions == NULL )
-    {
-        return( -1 );
-    }
-
+MODULE_ACTIVATE_START
     _M( aout_getfunctions )( &p_module->p_functions->aout );
-    
-    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.
- *****************************************************************************/
-MODULE_DEACTIVATE
-{
-    free( p_module->p_functions );
+MODULE_ACTIVATE_STOP
 
-    return( 0 );
-}
+MODULE_DEACTIVATE_START
+MODULE_DEACTIVATE_STOP