X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=plugins%2Fx11%2Fx11.c;h=8d44d7854c9e3282a6e4670ab74c0c7eec21ab06;hb=e57dfae199514c2b510afdd48b4d04d39bbc9358;hp=57f6dbbb29c68a87d0bb54e8a648672c772f37e8;hpb=4f551c2bf0d189405e96cbbb8234ed3edd9d6d3e;p=vlc diff --git a/plugins/x11/x11.c b/plugins/x11/x11.c index 57f6dbbb29..8d44d7854c 100644 --- a/plugins/x11/x11.c +++ b/plugins/x11/x11.c @@ -2,7 +2,7 @@ * x11.c : X11 plugin for vlc ***************************************************************************** * Copyright (C) 2000, 2001 VideoLAN - * $Id: x11.c,v 1.5 2001/03/21 13:42:34 sam Exp $ + * $Id: x11.c,v 1.7 2001/05/30 17:03:12 sam Exp $ * * Authors: Samuel Hocevar * @@ -40,74 +40,31 @@ #include "video_output.h" #include "modules.h" - -/***************************************************************************** - * Building configuration tree - *****************************************************************************/ -MODULE_CONFIG_START -ADD_WINDOW( "Configuration for X11 module" ) - ADD_COMMENT( "For now, the X11 module cannot be configured" ) -MODULE_CONFIG_END +#include "modules_export.h" /***************************************************************************** * Capabilities defined in the other files. - ******************************************************************************/ + *****************************************************************************/ void _M( vout_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. + * Building configuration tree *****************************************************************************/ -MODULE_INIT -{ - p_module->psz_name = MODULE_STRING; - p_module->psz_longname = "X11 module"; - p_module->psz_version = VERSION; +MODULE_CONFIG_START +ADD_WINDOW( "Configuration for X11 module" ) + ADD_COMMENT( "For now, the X11 module cannot be configured" ) +MODULE_CONFIG_STOP +MODULE_INIT_START p_module->i_capabilities = MODULE_CAPABILITY_NULL | MODULE_CAPABILITY_VOUT; + p_module->psz_longname = "X11 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 ); +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