X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=plugins%2Fmga%2Fmga.c;h=e7c43b137383920a264b469b85ad2f2614555790;hb=583c6553f6761421260d86bbc21b5b3169c04319;hp=b824b78d56fba2006fa548ff919c6f025e1373f1;hpb=3bb7a5371e29b608e29851b9f1366a12a3505afe;p=vlc diff --git a/plugins/mga/mga.c b/plugins/mga/mga.c index b824b78d56..e7c43b1373 100644 --- a/plugins/mga/mga.c +++ b/plugins/mga/mga.c @@ -1,9 +1,9 @@ /***************************************************************************** * mga.c : Matrox Graphic Array plugin for vlc ***************************************************************************** - * Copyright (C) 2000 VideoLAN + * Copyright (C) 2000, 2001 VideoLAN * - * Authors: + * Authors: Samuel Hocevar * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,6 +20,9 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. *****************************************************************************/ +#define MODULE_NAME mga +#include "modules_inner.h" + /***************************************************************************** * Preamble *****************************************************************************/ @@ -31,75 +34,79 @@ #include "common.h" /* boolean_t, byte_t */ #include "threads.h" #include "mtime.h" -#include "plugins.h" -#include "interface.h" -#include "audio_output.h" #include "video.h" #include "video_output.h" +#include "modules.h" + /***************************************************************************** - * Exported prototypes + * Building configuration tree *****************************************************************************/ -static void vout_GetPlugin( p_vout_thread_t p_vout ); -static void intf_GetPlugin( p_intf_thread_t p_intf ); - -/* Video output */ -int vout_MGACreate ( vout_thread_t *p_vout, char *psz_display, - int i_root_window, void *p_data ); -int vout_MGAInit ( p_vout_thread_t p_vout ); -void vout_MGAEnd ( p_vout_thread_t p_vout ); -void vout_MGADestroy ( p_vout_thread_t p_vout ); -int vout_MGAManage ( p_vout_thread_t p_vout ); -void vout_MGADisplay ( p_vout_thread_t p_vout ); -void vout_SetPalette ( p_vout_thread_t p_vout, - u16 *red, u16 *green, u16 *blue, u16 *transp ); - -/* Interface */ -int intf_MGACreate ( p_intf_thread_t p_intf ); -void intf_MGADestroy ( p_intf_thread_t p_intf ); -void intf_MGAManage ( p_intf_thread_t p_intf ); +MODULE_CONFIG_START +ADD_WINDOW( "Configuration for MGA module" ) + ADD_COMMENT( "For now, the MGA module cannot be configured" ) +MODULE_CONFIG_END + +/***************************************************************************** + * Capabilities defined in the other files. + ******************************************************************************/ +void _M( vout_getfunctions )( function_list_t * p_function_list ); /***************************************************************************** - * GetConfig: get the plugin structure and configuration + * 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. *****************************************************************************/ -plugin_info_t * GetConfig( void ) +MODULE_INIT { - plugin_info_t * p_info = (plugin_info_t *) malloc( sizeof(plugin_info_t) ); - - p_info->psz_name = "Matrox Acceleration"; - p_info->psz_version = VERSION; - p_info->psz_author = "the VideoLAN team "; + p_module->psz_name = MODULE_STRING; + p_module->psz_longname = "Matrox Graphic Array module"; + p_module->psz_version = VERSION; - p_info->aout_GetPlugin = NULL; - p_info->vout_GetPlugin = vout_GetPlugin; - p_info->intf_GetPlugin = intf_GetPlugin; - p_info->yuv_GetPlugin = NULL; + p_module->i_capabilities = MODULE_CAPABILITY_NULL + | MODULE_CAPABILITY_VOUT; - /* The MGA module does not work yet */ - p_info->i_score = 0x0; - - return( p_info ); + return( 0 ); } /***************************************************************************** - * Following functions are only called through the p_info structure + * 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(). *****************************************************************************/ - -static void vout_GetPlugin( p_vout_thread_t p_vout ) +MODULE_ACTIVATE { - p_vout->p_sys_create = vout_MGACreate; - p_vout->p_sys_init = vout_MGAInit; - p_vout->p_sys_end = vout_MGAEnd; - p_vout->p_sys_destroy = vout_MGADestroy; - p_vout->p_sys_manage = vout_MGAManage; - p_vout->p_sys_display = vout_MGADisplay; + p_module->p_functions = malloc( sizeof( module_functions_t ) ); + if( p_module->p_functions == NULL ) + { + return( -1 ); + } + + _M( vout_getfunctions )( &p_module->p_functions->vout ); + + p_module->p_config = p_config; + + return( 0 ); } -static void intf_GetPlugin( p_intf_thread_t p_intf ) +/***************************************************************************** + * 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 { - p_intf->p_sys_create = intf_MGACreate; - p_intf->p_sys_destroy = intf_MGADestroy; - p_intf->p_sys_manage = intf_MGAManage; + free( p_module->p_functions ); + + return( 0 ); }