* modules.c : Builtin and plugin modules management functions
*****************************************************************************
* Copyright (C) 2001 VideoLAN
- * $Id: modules.c,v 1.75 2002/07/31 20:56:53 sam Exp $
+ * $Id: modules.c,v 1.123 2003/06/26 12:19:59 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Ethan C. Baldridge <BaldridgeE@cadmus.com>
#include <vlc/vlc.h>
-#include <dirent.h>
+#ifdef HAVE_DIRENT_H
+# include <dirent.h>
+#elif defined( UNDER_CE )
+# include <windows.h> /* GetFileAttributes() */
+#else
+# include "../extras/dirent.h"
+#endif
+
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
#if defined(HAVE_DLFCN_H) /* Linux, BSD, Hurd */
# include <dlfcn.h> /* dlopen(), dlsym(), dlclose() */
#elif defined(HAVE_IMAGE_H) /* BeOS */
# include <image.h>
# define HAVE_DYNAMIC_PLUGINS
+#elif defined(UNDER_CE)
+# define HAVE_DYNAMIC_PLUGINS
#elif defined(WIN32)
# define HAVE_DYNAMIC_PLUGINS
#else
# undef HAVE_DYNAMIC_PLUGINS
#endif
+#include "error.h"
-#include "netutils.h"
-
-#include "interface.h"
+#include "vlc_interface.h"
#include "vlc_playlist.h"
#include "intf_eject.h"
#include "input_ext-dec.h"
#include "input_ext-plugins.h"
-#include "video.h"
+#include "vlc_video.h"
#include "video_output.h"
+#include "vout_synchro.h"
#include "audio_output.h"
+#include "aout_internal.h"
+
+#include "stream_output.h"
+#include "announce.h"
#include "iso_lang.h"
+#if defined( UNDER_CE )
+# define MYCHAR wchar_t
+#else
+# define MYCHAR char
+#endif
+
#ifdef HAVE_DYNAMIC_PLUGINS
# include "modules_plugin.h"
#endif
-#if !defined( _MSC_VER )
-# include "modules_builtin.h"
-#else
+#if defined( UNDER_CE )
+# include "modules_builtin_evc.h"
+#elif defined( _MSC_VER )
# include "modules_builtin_msvc.h"
+#else
+# include "modules_builtin.h"
#endif
/*****************************************************************************
*****************************************************************************/
#ifdef HAVE_DYNAMIC_PLUGINS
static void AllocateAllPlugins ( vlc_object_t * );
-static int AllocatePluginModule ( vlc_object_t *, char * );
+static void AllocatePluginDir ( vlc_object_t *, const MYCHAR *, int );
+static int AllocatePluginFile ( vlc_object_t *, MYCHAR * );
#endif
static int AllocateBuiltinModule( vlc_object_t *, int ( * ) ( module_t * ) );
static int DeleteModule ( module_t * );
-static int LockModule ( module_t * );
-static int UnlockModule ( module_t * );
#ifdef HAVE_DYNAMIC_PLUGINS
-static int HideModule ( module_t * );
static void DupModule ( module_t * );
static void UndupModule ( module_t * );
static int CallEntry ( module_t * );
p_bank = vlc_object_create( p_this, sizeof(module_bank_t) );
p_bank->psz_object_name = "module bank";
- p_bank->first = NULL;
- p_bank->i_count = 0;
- vlc_mutex_init( p_this, &p_bank->lock );
-
/*
* Store the symbols to be exported
*/
#endif
/* Everything worked, attach the object */
- p_this->p_vlc->p_module_bank = p_bank;
- vlc_object_attach( p_bank, p_this->p_vlc );
+ p_this->p_libvlc->p_module_bank = p_bank;
+ vlc_object_attach( p_bank, p_this->p_libvlc );
return;
}
{
module_t * p_next;
- vlc_object_detach_all( p_this->p_vlc->p_module_bank );
+ vlc_object_detach( p_this->p_libvlc->p_module_bank );
- while( p_this->p_vlc->p_module_bank->first != NULL )
+ while( p_this->p_libvlc->p_module_bank->i_children )
{
- if( DeleteModule( p_this->p_vlc->p_module_bank->first ) )
+ p_next = (module_t *)p_this->p_libvlc->p_module_bank->pp_children[0];
+
+ if( DeleteModule( p_next ) )
{
/* Module deletion failed */
msg_Err( p_this, "module \"%s\" can't be removed, trying harder",
- p_this->p_vlc->p_module_bank->first->psz_object_name );
+ p_next->psz_object_name );
/* We just free the module by hand. Niahahahahaha. */
- p_next = p_this->p_vlc->p_module_bank->first->next;
- free( p_this->p_vlc->p_module_bank->first );
- p_this->p_vlc->p_module_bank->first = p_next;
+ vlc_object_detach( p_next );
+ vlc_object_destroy( p_next );
}
}
- /* Destroy the lock */
- vlc_mutex_destroy( &p_this->p_vlc->p_module_bank->lock );
-
- vlc_object_destroy( p_this->p_vlc->p_module_bank );
+ vlc_object_destroy( p_this->p_libvlc->p_module_bank );
return;
}
#endif
}
-/*****************************************************************************
- * module_ManageBank: manage the module bank.
- *****************************************************************************
- * This function parses the module bank and hides modules that have been
- * unused for a while.
- *****************************************************************************/
-void __module_ManageBank( vlc_object_t *p_this )
-{
-#ifdef HAVE_DYNAMIC_PLUGINS
- module_t * p_module;
-
- /* We take the global lock */
- vlc_mutex_lock( &p_this->p_vlc->p_module_bank->lock );
-
- /* Parse the module list to see if any modules need to be unloaded */
- for( p_module = p_this->p_vlc->p_module_bank->first ;
- p_module != NULL ;
- p_module = p_module->next )
- {
- /* If the module is unused and if it is a plugin module... */
- if( p_module->i_usage == 0 && !p_module->b_builtin )
- {
- if( p_module->i_unused_delay < MODULE_HIDE_DELAY )
- {
- p_module->i_unused_delay++;
- }
- else
- {
- msg_Dbg( p_this, "hiding unused plugin module \"%s\"",
- p_module->psz_object_name );
- HideModule( p_module );
-
- /* Break here, so that we only hide one module at a time */
- break;
- }
- }
- }
-
- /* We release the global lock */
- vlc_mutex_unlock( &p_this->p_vlc->p_module_bank->lock );
-#endif /* HAVE_DYNAMIC_PLUGINS */
-
- return;
-}
-
/*****************************************************************************
* module_Need: return the best module function, given a capability list.
*****************************************************************************
};
module_list_t *p_list, *p_first, *p_tmp;
+ vlc_list_t *p_all;
- int i_index = 0;
+ int i_which_module, i_index = 0;
vlc_bool_t b_intf = VLC_FALSE;
module_t *p_module;
int i_shortcuts = 0;
- char *psz_shortcuts = NULL;
+ char *psz_shortcuts = NULL, *psz_var = NULL;
msg_Dbg( p_this, "looking for %s module", psz_capability );
+ /* Deal with variables */
+ if( psz_name && psz_name[0] == '$' )
+ {
+ psz_var = config_GetPsz( p_this, psz_name + 1 );
+ psz_name = psz_var;
+ }
+
/* Count how many different shortcuts were asked for */
if( psz_name && *psz_name )
{
/* If the user wants none, give him none. */
if( !strcmp( psz_name, "none" ) )
{
+ if( psz_var ) free( psz_var );
return NULL;
}
}
}
- /* We take the global lock */
- vlc_mutex_lock( &p_this->p_vlc->p_module_bank->lock );
-
/* Sort the modules and test them */
- p_list = malloc( p_this->p_vlc->p_module_bank->i_count
- * sizeof( module_list_t ) );
+ p_all = vlc_list_find( p_this, VLC_OBJECT_MODULE, FIND_ANYWHERE );
+ p_list = malloc( p_all->i_count * sizeof( module_list_t ) );
p_first = NULL;
/* Parse the module list for capabilities and probe each of them */
- for( p_module = p_this->p_vlc->p_module_bank->first ;
- p_module != NULL ;
- p_module = p_module->next )
+ for( i_which_module = 0; i_which_module < p_all->i_count; i_which_module++ )
{
module_t * p_submodule = NULL;
int i_shortcut_bonus = 0, i_submodule;
+ p_module = (module_t *)p_all->p_values[i_which_module].p_object;
+
/* Test that this module can do what we need */
if( strcmp( p_module->psz_capability, psz_capability ) )
{
{
p_submodule =
(module_t*)p_module->pp_children[ i_submodule ];
- p_submodule->next = p_module->next;
break;
}
}
}
/* Test if we have the required CPU */
- if( (p_module->i_cpu & p_this->p_vlc->i_cpu) != p_module->i_cpu )
+ if( (p_module->i_cpu & p_this->p_libvlc->i_cpu) != p_module->i_cpu )
{
continue;
}
/* If we required a shortcut, check this plugin provides it. */
if( i_shortcuts )
{
- vlc_bool_t b_trash = VLC_TRUE;
+ vlc_bool_t b_trash;
int i_dummy, i_short = i_shortcuts;
char *psz_name = psz_shortcuts;
+ /* Let's drop modules with a 0 score (unless they are
+ * explicitly requested) */
+ b_trash = !p_module->i_score;
+
while( i_short )
{
- for( i_dummy = 0;
- b_trash && p_module->pp_shortcuts[i_dummy];
- i_dummy++ )
+ /* If the last given shortcut is "none" and we couldn't
+ * find the module in the list of provided shortcuts,
+ * then kick the bastard out of here!!! */
+ if( (i_short == 1) && !strcmp(psz_name, "none") )
+ {
+ b_trash = VLC_TRUE;
+ break;
+ }
+
+ for( i_dummy = 0; p_module->pp_shortcuts[i_dummy]; i_dummy++ )
{
- b_trash = ( strcmp(psz_name, "any") || !p_module->i_score )
- && strcmp( psz_name, p_module->pp_shortcuts[i_dummy] );
+ if( !strcmp( psz_name,
+ p_module->pp_shortcuts[i_dummy] ) )
+ {
+ /* Found it */
+ b_trash = VLC_FALSE;
+ i_shortcut_bonus = i_short * 10000;
+ break;
+ }
}
- if( !b_trash )
+ if( i_shortcut_bonus )
{
- i_shortcut_bonus = i_short * 10000;
+ /* We found it... remember ? */
break;
}
&& !strcmp( p_module->psz_program,
p_this->p_vlc->psz_object_name ) )
{
- if( !b_intf )
+ if( !b_intf )
{
/* Remove previous non-matching plugins */
i_index = 0;
msg_Dbg( p_this, "probing %i candidate%s",
i_index, i_index == 1 ? "" : "s" );
- /* Lock all selected modules */
+ /* Lock all candidate modules */
p_tmp = p_first;
while( p_tmp != NULL )
{
- LockModule( p_tmp->p_module );
+ vlc_object_yield( p_tmp->p_module );
p_tmp = p_tmp->p_next;
}
- /* We can release the global lock, module refcounts were incremented */
- vlc_mutex_unlock( &p_this->p_vlc->p_module_bank->lock );
+ /* We can release the list, interesting modules were yielded */
+ vlc_list_release( p_all );
/* Parse the linked list and use the first successful module */
p_tmp = p_first;
break;
}
- UnlockModule( p_tmp->p_module );
+ vlc_object_release( p_tmp->p_module );
p_tmp = p_tmp->p_next;
}
/* Unlock the remaining modules */
while( p_tmp != NULL )
{
- UnlockModule( p_tmp->p_module );
+ vlc_object_release( p_tmp->p_module );
p_tmp = p_tmp->p_next;
}
if( p_module != NULL )
{
- msg_Info( p_module, "using %s module \"%s\"",
- psz_capability, p_module->psz_object_name );
+ msg_Dbg( p_module, "using %s module \"%s\"",
+ psz_capability, p_module->psz_object_name );
}
else if( p_first == NULL )
{
}
else if( psz_name != NULL && *psz_name )
{
- msg_Err( p_this, "no %s module matching \"%s\" could be loaded",
- psz_capability, (psz_name && *psz_name) ? psz_name : "any" );
+ msg_Warn( p_this, "no %s module matching \"%s\" could be loaded",
+ psz_capability, (psz_name && *psz_name) ? psz_name : "any" );
}
if( psz_shortcuts )
free( psz_shortcuts );
}
+ if( psz_var )
+ {
+ free( psz_var );
+ }
+
/* Don't forget that the module is still locked */
return p_module;
}
p_module->pf_deactivate( p_this );
}
- /* We take the global lock */
- vlc_mutex_lock( &p_module->p_vlc->p_module_bank->lock );
+ msg_Dbg( p_module, "unlocking module \"%s\"", p_module->psz_object_name );
- /* Just unlock the module - we can't do anything if it fails,
- * so there is no need to check the return value. */
- UnlockModule( p_module );
-
- msg_Info( p_module, "unlocking module \"%s\"", p_module->psz_object_name );
-
- /* We release the global lock */
- vlc_mutex_unlock( &p_module->p_vlc->p_module_bank->lock );
+ vlc_object_release( p_module );
return;
}
static void AllocateAllPlugins( vlc_object_t *p_this )
{
/* Yes, there are two NULLs because we replace one with "plugin-path". */
- char * path[] = { "plugins", PLUGIN_PATH, NULL, NULL };
+ char * path[] = { "modules", PLUGIN_PATH, "plugins", NULL,
+ NULL };
char ** ppsz_path = path;
char * psz_fullpath;
- char * psz_file;
-#if defined( SYS_BEOS ) || defined( SYS_DARWIN )
- char * psz_vlcpath = system_GetProgramPath();
- int i_vlclen = strlen( psz_vlcpath );
+#if defined( SYS_BEOS ) || defined( SYS_DARWIN ) \
+ || ( defined( WIN32 ) && !defined( UNDER_CE ) )
+ int i_vlclen = strlen( p_this->p_libvlc->psz_vlcpath );
vlc_bool_t b_notinroot;
#endif
- DIR * dir;
- struct dirent * file;
+
+#if defined( UNDER_CE )
+ wchar_t psz_dir[MAX_PATH];
+#endif
/* If the user provided a plugin path, we add it to the list */
path[ sizeof(path)/sizeof(char*) - 2 ] = config_GetPsz( p_this,
"plugin-path" );
+#if defined( WIN32 ) && !defined( UNDER_CE ) && !defined( _MSC_VER )
+ /* If there is no 'plugins' nor 'modules' subdirectory, the user may have
+ * screwed up the unzipping stage, so we look into '.' instead */
+ if( !opendir( "plugins" ) && !opendir( "modules" )
+ && !strcmp( *ppsz_path, "modules" ) )
+ {
+ *ppsz_path = ".";
+ }
+#endif
+
for( ; *ppsz_path != NULL ; ppsz_path++ )
{
+#if defined( SYS_BEOS ) || defined( SYS_DARWIN ) \
+ || ( defined( WIN32 ) && !defined( UNDER_CE ) )
/* Store strlen(*ppsz_path) for later use. */
int i_dirlen = strlen( *ppsz_path );
-#if defined( SYS_BEOS ) || defined( SYS_DARWIN )
b_notinroot = VLC_FALSE;
/* Under BeOS, we need to add beos_GetProgramPath() to access
* files under the current directory */
- if( ( i_dirlen > 1 ) && strncmp( *ppsz_path, "/", 1 ) )
+#ifdef WIN32
+ if( i_dirlen < 3 || (*ppsz_path)[3] != '\\' )
+#else
+ if( (*ppsz_path)[0] != '/' )
+#endif
{
i_dirlen += i_vlclen + 2;
b_notinroot = VLC_TRUE;
{
continue;
}
- sprintf( psz_fullpath, "%s/%s", psz_vlcpath, *ppsz_path );
+#ifdef WIN32
+ sprintf( psz_fullpath, "%s\\%s",
+ p_this->p_libvlc->psz_vlcpath, *ppsz_path );
+#else
+ sprintf( psz_fullpath, "%s/%s",
+ p_this->p_libvlc->psz_vlcpath, *ppsz_path );
+#endif
}
else
#endif
psz_fullpath = *ppsz_path;
}
- msg_Dbg( p_this, "browsing `%s'", psz_fullpath );
+ msg_Dbg( p_this, "recursively browsing `%s'", psz_fullpath );
- if( (dir = opendir( psz_fullpath )) )
+ /* Don't go deeper than 5 subdirectories */
+#if defined( UNDER_CE )
+ MultiByteToWideChar( CP_ACP, 0, psz_fullpath, -1, psz_dir, MAX_PATH );
+ AllocatePluginDir( p_this, psz_dir, 5 );
+#else
+ AllocatePluginDir( p_this, psz_fullpath, 5 );
+#endif
+
+#if defined( SYS_BEOS ) || defined( SYS_DARWIN )
+ if( b_notinroot )
{
- /* Parse the directory and try to load all files it contains. */
- while( (file = readdir( dir )) )
- {
- int i_filelen = strlen( file->d_name );
+ free( psz_fullpath );
+ }
+#endif
+ }
- /* We only load files ending with ".so" */
- if( i_filelen > 3
- && !strncmp( file->d_name + i_filelen - 3, ".so", 3 ) )
- {
- psz_file = malloc( i_dirlen + i_filelen + 2 );
- if( psz_file == NULL )
- {
- continue;
- }
- sprintf( psz_file, "%s/%s", psz_fullpath, file->d_name );
+ /* Free plugin-path */
+ if( path[ sizeof(path)/sizeof(char*) - 2 ] )
+ free( path[ sizeof(path)/sizeof(char*) - 2 ] );
+ path[ sizeof(path)/sizeof(char*) - 2 ] = NULL;
+}
- /* We created a nice filename -- now we just try to load
- * it as a plugin module. */
- AllocatePluginModule( p_this, psz_file );
+/*****************************************************************************
+ * AllocatePluginDir: recursively parse a directory to look for plugins
+ *****************************************************************************/
+static void AllocatePluginDir( vlc_object_t *p_this, const MYCHAR *psz_dir,
+ int i_maxdepth )
+{
+#if defined( UNDER_CE ) || defined( _MSC_VER )
+#ifdef UNDER_CE
+ MYCHAR psz_path[MAX_PATH + 256];
+#else
+ char psz_path[MAX_PATH + 256];
+#endif
+ WIN32_FIND_DATA finddata;
+ HANDLE handle;
+ unsigned int rc;
+#else
+ int i_dirlen;
+ DIR * dir;
+ char * psz_file;
+ struct dirent * file;
+#endif
- /* We don't care if the allocation succeeded */
- free( psz_file );
- }
- }
+ if( i_maxdepth < 0 )
+ {
+ return;
+ }
+
+#if defined( UNDER_CE ) || defined( _MSC_VER )
+ rc = GetFileAttributes( psz_dir );
+ if( !(rc & FILE_ATTRIBUTE_DIRECTORY) )
+ {
+ /* Not a directory */
+ return;
+ }
+
+ /* Parse all files in the directory */
+#ifdef UNDER_CE
+ swprintf( psz_path, L"%s\\*.*", psz_dir );
+#else
+ sprintf( psz_path, "%s\\*.*", psz_dir );
+#endif
+ handle = FindFirstFile( psz_path, &finddata );
+ if( handle == INVALID_HANDLE_VALUE )
+ {
+ /* Empty directory */
+ return;
+ }
- /* Close the directory if successfully opened */
- closedir( dir );
+ /* Parse the directory and try to load all files it contains. */
+ do
+ {
+#ifdef UNDER_CE
+ unsigned int i_len = wcslen( finddata.cFileName );
+ swprintf( psz_path, L"%s\\%s", psz_dir, finddata.cFileName );
+#else
+ unsigned int i_len = strlen( finddata.cFileName );
+ /* Skip ".", ".." and anything starting with "." */
+ if( !*finddata.cFileName || *finddata.cFileName == '.' )
+ {
+ if( !FindNextFile( handle, &finddata ) ) break;
+ continue;
}
+ sprintf( psz_path, "%s\\%s", psz_dir, finddata.cFileName );
+#endif
-#if defined( SYS_BEOS ) || defined( SYS_DARWIN )
- if( b_notinroot )
+ if( GetFileAttributes( psz_path ) & FILE_ATTRIBUTE_DIRECTORY )
{
- free( psz_fullpath );
+ AllocatePluginDir( p_this, psz_path, i_maxdepth - 1 );
+ }
+ else if( i_len > strlen( LIBEXT )
+#ifdef UNDER_CE
+ )
+#else
+ /* We only load files ending with LIBEXT */
+ && !strncasecmp( psz_path + strlen( psz_path)
+ - strlen( LIBEXT ),
+ LIBEXT, strlen( LIBEXT ) ) )
+#endif
+ {
+ AllocatePluginFile( p_this, psz_path );
+ }
+ }
+ while( FindNextFile( handle, &finddata ) );
+
+ /* Close the directory */
+ FindClose( handle );
+
+#else
+ dir = opendir( psz_dir );
+ if( !dir )
+ {
+ return;
+ }
+
+ i_dirlen = strlen( psz_dir );
+
+ /* Parse the directory and try to load all files it contains. */
+ while( (file = readdir( dir )) )
+ {
+ struct stat statbuf;
+ unsigned int i_len;
+
+ /* Skip ".", ".." and anything starting with "." */
+ if( !*file->d_name || *file->d_name == '.' )
+ {
+ continue;
}
+
+ i_len = strlen( file->d_name );
+ psz_file = malloc( i_dirlen + 1 + i_len + 1 );
+#ifdef WIN32
+ sprintf( psz_file, "%s\\%s", psz_dir, file->d_name );
+#else
+ sprintf( psz_file, "%s/%s", psz_dir, file->d_name );
#endif
+
+ if( !stat( psz_file, &statbuf ) && statbuf.st_mode & S_IFDIR )
+ {
+ AllocatePluginDir( p_this, psz_file, i_maxdepth - 1 );
+ }
+ else if( i_len > strlen( LIBEXT )
+ /* We only load files ending with LIBEXT */
+ && !strncasecmp( file->d_name + i_len - strlen( LIBEXT ),
+ LIBEXT, strlen( LIBEXT ) ) )
+ {
+ AllocatePluginFile( p_this, psz_file );
+ }
+
+ free( psz_file );
}
+
+ /* Close the directory */
+ closedir( dir );
+
+#endif
}
/*****************************************************************************
- * AllocatePluginModule: load a module into memory and initialize it.
+ * AllocatePluginFile: load a module into memory and initialize it.
*****************************************************************************
* This function loads a dynamically loadable module and allocates a structure
- * for its information data. The module can then be handled by module_Need,
- * module_Unneed and HideModule. It can be removed by DeleteModule.
+ * for its information data. The module can then be handled by module_Need
+ * and module_Unneed. It can be removed by DeleteModule.
*****************************************************************************/
-static int AllocatePluginModule( vlc_object_t * p_this, char * psz_filename )
+static int AllocatePluginFile( vlc_object_t * p_this, MYCHAR * psz_file )
{
module_t * p_module;
module_handle_t handle;
+#ifdef UNDER_CE
+ char psz_filename[MAX_PATH];
+ WideCharToMultiByte( CP_ACP, WC_DEFAULTCHAR, psz_file, -1,
+ psz_filename, MAX_PATH, NULL, NULL );
+#else
+ char * psz_filename = psz_file;
+#endif
+
/* Try to dynamically load the module. */
- if( module_load( psz_filename, &handle ) )
+ if( module_load( psz_file, &handle ) )
{
char psz_buffer[256];
}
/* Now that we have successfully loaded the module, we can
- * allocate a structure for it */
+ * allocate a structure for it */
p_module = vlc_object_create( p_this, VLC_OBJECT_MODULE );
if( p_module == NULL )
{
/* We need to fill these since they may be needed by CallEntry() */
p_module->psz_filename = psz_filename;
p_module->handle = handle;
- p_module->p_symbols = &p_this->p_vlc->p_module_bank->symbols;
+ p_module->p_symbols = &p_this->p_libvlc->p_module_bank->symbols;
/* Initialize the module: fill p_module->psz_object_name, default config */
if( CallEntry( p_module ) != 0 )
p_module->psz_longname = strdup( p_module->psz_longname );
/* Everything worked fine ! The module is ready to be added to the list. */
- p_module->i_usage = 0;
- p_module->i_unused_delay = 0;
-
p_module->b_builtin = VLC_FALSE;
- /* Link module into the linked list */
- if( p_this->p_vlc->p_module_bank->first != NULL )
- {
- p_this->p_vlc->p_module_bank->first->prev = p_module;
- }
- p_module->next = p_this->p_vlc->p_module_bank->first;
- p_module->prev = NULL;
- p_this->p_vlc->p_module_bank->first = p_module;
- p_this->p_vlc->p_module_bank->i_count++;
-
- msg_Dbg( p_this, "plugin \"%s\", %s",
- p_module->psz_object_name, p_module->psz_longname );
+ /* msg_Dbg( p_this, "plugin \"%s\", %s",
+ p_module->psz_object_name, p_module->psz_longname ); */
- vlc_object_attach( p_module, p_this->p_vlc->p_module_bank );
+ vlc_object_attach( p_module, p_this->p_libvlc->p_module_bank );
return 0;
}
* AllocateBuiltinModule: initialize a builtin module.
*****************************************************************************
* This function registers a builtin module and allocates a structure
- * for its information data. The module can then be handled by module_Need,
- * module_Unneed and HideModule. It can be removed by DeleteModule.
+ * for its information data. The module can then be handled by module_Need
+ * and module_Unneed. It can be removed by DeleteModule.
*****************************************************************************/
static int AllocateBuiltinModule( vlc_object_t * p_this,
int ( *pf_entry ) ( module_t * ) )
module_t * p_module;
/* Now that we have successfully loaded the module, we can
- * allocate a structure for it */
+ * allocate a structure for it */
p_module = vlc_object_create( p_this, VLC_OBJECT_MODULE );
if( p_module == NULL )
{
}
/* Everything worked fine ! The module is ready to be added to the list. */
- p_module->i_usage = 0;
- p_module->i_unused_delay = 0;
-
p_module->b_builtin = VLC_TRUE;
- /* Link module into the linked list */
- if( p_this->p_vlc->p_module_bank->first != NULL )
- {
- p_this->p_vlc->p_module_bank->first->prev = p_module;
- }
- p_module->next = p_this->p_vlc->p_module_bank->first;
- p_module->prev = NULL;
- p_this->p_vlc->p_module_bank->first = p_module;
- p_this->p_vlc->p_module_bank->i_count++;
-
- msg_Dbg( p_this, "builtin \"%s\", %s",
- p_module->psz_object_name, p_module->psz_longname );
+ /* msg_Dbg( p_this, "builtin \"%s\", %s",
+ p_module->psz_object_name, p_module->psz_longname ); */
- vlc_object_attach( p_module, p_this->p_vlc->p_module_bank );
+ vlc_object_attach( p_module, p_this->p_libvlc->p_module_bank );
return 0;
}
/*****************************************************************************
* DeleteModule: delete a module and its structure.
*****************************************************************************
- * This function can only be called if i_usage <= 0.
+ * This function can only be called if the module isn't being used.
*****************************************************************************/
static int DeleteModule( module_t * p_module )
{
- /* If the module is not in use but is still in memory, we first have
- * to hide it and remove it from memory before we can free the
- * data structure. */
- if( p_module->b_builtin )
- {
- if( p_module->i_usage != 0 )
- {
- msg_Err( p_module, "trying to free builtin module \"%s\" with "
- "usage %i", p_module->psz_object_name, p_module->i_usage );
- return -1;
- }
- }
-#ifdef HAVE_DYNAMIC_PLUGINS
- else
- {
- if( p_module->i_usage >= 1 )
- {
- msg_Err( p_module, "trying to free module \"%s\" which is "
- "still in use", p_module->psz_object_name );
- return -1;
- }
-
- /* Two possibilities here: i_usage == -1 and the module is already
- * unloaded, we can continue, or i_usage == 0, and we have to hide
- * the module before going on. */
- if( p_module->i_usage == 0 )
- {
- if( HideModule( p_module ) != 0 )
- {
- return -1;
- }
- }
- }
-#endif
-
- vlc_object_detach_all( p_module );
-
- /* Unlink the module from the linked list. */
- if( p_module->prev != NULL )
- {
- p_module->prev->next = p_module->next;
- }
- else
- {
- p_module->p_vlc->p_module_bank->first = p_module->next;
- }
-
- if( p_module->next != NULL )
- {
- p_module->next->prev = p_module->prev;
- }
-
- p_module->p_vlc->p_module_bank->i_count--;
+ vlc_object_detach( p_module );
/* We free the structures that we strdup()ed in Allocate*Module(). */
#ifdef HAVE_DYNAMIC_PLUGINS
if( !p_module->b_builtin )
{
+ if( p_module->b_unloadable )
+ {
+ module_unload( p_module->handle );
+ }
UndupModule( p_module );
free( p_module->psz_filename );
free( p_module->psz_longname );
while( p_module->i_children )
{
vlc_object_t *p_this = p_module->pp_children[0];
- vlc_object_detach_all( p_this );
+ vlc_object_detach( p_this );
vlc_object_destroy( p_this );
}
return 0;
}
-/*****************************************************************************
- * LockModule: increase the usage count of a module and load it if needed.
- *****************************************************************************
- * This function has to be called before a thread starts using a module. If
- * the module is already loaded, we just increase its usage count. If it isn't
- * loaded, we have to dynamically open it and initialize it.
- * If you successfully call LockModule() at any moment, be careful to call
- * UnlockModule() when you don't need it anymore.
- *****************************************************************************/
-static int LockModule( module_t * p_module )
-{
- if( p_module->i_usage >= 0 )
- {
- /* This module is already loaded and activated, we can return */
- p_module->i_usage++;
- return 0;
- }
-
- if( p_module->b_builtin )
- {
- /* A builtin module should always have a refcount >= 0 ! */
- msg_Err( p_module, "builtin module \"%s\" has refcount %i",
- p_module->psz_object_name, p_module->i_usage );
- return -1;
- }
-
#ifdef HAVE_DYNAMIC_PLUGINS
- if( p_module->i_usage != -1 )
- {
- /* This shouldn't happen. Ever. We have serious problems here. */
- msg_Err( p_module, "plugin module \"%s\" has refcount %i",
- p_module->psz_object_name, p_module->i_usage );
- return -1;
- }
-
- /* i_usage == -1, which means that the module isn't in memory */
- if( module_load( p_module->psz_filename, &p_module->handle ) )
- {
- char psz_buffer[256];
-
- /* The plugin module couldn't be opened */
- msg_Err( p_module, "cannot open `%s' (%s)",
- p_module->psz_filename, module_error(psz_buffer) );
- return -1;
- }
-
- /* FIXME: what to do if the guy modified the plugin while it was
- * unloaded ? It makes XMMS crash nastily, perhaps we should try
- * to be a bit more clever here. */
-
- /* Everything worked fine ! The module is ready to be used */
- p_module->i_usage = 1;
-#endif /* HAVE_DYNAMIC_PLUGINS */
-
- return 0;
-}
-
-/*****************************************************************************
- * UnlockModule: decrease the usage count of a module.
- *****************************************************************************
- * We decrease the usage count of a module so that we know when a module
- * becomes unused and can be hidden.
- *****************************************************************************/
-static int UnlockModule( module_t * p_module )
-{
- if( p_module->i_usage <= 0 )
- {
- /* This shouldn't happen. Ever. We have serious problems here. */
- msg_Err( p_module, "trying to call module_Unneed() on \"%s\" "
- "which is not in use", p_module->psz_object_name );
- return -1;
- }
-
- /* This module is still in use, we can return */
- p_module->i_usage--;
- p_module->i_unused_delay = 0;
-
- return 0;
-}
-
-#ifdef HAVE_DYNAMIC_PLUGINS
-/*****************************************************************************
- * HideModule: remove a module from memory but keep its structure.
- *****************************************************************************
- * This function can only be called if i_usage == 0. It will make a call
- * to the module's inner module_deactivate() symbol, and then unload it
- * from memory. A call to module_Need() will automagically load it again.
- *****************************************************************************/
-static int HideModule( module_t * p_module )
-{
- if( p_module->b_builtin )
- {
- /* A builtin module should never be hidden. */
- msg_Err( p_module, "trying to hide builtin module \"%s\"",
- p_module->psz_object_name );
- return -1;
- }
-
- if( p_module->i_usage >= 1 )
- {
- msg_Err( p_module, "trying to hide module \"%s\" which is still "
- "in use", p_module->psz_object_name );
- return -1;
- }
-
- if( p_module->i_usage <= -1 )
- {
- msg_Err( p_module, "trying to hide module \"%s\" which is already "
- "hidden", p_module->psz_object_name );
- return -1;
- }
-
- /* Everything worked fine, we can safely unload the module. */
- module_unload( p_module->handle );
- p_module->i_usage = -1;
-
- return 0;
-}
-
/*****************************************************************************
* CallEntry: call an entry point.
*****************************************************************************
int (* pf_symbol) ( module_t * p_module );
/* Try to resolve the symbol */
- pf_symbol = module_getsymbol( p_module->handle, psz_name );
+ pf_symbol = (int (*)(module_t *)) module_getsymbol( p_module->handle,
+ psz_name );
if( pf_symbol == NULL )
{
return 0;
}
#endif /* HAVE_DYNAMIC_PLUGINS */
-