#include "vlc_video.h"
#include "video_output.h"
#include "vout_synchro.h"
+#include "vlc_spu.h"
#include "audio_output.h"
#include "aout_internal.h"
#include "stream_output.h"
#include "osd.h"
#include "vlc_httpd.h"
+#include "vlc_tls.h"
+#include "vlc_xml.h"
#include "iso_lang.h"
#include "charset.h"
#include "vlc_vlm.h"
+#include "vlc_image.h"
+
#ifdef HAVE_DYNAMIC_PLUGINS
# include "modules_plugin.h"
#endif
-#if defined( UNDER_CE )
+#if defined( _MSC_VER ) && defined( UNDER_CE )
# include "modules_builtin_evc.h"
#elif defined( _MSC_VER )
# include "modules_builtin_msvc.h"
static int CacheLoadConfig ( module_t *, FILE * );
static void CacheSave ( vlc_object_t * );
static void CacheSaveConfig ( module_t *, FILE * );
+static char * CacheName ( void );
static void CacheMerge ( vlc_object_t *, module_t *, module_t * );
static module_cache_t * CacheFind( vlc_object_t *, char *, int64_t, int64_t );
void __module_EndBank( vlc_object_t *p_this )
{
module_t * p_next;
- vlc_value_t lockval;
+ vlc_value_t lockval;
var_Create( p_this->p_libvlc, "libvlc", VLC_VAR_MUTEX );
var_Get( p_this->p_libvlc, "libvlc", &lockval );
var_Destroy( p_this->p_libvlc, "libvlc" );
#ifdef HAVE_DYNAMIC_PLUGINS
- if( p_this->p_libvlc->p_module_bank->b_cache ) CacheSave( p_this );
+#define p_bank p_this->p_libvlc->p_module_bank
+ if( p_bank->b_cache ) CacheSave( p_this );
+ while( p_bank->i_loaded_cache-- )
+ {
+ free( p_bank->pp_loaded_cache[p_bank->i_loaded_cache]->psz_file );
+ free( p_bank->pp_loaded_cache[p_bank->i_loaded_cache] );
+ if( !p_bank->i_loaded_cache ) free( p_bank->pp_loaded_cache );
+ }
+ while( p_bank->i_cache-- )
+ {
+ free( p_bank->pp_cache[p_bank->i_cache]->psz_file );
+ free( p_bank->pp_cache[p_bank->i_cache] );
+ if( !p_bank->i_cache ) free( p_bank->pp_cache );
+ }
+#undef p_bank
#endif
vlc_object_detach( p_this->p_libvlc->p_module_bank );
}
vlc_object_destroy( p_this->p_libvlc->p_module_bank );
+ p_this->p_libvlc->p_module_bank = NULL;
return;
}
*****************************************************************************/
void __module_LoadMain( vlc_object_t *p_this )
{
+ vlc_value_t lockval;
+
+ var_Create( p_this->p_libvlc, "libvlc", VLC_VAR_MUTEX );
+ var_Get( p_this->p_libvlc, "libvlc", &lockval );
+ vlc_mutex_lock( lockval.p_address );
+ if( p_this->p_libvlc->p_module_bank->b_main )
+ {
+ vlc_mutex_unlock( lockval.p_address );
+ var_Destroy( p_this->p_libvlc, "libvlc" );
+ return;
+ }
+ p_this->p_libvlc->p_module_bank->b_main = VLC_TRUE;
+ vlc_mutex_unlock( lockval.p_address );
+ var_Destroy( p_this->p_libvlc, "libvlc" );
+
AllocateBuiltinModule( p_this, vlc_entry__main );
}
*****************************************************************************/
void __module_LoadBuiltins( vlc_object_t * p_this )
{
+ vlc_value_t lockval;
+
+ var_Create( p_this->p_libvlc, "libvlc", VLC_VAR_MUTEX );
+ var_Get( p_this->p_libvlc, "libvlc", &lockval );
+ vlc_mutex_lock( lockval.p_address );
+ if( p_this->p_libvlc->p_module_bank->b_builtins )
+ {
+ vlc_mutex_unlock( lockval.p_address );
+ var_Destroy( p_this->p_libvlc, "libvlc" );
+ return;
+ }
+ p_this->p_libvlc->p_module_bank->b_builtins = VLC_TRUE;
+ vlc_mutex_unlock( lockval.p_address );
+ var_Destroy( p_this->p_libvlc, "libvlc" );
+
msg_Dbg( p_this, "checking builtin modules" );
ALLOCATE_ALL_BUILTINS();
}
void __module_LoadPlugins( vlc_object_t * p_this )
{
#ifdef HAVE_DYNAMIC_PLUGINS
+ vlc_value_t lockval;
+
+ var_Create( p_this->p_libvlc, "libvlc", VLC_VAR_MUTEX );
+ var_Get( p_this->p_libvlc, "libvlc", &lockval );
+ vlc_mutex_lock( lockval.p_address );
+ if( p_this->p_libvlc->p_module_bank->b_plugins )
+ {
+ vlc_mutex_unlock( lockval.p_address );
+ var_Destroy( p_this->p_libvlc, "libvlc" );
+ return;
+ }
+ p_this->p_libvlc->p_module_bank->b_plugins = VLC_TRUE;
+ vlc_mutex_unlock( lockval.p_address );
+ var_Destroy( p_this->p_libvlc, "libvlc" );
+
msg_Dbg( p_this, "checking plugin modules" );
if( config_GetInt( p_this, "plugins-cache" ) )
int i_shortcuts = 0;
char *psz_shortcuts = NULL, *psz_var = NULL;
+ vlc_bool_t b_force_backup = p_this->b_force;
msg_Dbg( p_this, "looking for %s module", psz_capability );
int i_dummy, i_short = i_shortcuts;
char *psz_name = psz_shortcuts;
- /* Let's drop modules with a 0 score (unless they are
+ /* Let's drop modules with a <= 0 score (unless they are
* explicitly requested) */
- b_trash = !p_module->i_score;
+ b_trash = p_module->i_score <= 0;
while( i_short > 0 )
{
continue;
}
}
- /* If we didn't require a shortcut, trash zero-scored plugins */
- else if( !p_module->i_score )
+ /* If we didn't require a shortcut, trash <= 0 scored plugins */
+ else if( p_module->i_score <= 0 )
{
continue;
}
/* Special case: test if we requested a particular intf plugin */
if( !i_shortcuts && p_module->psz_program
+ && !strcmp( psz_capability, "interface" )
&& !strcmp( p_module->psz_program,
p_this->p_vlc->psz_object_name ) )
{
}
free( p_list );
- p_this->b_force = VLC_FALSE;
+ p_this->b_force = b_force_backup;
if( p_module != NULL )
{
}
else if( p_first == NULL )
{
- msg_Err( p_this, "no %s module matched \"%s\"",
+ if( !strcmp( psz_capability, "access_demux" ) )
+ {
+ msg_Warn( p_this, "no %s module matched \"%s\"",
psz_capability, (psz_name && *psz_name) ? psz_name : "any" );
+ }
+ else
+ {
+ msg_Err( p_this, "no %s module matched \"%s\"",
+ psz_capability, (psz_name && *psz_name) ? psz_name : "any" );
+ }
}
else if( psz_name != NULL && *psz_name )
{
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, "plugins", NULL,
- NULL };
+#if defined( WIN32 ) || defined( UNDER_CE )
+ char *path[] = { "modules", "", "plugins", 0, 0 };
+#else
+ char *path[] = { "modules", PLUGIN_PATH, "plugins", 0, 0 };
+#endif
- char ** ppsz_path = path;
- char * psz_fullpath;
+ char **ppsz_path = path;
+ char *psz_fullpath;
/* If the user provided a plugin path, we add it to the list */
path[ sizeof(path)/sizeof(char*) - 2 ] =
for( ; *ppsz_path != NULL ; ppsz_path++ )
{
-#if defined( SYS_BEOS ) || defined( SYS_DARWIN ) \
- || ( defined( WIN32 ) && !defined( UNDER_CE ) )
+ if( !(*ppsz_path)[0] ) continue;
+
+#if defined( SYS_BEOS ) || defined( SYS_DARWIN ) || defined( WIN32 )
/* Handle relative as well as absolute paths */
#ifdef WIN32
- if( !(*ppsz_path)[0] || (*ppsz_path)[1] != ':' )
+ if( (*ppsz_path)[0] != '\\' && (*ppsz_path)[0] != '/' &&
+ (*ppsz_path)[1] != ':' )
#else
if( (*ppsz_path)[0] != '/' )
#endif
{
#if defined( UNDER_CE ) || defined( _MSC_VER )
#ifdef UNDER_CE
- wchar_t psz_path[MAX_PATH + 256];
+ wchar_t psz_wpath[MAX_PATH + 256];
wchar_t psz_wdir[MAX_PATH];
-#else
- char psz_path[MAX_PATH + 256];
#endif
+ char psz_path[MAX_PATH + 256];
WIN32_FIND_DATA finddata;
HANDLE handle;
unsigned int rc;
}
#if defined( UNDER_CE ) || defined( _MSC_VER )
+#ifdef UNDER_CE
MultiByteToWideChar( CP_ACP, 0, psz_dir, -1, psz_wdir, MAX_PATH );
rc = GetFileAttributes( psz_wdir );
- if( !(rc & FILE_ATTRIBUTE_DIRECTORY) )
- {
- /* Not a directory */
- return;
- }
+ if( !(rc & FILE_ATTRIBUTE_DIRECTORY) ) return; /* Not a directory */
/* Parse all files in the directory */
-#ifdef UNDER_CE
- swprintf( psz_path, L"%s\\*.*", psz_dir );
+ swprintf( psz_wpath, L"%ls\\*", psz_wdir );
#else
- sprintf( psz_path, "%s\\*.*", psz_dir );
+ rc = GetFileAttributes( psz_dir );
+ if( !(rc & FILE_ATTRIBUTE_DIRECTORY) ) return; /* Not a directory */
#endif
+
+ /* Parse all files in the directory */
+ sprintf( psz_path, "%s\\*", psz_dir );
+
+#ifdef UNDER_CE
+ handle = FindFirstFile( psz_wpath, &finddata );
+#else
handle = FindFirstFile( psz_path, &finddata );
+#endif
if( handle == INVALID_HANDLE_VALUE )
{
/* Empty directory */
{
#ifdef UNDER_CE
unsigned int i_len = wcslen( finddata.cFileName );
- swprintf( psz_path, L"%s\\%s", psz_dir, finddata.cFileName );
+ swprintf( psz_wpath, L"%ls\\%ls", psz_wdir, finddata.cFileName );
+ sprintf( psz_path, "%s\\%ls", psz_dir, finddata.cFileName );
#else
unsigned int i_len = strlen( finddata.cFileName );
+ sprintf( psz_path, "%s\\%s", psz_dir, finddata.cFileName );
+#endif
+
/* 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
+#ifdef UNDER_CE
+ if( GetFileAttributes( psz_wpath ) & FILE_ATTRIBUTE_DIRECTORY )
+#else
if( GetFileAttributes( psz_path ) & FILE_ATTRIBUTE_DIRECTORY )
+#endif
{
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
{
+ WIN32_FILE_ATTRIBUTE_DATA attrbuf;
+ int64_t i_time = 0, i_size = 0;
+
#ifdef UNDER_CE
- char psz_filename[MAX_PATH];
- WideCharToMultiByte( CP_ACP, WC_DEFAULTCHAR, psz_path, -1,
- psz_filename, MAX_PATH, NULL, NULL );
- psz_file = psz_filename;
+ if( GetFileAttributesEx( psz_wpath, GetFileExInfoStandard,
+ &attrbuf ) )
#else
- psz_file = psz_path;
+ if( GetFileAttributesEx( psz_path, GetFileExInfoStandard,
+ &attrbuf ) )
#endif
+ {
+ i_time = attrbuf.ftLastWriteTime.dwHighDateTime;
+ i_time <<= 32;
+ i_time |= attrbuf.ftLastWriteTime.dwLowDateTime;
+ i_size = attrbuf.nFileSizeHigh;
+ i_size <<= 32;
+ i_size |= attrbuf.nFileSizeLow;
+ }
+ psz_file = psz_path;
- AllocatePluginFile( p_this, psz_file, 0, 0 );
+ AllocatePluginFile( p_this, psz_file, i_time, i_size );
}
}
while( !p_this->p_vlc->b_die && FindNextFile( handle, &finddata ) );
DupModule( p_module );
p_module->psz_filename = strdup( p_module->psz_filename );
- p_module->psz_longname = strdup( p_module->psz_longname );
/* Everything worked fine ! The module is ready to be added to the list. */
p_module->b_builtin = VLC_FALSE;
* module is unloaded. */
p_module->psz_object_name = strdup( p_module->psz_object_name );
p_module->psz_capability = strdup( p_module->psz_capability );
+ p_module->psz_shortname = p_module->psz_shortname ?
+ strdup( p_module->psz_shortname ) : NULL;
+ p_module->psz_longname = strdup( p_module->psz_longname );
if( p_module->psz_program != NULL )
{
free( p_module->psz_object_name );
free( p_module->psz_capability );
+ if( p_module->psz_shortname ) free( p_module->psz_shortname );
+ free( p_module->psz_longname );
if( p_module->psz_program != NULL )
{
}
UndupModule( p_module );
free( p_module->psz_filename );
- free( p_module->psz_longname );
}
#endif
}
#elif defined(HAVE_DL_WINDOWS)
+#ifdef UNDER_CE
+ {
+ wchar_t psz_wfile[MAX_PATH];
+ MultiByteToWideChar( CP_ACP, 0, psz_file, -1, psz_wfile, MAX_PATH );
+ handle = LoadLibrary( psz_wfile );
+ }
+#else
handle = LoadLibrary( psz_file );
+#endif
if( handle == NULL )
{
char *psz_err = GetWindowsError();
msg_Warn( p_this, "cannot load module `%s' (%s)", psz_file, psz_err );
free( psz_err );
+ return -1;
}
#elif defined(HAVE_DL_DLOPEN) && defined(RTLD_NOW)
static char * GetWindowsError( void )
{
#if defined(UNDER_CE)
- wchar_t psz_tmp[256];
- char * psz_buffer = malloc( 256 );
+ wchar_t psz_tmp[MAX_PATH];
+ char * psz_buffer = malloc( MAX_PATH );
#else
- char * psz_tmp = malloc( 256 );
+ char * psz_tmp = malloc( MAX_PATH );
#endif
int i = 0, i_error = GetLastError();
FormatMessage( FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
NULL, i_error, MAKELANGID (LANG_NEUTRAL, SUBLANG_DEFAULT),
- (LPTSTR) psz_tmp, 256, NULL );
+ (LPTSTR)psz_tmp, MAX_PATH, NULL );
/* Go to the end of the string */
-#if defined(UNDER_CE)
- while( psz_tmp[i] && psz_tmp[i] != L'\r' && psz_tmp[i] != L'\n' )
-#else
- while( psz_tmp[i] && psz_tmp[i] != '\r' && psz_tmp[i] != '\n' )
-#endif
+ while( psz_tmp[i] && psz_tmp[i] != _T('\r') && psz_tmp[i] != _T('\n') )
{
i++;
}
}
#if defined(UNDER_CE)
- WideCharToMultiByte( CP_ACP, WC_DEFAULTCHAR, psz_tmp, -1,
- psz_buffer, 256, NULL, NULL );
+ wcstombs( psz_buffer, psz_tmp, MAX_PATH );
return psz_buffer;
#else
return psz_tmp;
char *psz_filename, *psz_homedir;
FILE *file;
int i, j, i_size, i_read;
- char p_cachestring[sizeof(PLUGINSCACHE_FILE COPYRIGHT_MESSAGE)];
+ char p_cachestring[sizeof(PLUGINSCACHE_DIR COPYRIGHT_MESSAGE)];
+ char p_cachelang[6], p_lang[6];
int i_cache;
module_cache_t **pp_cache = 0;
- int32_t i_file_size;
+ int32_t i_file_size, i_marker;
psz_homedir = p_this->p_vlc->psz_homedir;
if( !psz_homedir )
msg_Err( p_this, "psz_homedir is null" );
return;
}
- psz_filename =
- (char *)malloc( sizeof("/" CONFIG_DIR "/" PLUGINSCACHE_FILE) +
- strlen(psz_homedir) );
- if( psz_filename )
- sprintf( psz_filename, "%s/" CONFIG_DIR "/" PLUGINSCACHE_FILE,
- psz_homedir );
-
- if( !psz_filename )
+ i_size = asprintf( &psz_filename, "%s/%s/%s/%s", psz_homedir, CONFIG_DIR,
+ PLUGINSCACHE_DIR, CacheName() );
+ if( i_size <= 0 )
{
msg_Err( p_this, "out of memory" );
return;
if( p_this->p_libvlc->p_module_bank->b_cache_delete )
{
- msg_Dbg( p_this, "removing plugins cache file %s", psz_filename );
+#if !defined( UNDER_CE )
unlink( psz_filename );
+#else
+ wchar_t psz_wf[MAX_PATH];
+ MultiByteToWideChar( CP_ACP, 0, psz_filename, -1, psz_wf, MAX_PATH );
+ DeleteFile( psz_wf );
+#endif
+ msg_Dbg( p_this, "removing plugins cache file %s", psz_filename );
return;
}
msg_Dbg( p_this, "loading plugins cache file %s", psz_filename );
- file = fopen( psz_filename, "r" );
+ file = fopen( psz_filename, "rb" );
if( !file )
{
msg_Warn( p_this, "could not open plugins cache file %s for reading",
fseek( file, sizeof(i_file_size), SEEK_SET );
/* Check the file is a plugins cache */
- i_size = sizeof(PLUGINSCACHE_FILE COPYRIGHT_MESSAGE) - 1;
+ i_size = sizeof(PLUGINSCACHE_DIR COPYRIGHT_MESSAGE) - 1;
i_read = fread( p_cachestring, sizeof(char), i_size, file );
if( i_read != i_size ||
- memcmp( p_cachestring, PLUGINSCACHE_FILE COPYRIGHT_MESSAGE, i_size ) )
+ memcmp( p_cachestring, PLUGINSCACHE_DIR COPYRIGHT_MESSAGE, i_size ) )
{
msg_Warn( p_this, "This doesn't look like a valid plugins cache" );
fclose( file );
return;
}
+ /* Check the language hasn't changed */
+ sprintf( p_lang, "%5.5s", _("C") ); i_size = 5;
+ i_read = fread( p_cachelang, sizeof(char), i_size, file );
+ if( i_read != i_size || memcmp( p_cachelang, p_lang, i_size ) )
+ {
+ msg_Warn( p_this, "This doesn't look like a valid plugins cache "
+ "(language changed)" );
+ fclose( file );
+ return;
+ }
+
+ /* Check header marker */
+ i_read = fread( &i_marker, sizeof(char), sizeof(i_marker), file );
+ if( i_read != sizeof(i_marker) ||
+ i_marker != ftell( file ) - (int)sizeof(i_marker) )
+ {
+ msg_Warn( p_this, "This doesn't look like a valid plugins cache "
+ "(corrupted header)" );
+ fclose( file );
+ return;
+ }
+
p_this->p_libvlc->p_module_bank->i_loaded_cache = 0;
fread( &i_cache, sizeof(char), sizeof(i_cache), file );
pp_cache = p_this->p_libvlc->p_module_bank->pp_loaded_cache =
pp_cache[i] = malloc( sizeof(module_cache_t) );
p_this->p_libvlc->p_module_bank->i_loaded_cache++;
- /* Save common info */
+ /* Load common info */
LOAD_STRING( pp_cache[i]->psz_file );
LOAD_IMMEDIATE( pp_cache[i]->i_time );
LOAD_IMMEDIATE( pp_cache[i]->i_size );
pp_cache[i]->p_module = vlc_object_create( p_this, VLC_OBJECT_MODULE );
- /* Save additional infos */
+ /* Load additional infos */
LOAD_STRING( pp_cache[i]->p_module->psz_object_name );
LOAD_STRING( pp_cache[i]->p_module->psz_shortname );
LOAD_STRING( pp_cache[i]->p_module->psz_longname );
{
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;
+ p_module->b_submodule = VLC_TRUE;
LOAD_STRING( p_module->psz_object_name );
LOAD_STRING( p_module->psz_shortname );
*****************************************************************************/
static void CacheSave( vlc_object_t *p_this )
{
+ static char const psz_tag[] =
+ "Signature: 8a477f597d28d172789f06886806bc55\r\n"
+ "# This file is a cache directory tag created by VLC.\r\n"
+ "# For information about cache directory tags, see:\r\n"
+ "# http://www.brynosaurus.com/cachedir/\r\n";
+
char *psz_filename, *psz_homedir;
FILE *file;
int i, j, i_cache;
return;
}
psz_filename =
- (char *)malloc( sizeof("/" CONFIG_DIR "/" PLUGINSCACHE_FILE) +
- strlen(psz_homedir) );
-
- if( psz_filename )
- sprintf( psz_filename, "%s/" CONFIG_DIR, psz_homedir );
+ (char *)malloc( sizeof("/" CONFIG_DIR "/" PLUGINSCACHE_DIR "/" ) +
+ strlen(psz_homedir) + strlen(CacheName()) );
if( !psz_filename )
{
return;
}
+ sprintf( psz_filename, "%s/%s", psz_homedir, CONFIG_DIR );
+
config_CreateDir( p_this, psz_filename );
- strcat( psz_filename, "/" PLUGINSCACHE_FILE );
+ strcat( psz_filename, "/" PLUGINSCACHE_DIR );
+
+ config_CreateDir( p_this, psz_filename );
+
+ strcat( psz_filename, "/CACHEDIR.TAG" );
+
+ file = fopen( psz_filename, "wb" );
+ if( file )
+ {
+ fwrite( psz_tag, 1, strlen(psz_tag), file );
+ fclose( file );
+ }
+
+ sprintf( psz_filename, "%s/%s/%s/%s", psz_homedir, CONFIG_DIR,
+ PLUGINSCACHE_DIR, CacheName() );
msg_Dbg( p_this, "saving plugins cache file %s", psz_filename );
- file = fopen( psz_filename, "w" );
+ file = fopen( psz_filename, "wb" );
if( !file )
{
msg_Warn( p_this, "could not open plugins cache file %s for writing",
fwrite( &i_file_size, sizeof(char), sizeof(i_file_size), file );
/* Contains version number */
- fprintf( file, PLUGINSCACHE_FILE COPYRIGHT_MESSAGE );
+ fprintf( file, "%s", PLUGINSCACHE_DIR COPYRIGHT_MESSAGE );
+
+ /* Language */
+ fprintf( file, "%5.5s", _("C") );
+
+ /* Header marker */
+ i_file_size = ftell( file );
+ fwrite( &i_file_size, sizeof(char), sizeof(i_file_size), file );
i_cache = p_this->p_libvlc->p_module_bank->i_cache;
pp_cache = p_this->p_libvlc->p_module_bank->pp_cache;
}
}
+/*****************************************************************************
+ * CacheName: Return the cache file name for this platform.
+ *****************************************************************************/
+static char *CacheName( void )
+{
+ static char psz_cachename[32];
+ static vlc_bool_t b_initialised = VLC_FALSE;
+
+ if( !b_initialised )
+ {
+ /* Code int size, pointer size and endianness in the filename */
+ int32_t x = 0xbe00001e;
+ sprintf( psz_cachename, "plugins-%.2x%.2x%.2x.dat", sizeof(int),
+ sizeof(void *), (unsigned int)((unsigned char *)&x)[0] );
+ b_initialised = VLC_TRUE;
+ }
+
+ return psz_cachename;
+}
+
/*****************************************************************************
* CacheMerge: Merge a cache module descriptor with a full module descriptor.
*****************************************************************************/