X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=plugins%2Fdownmix%2Fdownmix.c;h=a26b6c01ea0910f2512971424acd090181373144;hb=440f9992ee947ea5fd0debbf35fdd1011c6404b3;hp=675424b88706ef15f49880ba246150e5ee393673;hpb=1ffe943ec5e34e24199546b386114bb67586855a;p=vlc

diff --git a/plugins/downmix/downmix.c b/plugins/downmix/downmix.c
index 675424b887..a26b6c01ea 100644
--- a/plugins/downmix/downmix.c
+++ b/plugins/downmix/downmix.c
@@ -2,7 +2,7 @@
  * downmix.c : AC3 downmix module
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: downmix.c,v 1.1 2001/05/15 16:19:42 sam Exp $
+ * $Id: downmix.c,v 1.2 2001/05/30 17:03:12 sam Exp $
  *
  * Authors: Gaël Hendryckx <jimmy@via.ecp.fr>
  *
@@ -41,6 +41,7 @@
 #include "ac3_downmix_common.h"
 
 #include "modules.h"
+#include "modules_export.h"
 
 /*****************************************************************************
  * Local and extern prototypes.
@@ -54,64 +55,20 @@ static int  downmix_Probe       ( probedata_t *p_data );
 MODULE_CONFIG_START
 ADD_WINDOW( "Configuration for AC3 downmix module" )
     ADD_COMMENT( "Ha, ha -- nothing to configure yet" )
-MODULE_CONFIG_END
-
-/*****************************************************************************
- * 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.
- *****************************************************************************/
-MODULE_INIT
-{
-    p_module->psz_name = MODULE_STRING;
-    p_module->psz_longname = "AC3 downmix module";
-    p_module->psz_version = VERSION;
+MODULE_CONFIG_STOP
 
+MODULE_INIT_START
     p_module->i_capabilities = MODULE_CAPABILITY_NULL
                                 | MODULE_CAPABILITY_DOWNMIX;
+    p_module->psz_longname = "AC3 downmix 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
     downmix_getfunctions( &p_module->p_functions->downmix );
+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
 
 /* Following functions are local */