* Fixed the BeOS compile typo.

[vlc] / plugins / mpeg / ps.c

diff --git a/plugins/mpeg/ps.c b/plugins/mpeg/ps.c
index 040a60cfddbed6a22a07715ad43ed9e9ff30c8a5..92c52a41d6406abc6ccc381cc13e10d332c19d86 100644 (file)
--- a/plugins/mpeg/ps.c
+++ b/plugins/mpeg/ps.c
@@ -2,7 +2,7 @@
  * ps.c : Program Stream input module for vlc
  *****************************************************************************
  * Copyright (C) 2000 VideoLAN
- * $Id: ps.c,v 1.3 2001/03/21 13:42:34 sam Exp $
+ * $Id: ps.c,v 1.4 2001/05/30 17:03:12 sam Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -38,14 +38,7 @@
 #include "mtime.h"
 
 #include "modules.h"
-
-/*****************************************************************************
- * Build configuration tree.
- *****************************************************************************/
-MODULE_CONFIG_START
-ADD_WINDOW( "Configuration for PS module" )
-    ADD_COMMENT( "foobar !" )
-MODULE_CONFIG_END
+#include "modules_export.h"
 
 /*****************************************************************************
  * Capabilities defined in the other files.
@@ -53,59 +46,23 @@ MODULE_CONFIG_END
 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 Program Stream input module";
-    p_module->psz_version = VERSION;
+MODULE_CONFIG_START
+ADD_WINDOW( "Configuration for PS 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 Program 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