* modules.c : Builtin and plugin modules management functions
*****************************************************************************
* Copyright (C) 2001 VideoLAN
- * $Id: modules.c,v 1.88 2002/08/15 12:22:45 sam Exp $
+ * $Id: modules.c,v 1.107 2002/11/19 17:38:07 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Ethan C. Baldridge <BaldridgeE@cadmus.com>
#include <vlc/vlc.h>
-#include <dirent.h>
-#include <sys/types.h>
-#include <sys/stat.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
#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 "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 void AllocatePluginDir ( vlc_object_t *, const char *, int );
-static int AllocatePluginFile ( 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 * );
#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( 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->i_children )
+ while( p_this->p_libvlc->p_module_bank->i_children )
{
- p_next = (module_t *)p_this->p_vlc->p_module_bank->pp_children[0];
+ p_next = (module_t *)p_this->p_libvlc->p_module_bank->pp_children[0];
if( DeleteModule( p_next ) )
{
}
}
- vlc_object_destroy( p_this->p_vlc->p_module_bank );
+ vlc_object_destroy( p_this->p_libvlc->p_module_bank );
return;
}
}
/* 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( 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 )
{
p_module->pf_deactivate( p_this );
}
- msg_Info( p_module, "unlocking module \"%s\"", p_module->psz_object_name );
+ msg_Dbg( p_module, "unlocking module \"%s\"", p_module->psz_object_name );
vlc_object_release( p_module );
static void AllocateAllPlugins( vlc_object_t *p_this )
{
/* Yes, there are two NULLs because we replace one with "plugin-path". */
- char * path[] = { "modules", PLUGIN_PATH, NULL, NULL };
+ char * path[] = { "modules", PLUGIN_PATH, "plugins", NULL,
+ NULL };
char ** ppsz_path = path;
char * psz_fullpath;
vlc_bool_t b_notinroot;
#endif
+#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" );
msg_Dbg( p_this, "recursively browsing `%s'", 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 )
}
#endif
}
+
+ /* Free plugin-path */
+ free( path[ sizeof(path)/sizeof(char*) - 2 ] );
+ path[ sizeof(path)/sizeof(char*) - 2 ] = NULL;
}
/*****************************************************************************
* AllocatePluginDir: recursively parse a directory to look for plugins
*****************************************************************************/
-static void AllocatePluginDir( vlc_object_t *p_this, const char *psz_dir,
+static void AllocatePluginDir( vlc_object_t *p_this, const MYCHAR *psz_dir,
int i_maxdepth )
{
-#define PLUGIN_EXT ".so"
+#ifdef UNDER_CE
+ MYCHAR psz_path[MAX_PATH + 256];
+ WIN32_FIND_DATA finddata;
+ HANDLE handle;
+ unsigned int rc;
+#else
int i_dirlen;
DIR * dir;
char * psz_file;
-
struct dirent * file;
+#endif
if( i_maxdepth < 0 )
{
return;
}
- dir = opendir( psz_dir );
+#ifdef UNDER_CE
+ rc = GetFileAttributes( psz_dir );
+ if( !(rc & FILE_ATTRIBUTE_DIRECTORY) )
+ {
+ /* Not a directory */
+ return;
+ }
+ /* Parse all files in the directory */
+ swprintf( psz_path, L"%s\\*.*", psz_dir );
+ handle = FindFirstFile( psz_path, &finddata );
+ if( handle == INVALID_HANDLE_VALUE )
+ {
+ /* Empty directory */
+ return;
+ }
+
+ /* Parse the directory and try to load all files it contains. */
+ do
+ {
+ unsigned int i_len = wcslen( finddata.cFileName );
+
+ swprintf( psz_path, L"%s\\%s", psz_dir, finddata.cFileName );
+
+ if( GetFileAttributes( psz_path ) & FILE_ATTRIBUTE_DIRECTORY )
+ {
+ AllocatePluginDir( p_this, psz_path, i_maxdepth - 1 );
+ }
+ else if( i_len > strlen( LIBEXT ) )
+ {
+ AllocatePluginFile( p_this, psz_path );
+ }
+ }
+ while( FindNextFile( handle, &finddata ) );
+
+ /* Close the directory */
+ FindClose( handle );
+
+#else
+ dir = opendir( psz_dir );
if( !dir )
{
return;
while( (file = readdir( dir )) )
{
struct stat statbuf;
- int i_len = strlen( file->d_name );
+ unsigned int i_len;
/* Skip ".", ".." and anything starting with "." */
if( !*file->d_name || *file->d_name == '.' )
continue;
}
- psz_file = malloc( i_dirlen + 1 /* / */ + i_len + 1 /* \0 */ );
+ i_len = strlen( file->d_name );
+ psz_file = malloc( i_dirlen + 1 + i_len + 1 );
sprintf( psz_file, "%s/%s", psz_dir, file->d_name );
if( !stat( psz_file, &statbuf ) && statbuf.st_mode & S_IFDIR )
{
AllocatePluginDir( p_this, psz_file, i_maxdepth - 1 );
}
- else if( i_len > strlen( PLUGIN_EXT )
- /* We only load files ending with ".so" */
- && !strncmp( file->d_name + i_len - strlen( PLUGIN_EXT ),
- PLUGIN_EXT, strlen( PLUGIN_EXT ) ) )
+ 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 );
}
/* Close the directory */
closedir( dir );
+
+#endif
}
/*****************************************************************************
* for its information data. The module can then be handled by module_Need
* and module_Unneed. It can be removed by DeleteModule.
*****************************************************************************/
-static int AllocatePluginFile( vlc_object_t * p_this, char * psz_file )
+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_file, &handle ) )
{
/* The plugin module couldn't be opened */
msg_Warn( p_this, "cannot open `%s' (%s)",
- psz_file, module_error( psz_buffer ) );
+ psz_filename, module_error( psz_buffer ) );
return -1;
}
}
/* We need to fill these since they may be needed by CallEntry() */
- p_module->psz_filename = psz_file;
+ 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 )
{
/* We couldn't call module_init() */
- msg_Err( p_this, "failed calling entry point in `%s'", psz_file );
vlc_object_destroy( p_module );
module_unload( handle );
return -1;
/* 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;
}
/* 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;
}
#ifdef HAVE_DYNAMIC_PLUGINS
if( !p_module->b_builtin )
{
- module_unload( p_module->handle );
+ if( p_module->b_unloadable )
+ {
+ module_unload( p_module->handle );
+ }
UndupModule( p_module );
free( p_module->psz_filename );
free( p_module->psz_longname );
projects / vlc / blobdiff