X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=plugins%2Fggi%2Fggi.c;h=d6dad64b70e5c5ce508483a0e49fce73f46c1f4a;hb=0a4aeaa67cae0699195b135dcc65ce5b0ee5fdc4;hp=3dd6a7819fa3d14d0f4dcfdcfd469ef45d8ab4c7;hpb=e13aed00cf01eefa9285cb030486ee0118ea0425;p=vlc diff --git a/plugins/ggi/ggi.c b/plugins/ggi/ggi.c index 3dd6a7819f..d6dad64b70 100644 --- a/plugins/ggi/ggi.c +++ b/plugins/ggi/ggi.c @@ -1,10 +1,11 @@ /***************************************************************************** * ggi.c : GGI plugin for vlc ***************************************************************************** - * Copyright (C) 2000 VideoLAN - * - * Authors: + * Copyright (C) 2000, 2001 VideoLAN + * $Id: ggi.c,v 1.6 2001/04/28 03:36:25 sam Exp $ * + * 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 * the Free Software Foundation; either version 2 of the License, or @@ -20,6 +21,9 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. *****************************************************************************/ +#define MODULE_NAME ggi +#include "modules_inner.h" + /***************************************************************************** * Preamble *****************************************************************************/ @@ -31,88 +35,79 @@ #include "common.h" /* boolean_t, byte_t */ #include "threads.h" #include "mtime.h" -#include "tests.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_GGICreate ( vout_thread_t *p_vout, char *psz_display, - int i_root_window, void *p_data ); -int vout_GGIInit ( p_vout_thread_t p_vout ); -void vout_GGIEnd ( p_vout_thread_t p_vout ); -void vout_GGIDestroy ( p_vout_thread_t p_vout ); -int vout_GGIManage ( p_vout_thread_t p_vout ); -void vout_GGIDisplay ( p_vout_thread_t p_vout ); -void vout_GGISetPalette ( p_vout_thread_t p_vout, - u16 *red, u16 *green, u16 *blue, u16 *transp ); - -/* Interface */ -int intf_GGICreate ( p_intf_thread_t p_intf ); -void intf_GGIDestroy ( p_intf_thread_t p_intf ); -void intf_GGIManage ( p_intf_thread_t p_intf ); +MODULE_CONFIG_START +ADD_WINDOW( "Configuration for GGI module" ) + ADD_COMMENT( "For now, the GGI module cannot be configured" ) +MODULE_CONFIG_END /***************************************************************************** - * GetConfig: get the plugin structure and configuration + * Capabilities defined in the other files. *****************************************************************************/ -plugin_info_t * GetConfig( void ) -{ - plugin_info_t * p_info = (plugin_info_t *) malloc( sizeof(plugin_info_t) ); +void _M( vout_getfunctions )( function_list_t * p_function_list ); - p_info->psz_name = "GGI"; - p_info->psz_version = VERSION; - p_info->psz_author = "the VideoLAN team "; +/***************************************************************************** + * 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 = "General Graphics Interface 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; - /* if the GGI libraries are there, assume we can enter the - * initialization part at least, even if we fail afterwards */ - p_info->i_score = 0x100; + return( 0 ); +} - if( TestProgram( "ggivlc" ) ) +/***************************************************************************** + * 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 ) { - p_info->i_score += 0x180; + return( -1 ); } - /* If this plugin was requested, score it higher */ - if( TestMethod( VOUT_METHOD_VAR, "ggi" ) ) - { - p_info->i_score += 0x200; - } + _M( vout_getfunctions )( &p_module->p_functions->vout ); - return( p_info ); + p_module->p_config = p_config; + + return( 0 ); } /***************************************************************************** - * Following functions are only called through the p_info structure + * 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. *****************************************************************************/ - -static void vout_GetPlugin( p_vout_thread_t p_vout ) +MODULE_DEACTIVATE { - p_vout->p_sys_create = vout_GGICreate; - p_vout->p_sys_init = vout_GGIInit; - p_vout->p_sys_end = vout_GGIEnd; - p_vout->p_sys_destroy = vout_GGIDestroy; - p_vout->p_sys_manage = vout_GGIManage; - p_vout->p_sys_display = vout_GGIDisplay; -} + free( p_module->p_functions ); -static void intf_GetPlugin( p_intf_thread_t p_intf ) -{ - p_intf->p_sys_create = intf_GGICreate; - p_intf->p_sys_destroy = intf_GGIDestroy; - p_intf->p_sys_manage = intf_GGIManage; + return( 0 ); }