X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=plugins%2Fmacosx%2Fmacosx.c;h=76ee87cceaa070766b03e2f781c83219d70454d9;hb=440f9992ee947ea5fd0debbf35fdd1011c6404b3;hp=b1c815b3f086ee063ef2008cc20f9eb4346bdb9b;hpb=a8c893ff0eef49003f06e44323f66f4aba470984;p=vlc

diff --git a/plugins/macosx/macosx.c b/plugins/macosx/macosx.c
index b1c815b3f0..76ee87ccea 100644
--- a/plugins/macosx/macosx.c
+++ b/plugins/macosx/macosx.c
@@ -2,7 +2,7 @@
  * macosx.c : MacOS X plugin for vlc
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: macosx.c,v 1.4 2001/04/06 18:18:10 massiot Exp $
+ * $Id: macosx.c,v 1.5 2001/05/30 17:03:12 sam Exp $
  *
  * Authors: Colin Delacroix <colin@zoy.org>
  *          Eugenio Jarosiewicz <ej0@cise.ufl.edu>
@@ -39,14 +39,6 @@
 
 #include "modules.h"
 
-/*****************************************************************************
- * Build configuration tree.
- *****************************************************************************/
-MODULE_CONFIG_START
-ADD_WINDOW( "Configuration for MacOS X module" )
-    ADD_COMMENT( "Ha, ha -- nothing to configure yet" )
-MODULE_CONFIG_END
-
 /*****************************************************************************
  * Capabilities defined in the other files.
  *****************************************************************************/
@@ -55,63 +47,27 @@ void _M( vout_getfunctions )( function_list_t * p_function_list );
 void _M( intf_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 = "MacOS X interface, sound and video module";
-    p_module->psz_version = VERSION;
+MODULE_CONFIG_START
+ADD_WINDOW( "Configuration for MacOS X module" )
+    ADD_COMMENT( "Ha, ha -- nothing to configure yet" )
+MODULE_CONFIG_STOP
 
+MODULE_INIT_START
     p_module->i_capabilities = MODULE_CAPABILITY_NULL
                                 | MODULE_CAPABILITY_VOUT
                                 | MODULE_CAPABILITY_AOUT
                                 | MODULE_CAPABILITY_INTF;
+    p_module->psz_longname = "MacOS X interface, sound and video 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( vout_getfunctions )( &p_module->p_functions->vout );
     _M( aout_getfunctions )( &p_module->p_functions->aout );
     _M( intf_getfunctions )( &p_module->p_functions->intf );
+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