*
* 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.
*****************************************************************************/
+#include <vlc/vlc.h>
+
/* Some faulty libcs have a broken struct dirent when _FILE_OFFSET_BITS
* is set to 64. Don't try to be cleverer. */
#ifdef _FILE_OFFSET_BITS
#include <stdio.h> /* sprintf() */
#include <string.h> /* strdup() */
-#include <vlc/vlc.h>
#include <vlc/input.h>
#ifdef HAVE_DIRENT_H
#include "vlc_error.h"
#include "vlc_interface.h"
+#include "vlc_interaction.h"
#include "intf_eject.h"
#include "vlc_playlist.h"
#include "aout_internal.h"
#include "stream_output.h"
-#include "osd.h"
#include "vlc_httpd.h"
#include "vlc_acl.h"
#include "vlc_tls.h"
#include "vlc_md5.h"
#include "vlc_xml.h"
+#include "vlc_url.h"
#include "iso_lang.h"
#include "charset.h"
#include "vlc_vlm.h"
#include "vlc_image.h"
+#include "vlc_osd.h"
+
+#include "vlc_update.h"
+#include "vlc_strings.h"
#if defined( _MSC_VER ) && defined( UNDER_CE )
# include "modules_builtin_evc.h"
module_bank_t *p_bank;
vlc_value_t lockval;
- var_Create( p_this->p_libvlc, "libvlc", VLC_VAR_MUTEX );
- var_Get( p_this->p_libvlc, "libvlc", &lockval );
+ var_Create( p_this->p_libvlc_global, "libvlc", VLC_VAR_MUTEX );
+ var_Get( p_this->p_libvlc_global, "libvlc", &lockval );
vlc_mutex_lock( lockval.p_address );
- if( p_this->p_libvlc->p_module_bank )
+ if( p_this->p_libvlc_global->p_module_bank )
{
- p_this->p_libvlc->p_module_bank->i_usage++;
+ p_this->p_libvlc_global->p_module_bank->i_usage++;
vlc_mutex_unlock( lockval.p_address );
- var_Destroy( p_this->p_libvlc, "libvlc" );
+ var_Destroy( p_this->p_libvlc_global, "libvlc" );
return;
}
vlc_mutex_unlock( lockval.p_address );
- var_Destroy( p_this->p_libvlc, "libvlc" );
+ var_Destroy( p_this->p_libvlc_global, "libvlc" );
p_bank = vlc_object_create( p_this, sizeof(module_bank_t) );
p_bank->psz_object_name = "module bank";
/*
* Store the symbols to be exported
*/
-#ifdef HAVE_DYNAMIC_PLUGINS
+#if defined (HAVE_DYNAMIC_PLUGINS) && !defined (HAVE_SHARED_LIBVLC)
STORE_SYMBOLS( &p_bank->symbols );
#endif
/* Everything worked, attach the object */
- p_this->p_libvlc->p_module_bank = p_bank;
- vlc_object_attach( p_bank, p_this->p_libvlc );
+ p_this->p_libvlc_global->p_module_bank = p_bank;
+ vlc_object_attach( p_bank, p_this->p_libvlc_global );
module_LoadMain( p_this );
module_t * p_next;
vlc_value_t lockval;
- var_Create( p_this->p_libvlc, "libvlc", VLC_VAR_MUTEX );
- var_Get( p_this->p_libvlc, "libvlc", &lockval );
+ var_Create( p_this->p_libvlc_global, "libvlc", VLC_VAR_MUTEX );
+ var_Get( p_this->p_libvlc_global, "libvlc", &lockval );
vlc_mutex_lock( lockval.p_address );
- if( !p_this->p_libvlc->p_module_bank )
+ if( !p_this->p_libvlc_global->p_module_bank )
{
vlc_mutex_unlock( lockval.p_address );
- var_Destroy( p_this->p_libvlc, "libvlc" );
+ var_Destroy( p_this->p_libvlc_global, "libvlc" );
return;
}
- if( --p_this->p_libvlc->p_module_bank->i_usage )
+ if( --p_this->p_libvlc_global->p_module_bank->i_usage )
{
vlc_mutex_unlock( lockval.p_address );
- var_Destroy( p_this->p_libvlc, "libvlc" );
+ var_Destroy( p_this->p_libvlc_global, "libvlc" );
return;
}
vlc_mutex_unlock( lockval.p_address );
- var_Destroy( p_this->p_libvlc, "libvlc" );
+ var_Destroy( p_this->p_libvlc_global, "libvlc" );
config_AutoSaveConfigFile( p_this );
#ifdef HAVE_DYNAMIC_PLUGINS
-#define p_bank p_this->p_libvlc->p_module_bank
+#define p_bank p_this->p_libvlc_global->p_module_bank
if( p_bank->b_cache ) CacheSave( p_this );
while( p_bank->i_loaded_cache-- )
{
#undef p_bank
#endif
- vlc_object_detach( p_this->p_libvlc->p_module_bank );
+ vlc_object_detach( p_this->p_libvlc_global->p_module_bank );
- while( p_this->p_libvlc->p_module_bank->i_children )
+ while( p_this->p_libvlc_global->p_module_bank->i_children )
{
- p_next = (module_t *)p_this->p_libvlc->p_module_bank->pp_children[0];
+ p_next = (module_t *)p_this->p_libvlc_global->p_module_bank->pp_children[0];
if( DeleteModule( p_next ) )
{
}
}
- vlc_object_destroy( p_this->p_libvlc->p_module_bank );
- p_this->p_libvlc->p_module_bank = NULL;
+ vlc_object_destroy( p_this->p_libvlc_global->p_module_bank );
+ p_this->p_libvlc_global->p_module_bank = NULL;
return;
}
{
vlc_value_t lockval;
- var_Create( p_this->p_libvlc, "libvlc", VLC_VAR_MUTEX );
- var_Get( p_this->p_libvlc, "libvlc", &lockval );
+ var_Create( p_this->p_libvlc_global, "libvlc", VLC_VAR_MUTEX );
+ var_Get( p_this->p_libvlc_global, "libvlc", &lockval );
vlc_mutex_lock( lockval.p_address );
- if( p_this->p_libvlc->p_module_bank->b_main )
+ if( p_this->p_libvlc_global->p_module_bank->b_main )
{
vlc_mutex_unlock( lockval.p_address );
- var_Destroy( p_this->p_libvlc, "libvlc" );
+ var_Destroy( p_this->p_libvlc_global, "libvlc" );
return;
}
- p_this->p_libvlc->p_module_bank->b_main = VLC_TRUE;
+ p_this->p_libvlc_global->p_module_bank->b_main = VLC_TRUE;
vlc_mutex_unlock( lockval.p_address );
- var_Destroy( p_this->p_libvlc, "libvlc" );
+ var_Destroy( p_this->p_libvlc_global, "libvlc" );
AllocateBuiltinModule( p_this, vlc_entry__main );
}
{
vlc_value_t lockval;
- var_Create( p_this->p_libvlc, "libvlc", VLC_VAR_MUTEX );
- var_Get( p_this->p_libvlc, "libvlc", &lockval );
+ var_Create( p_this->p_libvlc_global, "libvlc", VLC_VAR_MUTEX );
+ var_Get( p_this->p_libvlc_global, "libvlc", &lockval );
vlc_mutex_lock( lockval.p_address );
- if( p_this->p_libvlc->p_module_bank->b_builtins )
+ if( p_this->p_libvlc_global->p_module_bank->b_builtins )
{
vlc_mutex_unlock( lockval.p_address );
- var_Destroy( p_this->p_libvlc, "libvlc" );
+ var_Destroy( p_this->p_libvlc_global, "libvlc" );
return;
}
- p_this->p_libvlc->p_module_bank->b_builtins = VLC_TRUE;
+ p_this->p_libvlc_global->p_module_bank->b_builtins = VLC_TRUE;
vlc_mutex_unlock( lockval.p_address );
- var_Destroy( p_this->p_libvlc, "libvlc" );
+ var_Destroy( p_this->p_libvlc_global, "libvlc" );
msg_Dbg( p_this, "checking builtin modules" );
ALLOCATE_ALL_BUILTINS();
#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 );
+ var_Create( p_this->p_libvlc_global, "libvlc", VLC_VAR_MUTEX );
+ var_Get( p_this->p_libvlc_global, "libvlc", &lockval );
vlc_mutex_lock( lockval.p_address );
- if( p_this->p_libvlc->p_module_bank->b_plugins )
+ if( p_this->p_libvlc_global->p_module_bank->b_plugins )
{
vlc_mutex_unlock( lockval.p_address );
- var_Destroy( p_this->p_libvlc, "libvlc" );
+ var_Destroy( p_this->p_libvlc_global, "libvlc" );
return;
}
- p_this->p_libvlc->p_module_bank->b_plugins = VLC_TRUE;
+ p_this->p_libvlc_global->p_module_bank->b_plugins = VLC_TRUE;
vlc_mutex_unlock( lockval.p_address );
- var_Destroy( p_this->p_libvlc, "libvlc" );
+ var_Destroy( p_this->p_libvlc_global, "libvlc" );
msg_Dbg( p_this, "checking plugin modules" );
if( config_GetInt( p_this, "plugins-cache" ) )
- p_this->p_libvlc->p_module_bank->b_cache = VLC_TRUE;
+ p_this->p_libvlc_global->p_module_bank->b_cache = VLC_TRUE;
- if( p_this->p_libvlc->p_module_bank->b_cache ||
- p_this->p_libvlc->p_module_bank->b_cache_delete ) CacheLoad( p_this );
+ if( p_this->p_libvlc_global->p_module_bank->b_cache ||
+ p_this->p_libvlc_global->p_module_bank->b_cache_delete ) CacheLoad( p_this );
AllocateAllPlugins( p_this );
#endif
}
/* Test if we have the required CPU */
- if( (p_module->i_cpu & p_this->p_libvlc->i_cpu) != p_module->i_cpu )
+ if( (p_module->i_cpu & p_this->p_libvlc_global->i_cpu) != p_module->i_cpu )
{
continue;
}
if( !i_shortcuts && p_module->psz_program
&& !strcmp( psz_capability, "interface" )
&& !strcmp( p_module->psz_program,
- p_this->p_vlc->psz_object_name ) )
+ p_this->p_libvlc->psz_object_name ) )
{
if( !b_intf )
{
/* Store this new module */
p_list[ i_index ].p_module = p_module;
p_list[ i_index ].i_score = p_module->i_score + i_shortcut_bonus;
- p_list[ i_index ].b_force = !!i_shortcut_bonus;
+ p_list[ i_index ].b_force = i_shortcut_bonus && b_strict;
/* Add it to the modules-to-probe list */
if( i_index == 0 )
if( p_module != NULL )
{
- msg_Dbg( p_module, "using %s module \"%s\"",
+ msg_Dbg( p_this, "using %s module \"%s\"",
psz_capability, p_module->psz_object_name );
}
else if( p_first == NULL )
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" );
}
p_module->pf_deactivate( p_this );
}
- msg_Dbg( p_module, "unlocking module \"%s\"", p_module->psz_object_name );
+ msg_Dbg( p_this, "removing module \"%s\"", p_module->psz_object_name );
vlc_object_release( p_module );
{
if( !(*ppsz_path)[0] ) continue;
-#if defined( SYS_BEOS ) || defined( SYS_DARWIN ) || defined( WIN32 )
+#if defined( SYS_BEOS ) || defined( __APPLE__ ) || defined( WIN32 )
/* Handle relative as well as absolute paths */
#ifdef WIN32
#endif
{
int i_dirlen = strlen( *ppsz_path );
- i_dirlen += strlen( p_this->p_libvlc->psz_vlcpath ) + 2;
+ i_dirlen += strlen( p_this->p_libvlc_global->psz_vlcpath ) + 2;
psz_fullpath = malloc( i_dirlen );
if( psz_fullpath == NULL )
}
#ifdef WIN32
sprintf( psz_fullpath, "%s\\%s",
- p_this->p_libvlc->psz_vlcpath, *ppsz_path );
+ p_this->p_libvlc_global->psz_vlcpath, *ppsz_path );
#else
sprintf( psz_fullpath, "%s/%s",
- p_this->p_libvlc->psz_vlcpath, *ppsz_path );
+ p_this->p_libvlc_global->psz_vlcpath, *ppsz_path );
#endif
}
else
#endif
char * psz_file;
- if( p_this->p_vlc->b_die || i_maxdepth < 0 )
+ if( p_this->p_libvlc->b_die || i_maxdepth < 0 )
{
return;
}
sprintf( psz_path, "%s\\%s", psz_dir, finddata.cFileName );
#endif
- /* Skip ".", ".." and anything starting with "." */
- if( !*finddata.cFileName || *finddata.cFileName == '.' )
+ /* Skip ".", ".." */
+ if( !*finddata.cFileName || !strcmp( finddata.cFileName, "." )
+ || !strcmp( finddata.cFileName, ".." ) )
{
if( !FindNextFile( handle, &finddata ) ) break;
continue;
AllocatePluginFile( p_this, psz_file, i_time, i_size );
}
}
- while( !p_this->p_vlc->b_die && FindNextFile( handle, &finddata ) );
+ while( !p_this->p_libvlc->b_die && FindNextFile( handle, &finddata ) );
/* Close the directory */
FindClose( handle );
i_dirlen = strlen( psz_dir );
/* Parse the directory and try to load all files it contains. */
- while( !p_this->p_vlc->b_die && (file = readdir( dir )) )
+ while( !p_this->p_libvlc->b_die && (file = readdir( dir )) )
{
struct stat statbuf;
unsigned int i_len;
int i_stat;
- /* Skip ".", ".." and anything starting with "." */
- if( !*file->d_name || *file->d_name == '.' )
+ /* Skip ".", ".." */
+ if( !*file->d_name || !strcmp( file->d_name, "." )
+ || !strcmp( file->d_name, ".." ) )
{
continue;
}
/* msg_Dbg( p_this, "plugin \"%s\", %s",
p_module->psz_object_name, p_module->psz_longname ); */
- vlc_object_attach( p_module, p_this->p_libvlc->p_module_bank );
+ vlc_object_attach( p_module, p_this->p_libvlc_global->p_module_bank );
}
- if( !p_this->p_libvlc->p_module_bank->b_cache ) return 0;
+ if( !p_this->p_libvlc_global->p_module_bank->b_cache ) return 0;
/* Add entry to cache */
-#define p_bank p_this->p_libvlc->p_module_bank
+#define p_bank p_this->p_libvlc_global->p_module_bank
p_bank->pp_cache =
realloc( p_bank->pp_cache, (p_bank->i_cache + 1) * sizeof(void *) );
p_bank->pp_cache[p_bank->i_cache] = malloc( sizeof(module_cache_t) );
/* We need to fill these since they may be needed by CallEntry() */
p_module->psz_filename = psz_file;
p_module->handle = handle;
- p_module->p_symbols = &p_this->p_libvlc->p_module_bank->symbols;
+#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 */
/* msg_Dbg( p_this, "builtin \"%s\", %s",
p_module->psz_object_name, p_module->psz_longname ); */
- vlc_object_attach( p_module, p_this->p_libvlc->p_module_bank );
+ vlc_object_attach( p_module, p_this->p_libvlc_global->p_module_bank );
return 0;
}
{
/* With a well-written module we shouldn't have to print an
* additional error message here, but just make sure. */
- msg_Err( p_module, "failed calling symbol \"%s\" in file `%s'",
+ msg_Err( p_module, "Failed to call symbol \"%s\" in file `%s'",
psz_name, p_module->psz_filename );
return -1;
}
module_cache_t **pp_cache = 0;
int32_t i_file_size, i_marker;
- psz_homedir = p_this->p_vlc->psz_homedir;
+ psz_homedir = p_this->p_libvlc->psz_homedir;
if( !psz_homedir )
{
msg_Err( p_this, "psz_homedir is null" );
return;
}
- if( p_this->p_libvlc->p_module_bank->b_cache_delete )
+ if( p_this->p_libvlc_global->p_module_bank->b_cache_delete )
{
#if !defined( UNDER_CE )
unlink( psz_filename );
msg_Dbg( p_this, "loading plugins cache file %s", psz_filename );
- file = fopen( psz_filename, "rb" );
+ file = utf8_fopen( psz_filename, "rb" );
if( !file )
{
msg_Warn( p_this, "could not open plugins cache file %s for reading",
return;
}
- p_this->p_libvlc->p_module_bank->i_loaded_cache = 0;
+ p_this->p_libvlc_global->p_module_bank->i_loaded_cache = 0;
fread( &i_cache, sizeof(char), sizeof(i_cache), file );
if( i_cache )
- pp_cache = p_this->p_libvlc->p_module_bank->pp_loaded_cache =
+ pp_cache = p_this->p_libvlc_global->p_module_bank->pp_loaded_cache =
malloc( i_cache * sizeof(void *) );
#define LOAD_IMMEDIATE(a) \
int i_submodules;
pp_cache[i] = malloc( sizeof(module_cache_t) );
- p_this->p_libvlc->p_module_bank->i_loaded_cache++;
+ p_this->p_libvlc_global->p_module_bank->i_loaded_cache++;
/* Load common info */
LOAD_STRING( pp_cache[i]->psz_file );
msg_Warn( p_this, "plugins cache not loaded (corrupted)" );
/* TODO: cleanup */
- p_this->p_libvlc->p_module_bank->i_loaded_cache = 0;
+ p_this->p_libvlc_global->p_module_bank->i_loaded_cache = 0;
fclose( file );
return;
module_cache_t **pp_cache;
int32_t i_file_size = 0;
- psz_homedir = p_this->p_vlc->psz_homedir;
+ psz_homedir = p_this->p_libvlc->psz_homedir;
if( !psz_homedir )
{
msg_Err( p_this, "psz_homedir is null" );
strcat( psz_filename, "/CACHEDIR.TAG" );
- file = fopen( psz_filename, "wb" );
+ file = utf8_fopen( psz_filename, "wb" );
if( file )
{
fwrite( psz_tag, 1, strlen(psz_tag), file );
msg_Dbg( p_this, "saving plugins cache file %s", psz_filename );
- file = fopen( psz_filename, "wb" );
+ file = utf8_fopen( psz_filename, "wb" );
if( !file )
{
msg_Warn( p_this, "could not open plugins cache file %s for writing",
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;
+ i_cache = p_this->p_libvlc_global->p_module_bank->i_cache;
+ pp_cache = p_this->p_libvlc_global->p_module_bank->pp_cache;
fwrite( &i_cache, sizeof(char), sizeof(i_cache), file );
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;
- }
+ /* 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] );
return psz_cachename;
}
p_cache->pf_activate = p_module->pf_activate;
p_cache->pf_deactivate = p_module->pf_deactivate;
+#ifndef HAVE_SHARED_LIBVLC
p_cache->p_symbols = p_module->p_symbols;
+#endif
p_cache->handle = p_module->handle;
for( i_submodule = 0; i_submodule < p_module->i_children; i_submodule++ )
module_t *p_cchild = (module_t*)p_cache->pp_children[i_submodule];
p_cchild->pf_activate = p_child->pf_activate;
p_cchild->pf_deactivate = p_child->pf_deactivate;
+#ifndef HAVE_SHARED_LIBVLC
p_cchild->p_symbols = p_child->p_symbols;
+#endif
}
p_cache->b_loaded = VLC_TRUE;
module_cache_t **pp_cache;
int i_cache, i;
- pp_cache = p_this->p_libvlc->p_module_bank->pp_loaded_cache;
- i_cache = p_this->p_libvlc->p_module_bank->i_loaded_cache;
+ pp_cache = p_this->p_libvlc_global->p_module_bank->pp_loaded_cache;
+ i_cache = p_this->p_libvlc_global->p_module_bank->i_loaded_cache;
for( i = 0; i < i_cache; i++ )
{
projects / vlc / blobdiff