/*****************************************************************************
* modules_inner.h : Macros used from within a module.
*****************************************************************************
- * Copyright (C) 2001 VideoLAN
- * $Id: modules_inner.h,v 1.23 2002/06/01 12:31:57 sam Exp $
+ * Copyright (C) 2001 the VideoLAN team
+ * $Id$
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
* 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
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
#define UGLY_KLUDGE( z ) #z
/* And I need to do _this_ to change « foo bar » to « module_foo_bar » ! */
#define CONCATENATE( y, z ) CRUDE_HACK( y, z )
-#define CRUDE_HACK( y, z ) y##__MODULE_##z
+#define CRUDE_HACK( y, z ) y##__##z
/* If the module is built-in, then we need to define foo_InitModule instead
* of InitModule. Same for Activate- and DeactivateModule. */
#if defined( __BUILTIN__ )
-# define _M( function ) CONCATENATE( function, MODULE_NAME )
+# 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 _M( function ) function
+# define E_( function ) CONCATENATE( function, MODULE_SYMBOL )
# 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 )
+# define EXTERN_SYMBOL extern "C"
+#else
+# define EXTERN_SYMBOL
+#endif
+
+#if defined( USE_DLL )
+# define IMPORT_SYMBOL __declspec(dllimport)
+#else
+# define IMPORT_SYMBOL
#endif
#define MODULE_STRING STRINGIFY( MODULE_NAME )
* instance the module name, its shortcuts, its capabilities... we also create
* a copy of its config because the module can be unloaded at any time.
*/
-#define MODULE_INIT_START \
+#define vlc_module_begin( ) \
DECLARE_SYMBOLS; \
- int __VLC_SYMBOL( InitModule ) ( module_t *p_module ) \
+ EXTERN_SYMBOL DLL_SYMBOL int CDECL_SYMBOL \
+ __VLC_SYMBOL(vlc_entry) ( module_t *p_module ) \
{ \
- int i_shortcut = 1; \
+ int i_shortcut = 1, i_config = -1; \
+ module_config_t *p_config = NULL; \
+ static module_config_t config_end = {CONFIG_HINT_END}; \
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_shortname = NULL; \
p_module->psz_longname = MODULE_STRING; \
- p_module->psz_program = NULL; \
p_module->pp_shortcuts[ 0 ] = MODULE_STRING; \
- p_module->i_capabilities = 0; \
- p_module->i_cpu_capabilities = 0; \
- do {
-
-#define MODULE_INIT_STOP \
- } while( 0 ); \
- p_module->pp_shortcuts[ i_shortcut ] = NULL; \
- config_Duplicate( p_module, p_config ); \
- if( p_module->p_config == NULL ) \
+ p_module->i_cpu = 0; \
+ p_module->psz_program = NULL; \
+ p_module->psz_capability = ""; \
+ p_module->i_score = 1; \
+ p_module->pf_activate = NULL; \
+ p_module->pf_deactivate = NULL; \
{ \
-/*//X intf_Err( p_module, "InitModule can't duplicate p_config" );*/ \
- return -1; \
- } \
- return 0; \
- }
-
-#define ADD_CAPABILITY( cap, score ) \
- p_module->i_capabilities |= 1 << MODULE_CAPABILITY_##cap; \
- p_module->pi_score[ MODULE_CAPABILITY_##cap ] = score;
-
-#define ADD_REQUIREMENT( cap ) \
- p_module->i_cpu_capabilities |= CPU_CAPABILITY_##cap;
-
-#define ADD_PROGRAM( program ) \
- p_module->psz_program = program;
-
-#define ADD_SHORTCUT( shortcut ) \
- p_module->pp_shortcuts[ i_shortcut ] = shortcut; \
- i_shortcut++;
+ module_t *p_submodule = p_module /* the ; gets added */
-#define SET_DESCRIPTION( desc ) \
- p_module->psz_longname = desc;
-
-/*
- * ActivateModule: 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_START \
- int __VLC_SYMBOL( ActivateModule ) ( module_t *p_module ) \
- { \
- STORE_SYMBOLS; \
- p_module->p_functions = \
- ( module_functions_t * )malloc( sizeof( module_functions_t ) ); \
- if( p_module->p_functions == NULL ) \
+#define vlc_module_end( ) \
+ p_submodule->pp_shortcuts[ i_shortcut ] = NULL; \
+ } \
+ if( p_config ) \
{ \
- return( -1 ); \
+ p_config[ ++i_config ] = config_end; \
+ config_Duplicate( p_module, p_config ); \
+ free( p_config ); \
} \
- config_SetCallbacks( p_module->p_config, p_config ); \
- do {
-
-#define MODULE_ACTIVATE_STOP \
- } while( 0 ); \
- return 0; \
- }
-
-/*
- * 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_START \
- int __VLC_SYMBOL( DeactivateModule )( module_t *p_module ) \
+ else config_Duplicate( p_module, &config_end ); \
+ if( p_module->p_config == NULL ) \
+ { \
+ return VLC_EGENERIC; \
+ } \
+ return VLC_SUCCESS && i_shortcut; \
+ } \
+ 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 ); \
+ 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++ ) \
{ \
- free( p_module->p_functions ); \
- do {
-
-#define MODULE_DEACTIVATE_STOP \
- } while( 0 ); \
- config_UnsetCallbacks( p_module->p_config ); \
- return 0; \
- }
+ p_submodule->pp_shortcuts[ i_shortcut ] = \
+ p_module->pp_shortcuts[ i_shortcut ]; \
+ } \
+ p_submodule->psz_object_name = p_module->psz_object_name; \
+ p_submodule->psz_shortname = p_module->psz_shortname; \
+ 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_deactivate = NULL
+
+#define add_requirement( cap ) \
+ p_module->i_cpu |= CPU_CAPABILITY_##cap
+
+#define add_shortcut( shortcut ) \
+ p_submodule->pp_shortcuts[ i_shortcut ] = shortcut; \
+ i_shortcut++
+
+#define set_shortname( desc ) \
+ p_submodule->psz_shortname = desc
+
+#define set_description( desc ) \
+ p_submodule->psz_longname = desc
+
+#define set_capability( cap, score ) \
+ p_submodule->psz_capability = cap; \
+ p_submodule->i_score = score
+
+#define set_program( program ) \
+ p_submodule->psz_program = program
+
+#define set_callbacks( activate, deactivate ) \
+ p_submodule->pf_activate = activate; \
+ p_submodule->pf_deactivate = deactivate
+
+#define linked_with_a_crap_library_which_uses_atexit( ) \
+ p_module->b_unloadable = VLC_FALSE
+