X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fmodules_inner.h;h=d7b5af1dccfd0d6827fe84513cd88974bc62e560;hb=780ba1b903df7fa55511cef97e83b836118e098a;hp=dcfe4a408dfc619721b7b6954ffeecb05bbf2851;hpb=bbe70b81a082f6abb87250ea101419ae0368cc0d;p=vlc diff --git a/include/modules_inner.h b/include/modules_inner.h index dcfe4a408d..d7b5af1dcc 100644 --- a/include/modules_inner.h +++ b/include/modules_inner.h @@ -2,7 +2,7 @@ * modules_inner.h : Macros used from within a module. ***************************************************************************** * Copyright (C) 2001 VideoLAN - * $Id: modules_inner.h,v 1.26 2002/08/01 11:04:46 tcastley Exp $ + * $Id: modules_inner.h,v 1.37 2003/01/19 03:16:24 sam Exp $ * * Authors: Samuel Hocevar * @@ -10,7 +10,7 @@ * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -55,13 +55,21 @@ #if defined( __BUILTIN__ ) # define E_( function ) CONCATENATE( function, MODULE_NAME ) # define __VLC_SYMBOL( symbol ) CONCATENATE( symbol, MODULE_NAME ) -# define DECLARE_SYMBOLS ; -# define STORE_SYMBOLS ; +# define DECLARE_SYMBOLS struct _u_n_u_s_e_d_ +# define STORE_SYMBOLS struct _u_n_u_s_e_d_ #elif defined( __PLUGIN__ ) # define E_( function ) function # define __VLC_SYMBOL( symbol ) CONCATENATE( symbol, MODULE_SYMBOL ) -# define DECLARE_SYMBOLS module_symbols_t* p_symbols; -# define STORE_SYMBOLS p_symbols = p_module->p_symbols; +# define DECLARE_SYMBOLS module_symbols_t* p_symbols +# define STORE_SYMBOLS p_symbols = p_module->p_symbols +#endif + +#if defined( __PLUGIN__ ) && ( defined( WIN32 ) || defined( UNDER_CE ) ) +# define DLL_SYMBOL __declspec(dllexport) +# define CDECL_SYMBOL __cdecl +#else +# define DLL_SYMBOL +# define CDECL_SYMBOL #endif #if defined( __cplusplus ) @@ -80,12 +88,15 @@ */ #define vlc_module_begin( ) \ DECLARE_SYMBOLS; \ - EXTERN_SYMBOL int __VLC_SYMBOL(vlc_entry) ( module_t *p_module ) \ + EXTERN_SYMBOL DLL_SYMBOL int CDECL_SYMBOL \ + __VLC_SYMBOL(vlc_entry) ( module_t *p_module ) \ { \ int i_shortcut = 1, i_config = 0; \ module_config_t p_config[ 100 ]; \ STORE_SYMBOLS; \ p_module->b_submodule = VLC_FALSE; \ + p_module->b_unloadable = VLC_TRUE; \ + p_module->b_reentrant = VLC_TRUE; \ p_module->psz_object_name = MODULE_STRING; \ p_module->psz_longname = MODULE_STRING; \ p_module->pp_shortcuts[ 0 ] = MODULE_STRING; \ @@ -102,38 +113,43 @@ p_submodule->pp_shortcuts[ i_shortcut ] = NULL; \ } \ { \ - module_config_t tmp = { CONFIG_HINT_END, NULL, NULL, '\0' }; \ + static module_config_t tmp = { CONFIG_HINT_END, NULL, NULL, '\0', \ + NULL, NULL, NULL, 0, 0.0, 0, 0, \ + 0.0, 0.0, NULL,NULL, NULL, \ + VLC_FALSE }; \ p_config[ i_config ] = tmp; \ } \ config_Duplicate( p_module, p_config ); \ if( p_module->p_config == NULL ) \ { \ - return -1; \ + return VLC_EGENERIC; \ } \ - return 0 && i_shortcut; \ + return VLC_SUCCESS && i_shortcut; \ } \ - int __VLC_SYMBOL(vlc_entry) ( module_t * ) /* the ; gets added */ + struct _u_n_u_s_e_d_ /* the ; gets added */ #define add_submodule( ) \ - p_submodule->pp_shortcuts[ i_shortcut ] = NULL; \ - p_submodule = (module_t *)vlc_object_create( p_module, VLC_OBJECT_MODULE );\ + p_submodule->pp_shortcuts[ i_shortcut ] = NULL; \ + p_submodule = \ + (module_t *)vlc_object_create( p_module, VLC_OBJECT_MODULE ); \ vlc_object_attach( p_submodule, p_module ); \ p_submodule->b_submodule = VLC_TRUE; \ /* Nuahahaha! Heritage! Polymorphism! Ugliness!! */ \ for( i_shortcut = 0; p_module->pp_shortcuts[ i_shortcut ]; i_shortcut++ ) \ { \ p_submodule->pp_shortcuts[ i_shortcut ] = \ - p_module->pp_shortcuts[ i_shortcut ]; \ + p_module->pp_shortcuts[ i_shortcut ]; \ } \ p_submodule->psz_object_name = p_module->psz_object_name; \ + p_submodule->psz_longname = p_module->psz_longname; \ p_submodule->psz_program = p_module->psz_program; \ p_submodule->psz_capability = p_module->psz_capability; \ p_submodule->i_score = p_module->i_score; \ p_submodule->i_cpu = p_module->i_cpu; \ - p_submodule->pf_activate = NULL; \ + p_submodule->pf_activate = NULL; \ p_submodule->pf_deactivate = NULL - + #define add_requirement( cap ) \ p_module->i_cpu |= CPU_CAPABILITY_##cap @@ -142,7 +158,7 @@ i_shortcut++ #define set_description( desc ) \ - p_module->psz_longname = desc + p_submodule->psz_longname = desc #define set_capability( cap, score ) \ p_submodule->psz_capability = cap; \ @@ -155,36 +171,6 @@ p_submodule->pf_activate = activate; \ p_submodule->pf_deactivate = deactivate -/* - * module_activate: this function is called before functions can be accessed, - * we do allocation tasks here, and maybe additional stuff such as large - * table allocation. Once ActivateModule is called we are almost sure the - * module will be used. - */ -#define module_activate( prototype ) \ - __module_activate( prototype ); \ - int __VLC_SYMBOL( module_activate ) ( module_t *p_module ) \ - { \ - STORE_SYMBOLS; \ - config_SetCallbacks( p_module->p_config, p_config ); \ - return __module_activate( p_module ); \ - } \ - \ - static int __module_activate( prototype ) - -/* - * DeactivateModule: this function is called after we are finished with the - * module. Everything that has been done in ActivateModule needs to be undone - * here. - */ -#define module_deactivate( prototype ) \ - __module_deactivate( prototype ); \ - int __VLC_SYMBOL( module_deactivate )( module_t *p_module ) \ - { \ - int i_ret = __module_deactivate( p_module ); \ - config_UnsetCallbacks( p_module->p_config ); \ - return i_ret; \ - } \ - \ - static int __module_deactivate( prototype ) +#define linked_with_a_crap_library_which_uses_atexit( ) \ + p_module->b_unloadable = VLC_FALSE