git.videolan.org
/
vlc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Increase plugin cache version to force stalling.
[vlc.git]
/
src
/
modules
/
modules.c
diff --git
a/src/modules/modules.c
b/src/modules/modules.c
index
9e426c6
..
274807a
100644
(file)
--- a/
src/modules/modules.c
+++ b/
src/modules/modules.c
@@
-157,7
+157,7
@@
static void module_LoadMain( vlc_object_t *p_this );
/* Sub-version number
* (only used to avoid breakage in dev version when cache structure changes) */
/* Sub-version number
* (only used to avoid breakage in dev version when cache structure changes) */
-#define CACHE_SUBVERSION_NUM
2
+#define CACHE_SUBVERSION_NUM
3
/*****************************************************************************
* module_InitBank: create the module bank.
/*****************************************************************************
* module_InitBank: create the module bank.
@@
-1119,7
+1119,7
@@
static module_t * AllocatePlugin( vlc_object_t * p_this, char * psz_file )
/* Now that we have successfully loaded the module, we can
* allocate a structure for it */
/* Now that we have successfully loaded the module, we can
* allocate a structure for it */
- p_module = vlc_
object_create( p_this, VLC_OBJECT_MODULE
);
+ p_module = vlc_
module_create( p_this
);
if( p_module == NULL )
{
msg_Err( p_this, "out of memory" );
if( p_module == NULL )
{
msg_Err( p_this, "out of memory" );
@@
-1130,9
+1130,6
@@
static module_t * AllocatePlugin( vlc_object_t * p_this, char * psz_file )
/* We need to fill these since they may be needed by CallEntry() */
p_module->psz_filename = psz_file;
p_module->handle = handle;
/* We need to fill these since they may be needed by CallEntry() */
p_module->psz_filename = psz_file;
p_module->handle = handle;
-#ifndef HAVE_SHARED_LIBVLC
- p_module->p_symbols = &p_this->p_libvlc_global->p_module_bank->symbols;
-#endif
p_module->b_loaded = VLC_TRUE;
/* Initialize the module: fill p_module, default config */
p_module->b_loaded = VLC_TRUE;
/* Initialize the module: fill p_module, default config */
@@
-1234,7
+1231,7
@@
static int AllocateBuiltinModule( vlc_object_t * p_this,
/* Now that we have successfully loaded the module, we can
* allocate a structure for it */
/* Now that we have successfully loaded the module, we can
* allocate a structure for it */
- p_module = vlc_
object_create( p_this, VLC_OBJECT_MODULE
);
+ p_module = vlc_
module_create( p_this
);
if( p_module == NULL )
{
msg_Err( p_this, "out of memory" );
if( p_module == NULL )
{
msg_Err( p_this, "out of memory" );
@@
-1788,7
+1785,7
@@
static void CacheLoad( vlc_object_t *p_this )
if( pp_cache[i]->b_junk ) continue;
if( pp_cache[i]->b_junk ) continue;
- pp_cache[i]->p_module = vlc_
object_create( p_this, VLC_OBJECT_MODULE
);
+ pp_cache[i]->p_module = vlc_
module_create( p_this
);
/* Load additional infos */
LOAD_STRING( pp_cache[i]->p_module->psz_object_name );
/* Load additional infos */
LOAD_STRING( pp_cache[i]->p_module->psz_object_name );
@@
-1817,10
+1814,7
@@
static void CacheLoad( vlc_object_t *p_this )
while( i_submodules-- )
{
while( i_submodules-- )
{
- module_t *p_module = vlc_object_create( p_this, VLC_OBJECT_MODULE);
- vlc_object_attach( p_module, pp_cache[i]->p_module );
- p_module->b_submodule = VLC_TRUE;
-
+ module_t *p_module = vlc_submodule_create( pp_cache[i]->p_module );
LOAD_STRING( p_module->psz_object_name );
LOAD_STRING( p_module->psz_shortname );
LOAD_STRING( p_module->psz_longname );
LOAD_STRING( p_module->psz_object_name );
LOAD_STRING( p_module->psz_shortname );
LOAD_STRING( p_module->psz_longname );