#include "modules/modules.h"
#include "config/configuration.h"
-#include <errno.h> /* ENOMEM */
#include <stdio.h> /* sprintf() */
#include <string.h>
#include <stdlib.h> /* free() */
/* Initialize mutexes */
vlc_mutex_init( &priv->timer_lock );
- vlc_cond_init( &priv->exiting );
return p_libvlc;
}
return VLC_EGENERIC;
}
- priv->i_verbose = config_GetInt( p_libvlc, "verbose" );
+ priv->i_verbose = var_InheritInteger( p_libvlc, "verbose" );
/* Announce who we are - Do it only for first instance ? */
msg_Dbg( p_libvlc, "%s", COPYRIGHT_MESSAGE );
msg_Dbg( p_libvlc, "libvlc was configured with %s", CONFIGURE_LINE );
msg_Dbg( p_libvlc, "translation test: code is \"%s\"", _("C") );
/* Check for short help option */
- if( config_GetInt( p_libvlc, "help" ) > 0 )
+ if( var_InheritBool( p_libvlc, "help" ) )
{
Help( p_libvlc, "help" );
b_exit = true;
i_ret = VLC_EEXITSUCCESS;
}
/* Check for version option */
- else if( config_GetInt( p_libvlc, "version" ) > 0 )
+ else if( var_InheritBool( p_libvlc, "version" ) )
{
Version();
b_exit = true;
}
/* Check for plugins cache options */
- bool b_cache_delete = config_GetInt( p_libvlc, "reset-plugins-cache" ) > 0;
+ bool b_cache_delete = var_InheritBool( p_libvlc, "reset-plugins-cache" );
/* Check for daemon mode */
#ifndef WIN32
- if( config_GetInt( p_libvlc, "daemon" ) > 0 )
+ if( var_InheritBool( p_libvlc, "daemon" ) )
{
#ifdef HAVE_DAEMON
char *psz_pidfile = NULL;
b_daemon = true;
/* lets check if we need to write the pidfile */
- psz_pidfile = config_GetPsz( p_libvlc, "pidfile" );
+ psz_pidfile = var_CreateGetNonEmptyString( p_libvlc, "pidfile" );
if( psz_pidfile != NULL )
{
FILE *pidfile;
/* This ain't really nice to have to reload the config here but it seems
* the only way to do it. */
- if( !config_GetInt( p_libvlc, "ignore-config" ) )
+ if( !var_InheritBool( p_libvlc, "ignore-config" ) )
config_LoadConfigFile( p_libvlc, "main" );
config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, true );
- priv->i_verbose = config_GetInt( p_libvlc, "verbose" );
+ priv->i_verbose = var_InheritInteger( p_libvlc, "verbose" );
/* Check if the user specified a custom language */
- psz_language = config_GetPsz( p_libvlc, "language" );
- if( psz_language && *psz_language && strcmp( psz_language, "auto" ) )
+ psz_language = var_CreateGetNonEmptyString( p_libvlc, "language" );
+ if( psz_language && strcmp( psz_language, "auto" ) )
{
/* Reset the default domain */
SetLanguage( psz_language );
module_EndBank( p_libvlc, false );
module_InitBank( p_libvlc );
- if( !config_GetInt( p_libvlc, "ignore-config" ) )
+ if( !var_InheritBool( p_libvlc, "ignore-config" ) )
config_LoadConfigFile( p_libvlc, "main" );
config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, true );
- priv->i_verbose = config_GetInt( p_libvlc, "verbose" );
+ priv->i_verbose = var_InheritInteger( p_libvlc, "verbose" );
}
free( psz_language );
# endif
msg_Dbg( p_libvlc, "module bank initialized (%zu modules)", module_count );
/* Check for help on modules */
- if( (p_tmp = config_GetPsz( p_libvlc, "module" )) )
+ if( (p_tmp = var_InheritString( p_libvlc, "module" )) )
{
Help( p_libvlc, p_tmp );
free( p_tmp );
i_ret = VLC_EEXITSUCCESS;
}
/* Check for full help option */
- else if( config_GetInt( p_libvlc, "full-help" ) > 0 )
+ else if( var_InheritBool( p_libvlc, "full-help" ) )
{
config_PutInt( p_libvlc, "advanced", 1);
config_PutInt( p_libvlc, "help-verbose", 1);
i_ret = VLC_EEXITSUCCESS;
}
/* Check for long help option */
- else if( config_GetInt( p_libvlc, "longhelp" ) > 0 )
+ else if( var_InheritBool( p_libvlc, "longhelp" ) )
{
Help( p_libvlc, "longhelp" );
b_exit = true;
i_ret = VLC_EEXITSUCCESS;
}
/* Check for module list option */
- else if( config_GetInt( p_libvlc, "list" ) > 0 )
+ else if( var_InheritBool( p_libvlc, "list" ) )
{
ListModules( p_libvlc, false );
b_exit = true;
i_ret = VLC_EEXITSUCCESS;
}
- else if( config_GetInt( p_libvlc, "list-verbose" ) > 0 )
+ else if( var_InheritBool( p_libvlc, "list-verbose" ) )
{
ListModules( p_libvlc, true );
b_exit = true;
}
/* Check for config file options */
- if( !config_GetInt( p_libvlc, "ignore-config" ) )
+ if( !var_InheritBool( p_libvlc, "ignore-config" ) )
{
- if( config_GetInt( p_libvlc, "reset-config" ) > 0 )
+ if( var_InheritBool( p_libvlc, "reset-config" ) )
{
config_ResetAll( p_libvlc );
config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, true );
config_SaveConfigFile( p_libvlc, NULL );
}
- if( config_GetInt( p_libvlc, "save-config" ) > 0 )
- {
- config_LoadConfigFile( p_libvlc, NULL );
- config_LoadCmdLine( p_libvlc, &i_argc, ppsz_argv, true );
- config_SaveConfigFile( p_libvlc, NULL );
- }
+ }
+
+ if( module_count <= 1)
+ {
+ msg_Err( p_libvlc, "No modules were found, refusing to start. Check "
+ "that you properly gave a module path with --plugin-path.");
+ b_exit = true;
+ i_ret = VLC_ENOITEM;
}
if( b_exit )
/*
* Override default configuration with config file settings
*/
- if( !config_GetInt( p_libvlc, "ignore-config" ) )
+ if( !var_InheritBool( p_libvlc, "ignore-config" ) )
config_LoadConfigFile( p_libvlc, NULL );
/*
module_EndBank( p_libvlc, true );
return VLC_EGENERIC;
}
- priv->i_verbose = config_GetInt( p_libvlc, "verbose" );
+ priv->i_verbose = var_InheritInteger( p_libvlc, "verbose" );
/*
* System specific configuration
#ifdef HAVE_DBUS
dbus_threads_init_default();
- if( config_GetInt( p_libvlc, "one-instance" ) > 0
- || ( config_GetInt( p_libvlc, "one-instance-when-started-from-file" )
- && config_GetInt( p_libvlc, "started-from-file" ) ) )
+ if( var_InheritBool( p_libvlc, "one-instance" )
+ || ( var_InheritBool( p_libvlc, "one-instance-when-started-from-file" )
+ && var_InheritBool( p_libvlc, "started-from-file" ) ) )
{
/* Initialise D-Bus interface, check for other instances */
DBusConnection *p_conn = NULL;
exit( 1 );
}
b_play = TRUE;
- if( config_GetInt( p_libvlc, "playlist-enqueue" ) > 0 )
+ if( var_InheritBool( p_libvlc, "playlist-enqueue" ) )
b_play = FALSE;
if ( !dbus_message_iter_append_basic( &dbus_args,
DBUS_TYPE_BOOLEAN, &b_play ) )
/*
* Message queue options
*/
- char * psz_verbose_objects = config_GetPsz( p_libvlc, "verbose-objects" );
+ char * psz_verbose_objects = var_CreateGetNonEmptyString( p_libvlc, "verbose-objects" );
if( psz_verbose_objects )
{
char * psz_object, * iter = psz_verbose_objects;
/* Last chance to set the verbosity. Once we start interfaces and other
* threads, verbosity becomes read-only. */
var_Create( p_libvlc, "verbose", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- if( config_GetInt( p_libvlc, "quiet" ) > 0 )
+ if( var_InheritBool( p_libvlc, "quiet" ) )
{
var_SetInteger( p_libvlc, "verbose", -1 );
priv->i_verbose = -1;
vlc_threads_setup( p_libvlc );
if( priv->b_color )
- priv->b_color = config_GetInt( p_libvlc, "color" ) > 0;
+ priv->b_color = var_InheritBool( p_libvlc, "color" );
char p_capabilities[200];
#define PRINT_CAPABILITY( capability, string ) \
p_capabilities[0] = '\0';
#if defined( __i386__ ) || defined( __x86_64__ )
- if( !config_GetInt( p_libvlc, "mmx" ) )
+ if( !var_InheritBool( p_libvlc, "mmx" ) )
cpu_flags &= ~CPU_CAPABILITY_MMX;
- if( !config_GetInt( p_libvlc, "3dn" ) )
+ if( !var_InheritBool( p_libvlc, "3dn" ) )
cpu_flags &= ~CPU_CAPABILITY_3DNOW;
- if( !config_GetInt( p_libvlc, "mmxext" ) )
+ if( !var_InheritBool( p_libvlc, "mmxext" ) )
cpu_flags &= ~CPU_CAPABILITY_MMXEXT;
- if( !config_GetInt( p_libvlc, "sse" ) )
+ if( !var_InheritBool( p_libvlc, "sse" ) )
cpu_flags &= ~CPU_CAPABILITY_SSE;
- if( !config_GetInt( p_libvlc, "sse2" ) )
+ if( !var_InheritBool( p_libvlc, "sse2" ) )
cpu_flags &= ~CPU_CAPABILITY_SSE2;
- if( !config_GetInt( p_libvlc, "sse3" ) )
+ if( !var_InheritBool( p_libvlc, "sse3" ) )
cpu_flags &= ~CPU_CAPABILITY_SSE3;
+ if( !var_InheritBool( p_libvlc, "ssse3" ) )
+ cpu_flags &= ~CPU_CAPABILITY_SSSE3;
+ if( !var_InheritBool( p_libvlc, "sse41" ) )
+ cpu_flags &= ~CPU_CAPABILITY_SSE4_1;
+ if( !var_InheritBool( p_libvlc, "sse42" ) )
+ cpu_flags &= ~CPU_CAPABILITY_SSE4_2;
PRINT_CAPABILITY( CPU_CAPABILITY_MMX, "MMX" );
PRINT_CAPABILITY( CPU_CAPABILITY_3DNOW, "3DNow!" );
PRINT_CAPABILITY( CPU_CAPABILITY_SSE, "SSE" );
PRINT_CAPABILITY( CPU_CAPABILITY_SSE2, "SSE2" );
PRINT_CAPABILITY( CPU_CAPABILITY_SSE3, "SSE3" );
+ PRINT_CAPABILITY( CPU_CAPABILITY_SSSE3, "SSSE3" );
+ PRINT_CAPABILITY( CPU_CAPABILITY_SSE4_1, "SSE4.1" );
+ PRINT_CAPABILITY( CPU_CAPABILITY_SSE4_2, "SSE4.2" );
+ PRINT_CAPABILITY( CPU_CAPABILITY_SSE4A, "SSE4A" );
#elif defined( __powerpc__ ) || defined( __ppc__ ) || defined( __ppc64__ )
- if( !config_GetInt( p_libvlc, "altivec" ) )
+ if( !var_InheritBool( p_libvlc, "altivec" ) )
cpu_flags &= ~CPU_CAPABILITY_ALTIVEC;
PRINT_CAPABILITY( CPU_CAPABILITY_ALTIVEC, "AltiVec" );
p_capabilities[sizeof(p_capabilities) - 1] = '\0';
#endif
- msg_Dbg( p_libvlc, "CPU has capabilities %s", p_capabilities );
+ if (p_capabilities[0])
+ msg_Dbg( p_libvlc, "CPU has capabilities %s", p_capabilities );
/*
* Choose the best memcpy module
/* Avoid being called "memcpy":*/
vlc_object_set_name( p_libvlc, "main" );
- priv->b_stats = config_GetInt( p_libvlc, "stats" ) > 0;
+ priv->b_stats = var_InheritBool( p_libvlc, "stats" );
priv->i_timers = 0;
priv->pp_timers = NULL;
/*
* Initialize hotkey handling
*/
- var_Create( p_libvlc, "key-pressed", VLC_VAR_INTEGER );
- var_Create( p_libvlc, "key-action", VLC_VAR_INTEGER );
- {
- struct hotkey *p_keys =
- malloc( (libvlc_actions_count + 1) * sizeof (*p_keys) );
-
- /* Initialize from configuration */
- for( size_t i = 0; i < libvlc_actions_count; i++ )
- {
- p_keys[i].psz_action = libvlc_actions[i].name;
- p_keys[i].i_key = config_GetInt( p_libvlc,
- libvlc_actions[i].name );
- p_keys[i].i_action = libvlc_actions[i].value;
- }
- p_keys[libvlc_actions_count].psz_action = NULL;
- p_keys[libvlc_actions_count].i_key = 0;
- p_keys[libvlc_actions_count].i_action = 0;
- p_libvlc->p_hotkeys = p_keys;
- var_AddCallback( p_libvlc, "key-pressed", vlc_key_to_action,
- p_keys );
- }
+ vlc_InitActions( p_libvlc );
/* variables for signalling creation of new files */
var_Create( p_libvlc, "snapshot-file", VLC_VAR_STRING );
vlc_object_attach( p_playlist, p_libvlc );
/* Add service discovery modules */
- psz_modules = config_GetPsz( p_playlist, "services-discovery" );
- if( psz_modules && *psz_modules )
+ psz_modules = var_CreateGetNonEmptyString( p_playlist, "services-discovery" );
+ if( psz_modules )
{
char *p = psz_modules, *m;
while( ( m = strsep( &p, " :," ) ) != NULL )
#ifdef ENABLE_VLM
/* Initialize VLM if vlm-conf is specified */
- psz_parser = config_GetPsz( p_libvlc, "vlm-conf" );
- if( psz_parser && *psz_parser )
+ psz_parser = var_CreateGetNonEmptyString( p_libvlc, "vlm-conf" );
+ if( psz_parser )
{
priv->p_vlm = vlm_New( p_libvlc );
if( !priv->p_vlm )
*/
/* Create volume callback system. (this variable must be created before
all interfaces as they can use it) */
- var_Create( p_libvlc, "volume-change", VLC_VAR_BOOL );
+ var_Create( p_libvlc, "volume-change", VLC_VAR_VOID );
+ var_Create( p_libvlc, "volume-muted", VLC_VAR_BOOL );
- psz_modules = config_GetPsz( p_libvlc, "extraintf" );
- psz_control = config_GetPsz( p_libvlc, "control" );
+ psz_modules = var_CreateGetNonEmptyString( p_libvlc, "extraintf" );
+ psz_control = var_CreateGetNonEmptyString( p_libvlc, "control" );
- if( psz_modules && *psz_modules && psz_control && *psz_control )
+ if( psz_modules && psz_control )
{
char* psz_tmp;
if( asprintf( &psz_tmp, "%s:%s", psz_modules, psz_control ) != -1 )
psz_modules = psz_tmp;
}
}
- else if( psz_control && *psz_control )
+ else if( psz_control )
{
free( psz_modules );
psz_modules = strdup( psz_control );
#ifdef HAVE_DBUS
/* loads dbus control interface if in one-instance mode
* we do it only when playlist exists, because dbus module needs it */
- if( config_GetInt( p_libvlc, "one-instance" ) > 0
- || ( config_GetInt( p_libvlc, "one-instance-when-started-from-file" )
- && config_GetInt( p_libvlc, "started-from-file" ) ) )
+ if( var_InheritBool( p_libvlc, "one-instance" )
+ || ( var_InheritBool( p_libvlc, "one-instance-when-started-from-file" )
+ && var_InheritBool( p_libvlc, "started-from-file" ) ) )
intf_Create( p_libvlc, "dbus,none" );
# if !defined (HAVE_MAEMO)
/* Prevents the power management daemon from suspending the system
* when VLC is active */
- if( config_GetInt( p_libvlc, "inhibit" ) > 0 )
+ if( var_InheritBool( p_libvlc, "inhibit" ) > 0 )
intf_Create( p_libvlc, "inhibit,none" );
# endif
#endif
- if( (config_GetInt( p_libvlc, "file-logging" ) > 0) &&
- !config_GetInt( p_libvlc, "syslog" ) )
+ if( var_InheritBool( p_libvlc, "file-logging" ) &&
+ !var_InheritBool( p_libvlc, "syslog" ) )
{
intf_Create( p_libvlc, "logger,none" );
}
#ifdef HAVE_SYSLOG_H
- if( config_GetInt( p_libvlc, "syslog" ) > 0 )
+ if( var_InheritBool( p_libvlc, "syslog" ) )
{
- char *logmode = var_CreateGetString( p_libvlc, "logmode" );
+ char *logmode = var_CreateGetNonEmptyString( p_libvlc, "logmode" );
var_SetString( p_libvlc, "logmode", "syslog" );
intf_Create( p_libvlc, "logger,none" );
var_SetString( p_libvlc, "logmode", logmode );
free( logmode );
}
- else
- var_Destroy( p_libvlc, "logmode" );
+ var_Destroy( p_libvlc, "logmode" );
}
#endif
- if( config_GetInt( p_libvlc, "network-synchronisation") > 0 )
+ if( var_InheritBool( p_libvlc, "network-synchronisation") )
{
intf_Create( p_libvlc, "netsync,none" );
}
#ifdef WIN32
- if( config_GetInt( p_libvlc, "prefer-system-codecs") > 0 )
+ if( var_InheritBool( p_libvlc, "prefer-system-codecs") )
{
- char *psz_codecs = config_GetPsz( p_playlist, "codec" );
+ char *psz_codecs = var_CreateGetNonEmptyString( p_playlist, "codec" );
if( psz_codecs )
{
char *psz_morecodecs;
if( asprintf(&psz_morecodecs, "%s,dmo,quicktime", psz_codecs) != -1 )
{
- config_PutPsz( p_libvlc, "codec", psz_morecodecs);
+ var_SetString( p_libvlc, "codec", psz_morecodecs);
free( psz_morecodecs );
}
+ free( psz_codecs );
}
else
- config_PutPsz( p_libvlc, "codec", "dmo,quicktime");
- free( psz_codecs );
+ var_SetString( p_libvlc, "codec", "dmo,quicktime");
}
#endif
/*
* Get --open argument
*/
- psz_val = var_CreateGetString( p_libvlc, "open" );
- if ( psz_val != NULL && *psz_val )
+ psz_val = var_CreateGetNonEmptyString( p_libvlc, "open" );
+ if ( psz_val != NULL )
{
playlist_t *p_playlist = pl_Hold( p_libvlc );
playlist_AddExt( p_playlist, psz_val, NULL, PLAYLIST_INSERT, 0,
if( b_daemon )
{
- psz_pidfile = config_GetPsz( p_libvlc, "pidfile" );
+ psz_pidfile = var_CreateGetNonEmptyString( p_libvlc, "pidfile" );
if( psz_pidfile != NULL )
{
msg_Dbg( p_libvlc, "removing pid file %s", psz_pidfile );
/* Free module bank. It is refcounted, so we call this each time */
module_EndBank( p_libvlc, true );
- var_DelCallback( p_libvlc, "key-pressed", vlc_key_to_action,
- (void *)p_libvlc->p_hotkeys );
- free( (void *)p_libvlc->p_hotkeys );
+ vlc_DeinitActions( p_libvlc );
}
/**
msg_Destroy( p_libvlc );
/* Destroy mutexes */
- vlc_cond_destroy( &priv->exiting );
vlc_mutex_destroy( &priv->timer_lock );
#ifndef NDEBUG /* Hack to dump leaked objects tree */
if( !psz_module ) /* requesting the default interface */
{
- char *psz_interface = config_GetPsz( p_libvlc, "intf" );
- if( !psz_interface || !*psz_interface ) /* "intf" has not been set */
+ char *psz_interface = var_CreateGetNonEmptyString( p_libvlc, "intf" );
+ if( !psz_interface ) /* "intf" has not been set */
{
#ifndef WIN32
if( b_daemon )
"Use 'cvlc' to use vlc without interface.") );
}
free( psz_interface );
+ var_Destroy( p_libvlc, "intf" );
}
/* Try to create the interface */
- if( intf_Create( p_libvlc, psz_module ? psz_module : "$intf" ) )
- {
+ int ret = intf_Create( p_libvlc, psz_module ? psz_module : "$intf" );
+ if( ret )
msg_Err( p_libvlc, "interface \"%s\" initialization failed",
psz_module ? psz_module : "default" );
- return VLC_EGENERIC;
- }
- return VLC_SUCCESS;
+ return ret;
}
+#ifndef WIN32
static vlc_mutex_t exit_lock = VLC_STATIC_MUTEX;
+static vlc_cond_t exiting = VLC_STATIC_COND;
+#else
+extern vlc_mutex_t super_mutex;
+extern vlc_cond_t super_variable;
+# define exit_lock super_mutex
+# define exiting super_variable
+#endif
/**
* Waits until the LibVLC instance gets an exit signal. Normally, this happens
*/
void libvlc_InternalWait( libvlc_int_t *p_libvlc )
{
- libvlc_priv_t *priv = libvlc_priv( p_libvlc );
-
vlc_mutex_lock( &exit_lock );
while( vlc_object_alive( p_libvlc ) )
- vlc_cond_wait( &priv->exiting, &exit_lock );
+ vlc_cond_wait( &exiting, &exit_lock );
vlc_mutex_unlock( &exit_lock );
}
*/
void libvlc_Quit( libvlc_int_t *p_libvlc )
{
- libvlc_priv_t *priv = libvlc_priv( p_libvlc );
-
vlc_mutex_lock( &exit_lock );
vlc_object_kill( p_libvlc );
- vlc_cond_signal( &priv->exiting );
+ vlc_cond_broadcast( &exiting );
vlc_mutex_unlock( &exit_lock );
}
static const char psz_path[] = LOCALEDIR;
#else
char psz_path[1024];
- if (snprintf (psz_path, sizeof (psz_path), "%s" DIR_SEP "%s",
- config_GetDataDir(), "locale")
- >= (int)sizeof (psz_path))
- return -1;
+ char *datadir = config_GetDataDirDefault();
+ int ret;
+ if (unlikely(datadir == NULL))
+ return -1;
+ ret = snprintf (psz_path, sizeof (psz_path), "%s" DIR_SEP "locale",
+ datadir);
+ free (datadir);
+ if (ret >= (int)sizeof (psz_path))
+ return -1;
#endif
if (bindtextdomain (PACKAGE_NAME, psz_path) == NULL)
{
char psz_short[4];
int i_width = ConsoleWidth() - (PADDING_SPACES+LINE_START+1);
int i_width_description = i_width + PADDING_SPACES - 1;
- bool b_advanced = config_GetInt( p_this, "advanced" ) > 0;
- bool b_description = config_GetInt( p_this, "help-verbose" ) > 0;
+ bool b_advanced = var_InheritBool( p_this, "advanced" );
+ bool b_description = var_InheritBool( p_this, "help-verbose" );
bool b_description_hack;
- bool b_color = config_GetInt( p_this, "color" ) > 0;
+ bool b_color = var_InheritBool( p_this, "color" );
bool b_has_advanced = false;
bool b_found = false;
int i_only_advanced = 0; /* Number of modules ignored because they
{
module_t *p_parser;
- bool b_color = config_GetInt( p_this, "color" ) > 0;
+ bool b_color = var_InheritBool( p_this, "color" );
#ifdef WIN32
ShowConsole( true );
+ b_color = false; // don't put color control codes in a .txt file
+#else
+ if( !isatty( 1 ) )
+ b_color = false;
#endif
/* List all modules */
utf8_fprintf( stdout, _("VLC version %s (%s)\n"), VLC_Version(),
psz_vlc_changeset );
- utf8_fprintf( stdout, _("Compiled by %s@%s.%s\n"),
- VLC_CompileBy(), VLC_CompileHost(), VLC_CompileDomain() );
+ utf8_fprintf( stdout, _("Compiled by %s on %s (%s)\n"),
+ VLC_CompileBy(), VLC_CompileHost(), __DATE__" "__TIME__ );
utf8_fprintf( stdout, _("Compiler: %s\n"), VLC_Compiler() );
utf8_fprintf( stdout, "%s", LICENSE_MSG );
projects / vlc / blobdiff