* es.c : Elementary Stream input module for vlc
*****************************************************************************
* Copyright (C) 2001 VideoLAN
- * $Id: es.c,v 1.1 2001/04/20 15:02:48 sam Exp $
+ * $Id: es.c,v 1.2 2001/05/30 17:03:12 sam Exp $
*
* Authors:
*
#include "modules.h"
-/*****************************************************************************
- * Build configuration tree.
- *****************************************************************************/
-MODULE_CONFIG_START
-ADD_WINDOW( "Configuration for ES module" )
- ADD_COMMENT( "foobar !" )
-MODULE_CONFIG_END
-
/*****************************************************************************
* Capabilities defined in the other files.
*****************************************************************************/
void _M( input_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 = "ISO 13818-1 MPEG Elementary Stream input module";
- p_module->psz_version = VERSION;
+MODULE_CONFIG_START
+ADD_WINDOW( "Configuration for ES module" )
+ ADD_COMMENT( "foobar !" )
+MODULE_CONFIG_STOP
+MODULE_INIT_START
p_module->i_capabilities = MODULE_CAPABILITY_NULL
| MODULE_CAPABILITY_INPUT;
+ p_module->psz_longname = "ISO 13818-1 MPEG Elementary Stream input 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().
- *****************************************************************************/
-MODULE_ACTIVATE
-{
- p_module->p_functions = malloc( sizeof( module_functions_t ) );
- if( p_module->p_functions == NULL )
- {
- return( -1 );
- }
-
+MODULE_ACTIVATE_START
_M( input_getfunctions )( &p_module->p_functions->input );
+MODULE_ACTIVATE_STOP
- 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 );
-
- return( 0 );
-}
+MODULE_DEACTIVATE_START
+MODULE_DEACTIVATE_STOP