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

diff --git a/plugins/darwin/darwin.c b/plugins/darwin/darwin.c
index f26d3bddea..2f0683cdb7 100644
--- a/plugins/darwin/darwin.c
+++ b/plugins/darwin/darwin.c
@@ -2,7 +2,7 @@
  * darwin.c : Darwin plugin for vlc
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: darwin.c,v 1.4 2001/04/06 18:18:10 massiot Exp $
+ * $Id: darwin.c,v 1.5 2001/05/30 17:03:12 sam Exp $
  *
  * Authors: Colin Delacroix <colin@zoy.org>
  *          Christophe Massiot <massiot@via.ecp.fr>
@@ -45,72 +45,28 @@
 
 #include "modules.h"
 
-/*****************************************************************************
- * Build configuration tree.
- *****************************************************************************/
-MODULE_CONFIG_START
-ADD_WINDOW( "Configuration for Darwin module" )
-    ADD_COMMENT( "Ha, ha -- nothing to configure yet" )
-MODULE_CONFIG_END
-
 /*****************************************************************************
  * Capabilities defined in the other files.
  *****************************************************************************/
 // 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 = "Darwin support module";
-    p_module->psz_version = VERSION;
+MODULE_CONFIG_START
+ADD_WINDOW( "Configuration for Darwin module" )
+    ADD_COMMENT( "Ha, ha -- nothing to configure yet" )
+MODULE_CONFIG_STOP
 
+MODULE_INIT_START
     p_module->i_capabilities = MODULE_CAPABILITY_NULL;
+    p_module->psz_longname = "Darwin support 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( aout_getfunctions )( &p_module->p_functions->aout );
+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