#include "modules/modules.h"
#include "config/configuration.h"
-#include <errno.h> /* ENOMEM */
#include <stdio.h> /* sprintf() */
#include <string.h>
#include <stdlib.h> /* free() */
# include <locale.h>
#endif
-#ifdef ENABLE_NLS
-# include <libintl.h> /* bindtextdomain */
-#endif
-
#ifdef HAVE_DBUS
/* used for one-instance mode */
# include <dbus/dbus.h>
( defined( HAVE_GETTEXT ) || defined( HAVE_INCLUDED_GETTEXT ) )
static void SetLanguage ( char const * );
#endif
-static inline int LoadMessages (void);
static int GetFilenames ( libvlc_int_t *, int, const char *[] );
static void Help ( libvlc_int_t *, char const *psz_help_name );
static void Usage ( libvlc_int_t *, char const *psz_search );
priv->p_vlm = NULL;
/* Initialize message queue */
- msg_Create( p_libvlc );
+ priv->msg_bank = msg_Create ();
+ if (unlikely(priv->msg_bank == NULL))
+ goto error;
/* Find verbosity from VLC_VERBOSE environment variable */
psz_env = getenv( "VLC_VERBOSE" );
/* Initialize mutexes */
vlc_mutex_init( &priv->timer_lock );
- vlc_cond_init( &priv->exiting );
return p_libvlc;
+error:
+ vlc_object_release (p_libvlc);
+ return NULL;
}
/**
/*
* Support for gettext
*/
- LoadMessages ();
+ vlc_bindtextdomain (PACKAGE_NAME);
/* Initialize the module bank and load the configuration of the
* main module. We need to do this at this stage to be able to display
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;
i_ret = VLC_EEXITSUCCESS;
}
- /* Check for plugins cache options */
- bool b_cache_delete = config_GetInt( p_libvlc, "reset-plugins-cache" ) > 0;
-
/* 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;
#if defined( ENABLE_NLS ) \
&& ( defined( HAVE_GETTEXT ) || defined( HAVE_INCLUDED_GETTEXT ) )
# if defined (WIN32) || defined (__APPLE__)
- /* 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 );
/* Translate "C" to the language code: "fr", "en_GB", "nl", "ru"... */
msg_Dbg( p_libvlc, "translation test: code is \"%s\"", _("C") );
-
- module_EndBank( p_libvlc, false );
- module_InitBank( p_libvlc );
- if( !config_GetInt( 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" );
}
free( psz_language );
# endif
* list of configuration options exported by each module and loads their
* default values.
*/
- module_LoadPlugins( p_libvlc, b_cache_delete );
+ module_LoadPlugins( p_libvlc );
if( p_libvlc->b_die )
{
b_exit = true;
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);
+ var_Create( p_libvlc, "advanced", VLC_VAR_BOOL );
+ var_SetBool( p_libvlc, "advanced", true );
+ var_Create( p_libvlc, "help-verbose", VLC_VAR_BOOL );
+ var_SetBool( p_libvlc, "help-verbose", true );
Help( p_libvlc, "full-help" );
b_exit = true;
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 )
{
module_EndBank( p_libvlc, true );
/*
* 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 );
module_EndBank( p_libvlc, true );
return VLC_EGENERIC;
}
- playlist_Activate( p_playlist );
- 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_InheritString( p_libvlc, "services-discovery" );
+ if( psz_modules )
{
char *p = psz_modules, *m;
+ playlist_t *p_playlist = pl_Hold( p_libvlc );
while( ( m = strsep( &p, " :," ) ) != NULL )
playlist_ServicesDiscoveryAdd( p_playlist, m );
+ free( psz_modules );
+ pl_Release (p_libvlc);
}
- free( psz_modules );
#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_libvlc, "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_InheritString( 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,
-1, 0, NULL, 0, true, pl_Unlocked );
pl_Release( p_libvlc );
+ free( psz_val );
}
- free( psz_val );
return VLC_SUCCESS;
}
void libvlc_InternalCleanup( libvlc_int_t *p_libvlc )
{
libvlc_priv_t *priv = libvlc_priv (p_libvlc);
- playlist_t *p_playlist = priv->p_playlist;
+ playlist_t *p_playlist = libvlc_priv (p_libvlc)->p_playlist;
/* Deactivate the playlist */
msg_Dbg( p_libvlc, "deactivating the playlist" );
- playlist_Deactivate( p_playlist );
+ pl_Deactivate( p_libvlc );
/* Remove all services discovery */
msg_Dbg( p_libvlc, "removing all services discovery tasks" );
}
#endif
- /* Free playlist */
- /* Any thread still running must not assume pl_Hold() succeeds. */
+ /* Free playlist now */
msg_Dbg( p_libvlc, "removing playlist" );
-
- libvlc_priv(p_libvlc)->p_playlist = NULL;
- barrier(); /* FIXME is that correct ? */
-
vlc_object_release( p_playlist );
stats_TimersDumpAll( p_libvlc );
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 );
}
/**
}
vlc_mutex_unlock( &global_lock );
- msg_Destroy( p_libvlc );
+ msg_Destroy (priv->msg_bank);
/* 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 );
}
}
#endif
-
-static inline int LoadMessages (void)
-{
-#if defined( ENABLE_NLS ) \
- && ( defined( HAVE_GETTEXT ) || defined( HAVE_INCLUDED_GETTEXT ) )
- /* Specify where to find the locales for current domain */
-#if !defined( __APPLE__ ) && !defined( WIN32 ) && !defined( SYS_BEOS )
- 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;
-
-#endif
- if (bindtextdomain (PACKAGE_NAME, psz_path) == NULL)
- {
- fprintf (stderr, "Warning: cannot bind text domain "PACKAGE_NAME
- " to directory %s\n", psz_path);
- return -1;
- }
-
- /* LibVLC wants all messages in UTF-8.
- * Unfortunately, we cannot ask UTF-8 for strerror_r(), strsignal_r()
- * and other functions that are not part of our text domain.
- */
- if (bind_textdomain_codeset (PACKAGE_NAME, "UTF-8") == NULL)
- {
- fprintf (stderr, "Error: cannot set Unicode encoding for text domain "
- PACKAGE_NAME"\n");
- // Unbinds the text domain to avoid broken encoding
- bindtextdomain (PACKAGE_NAME, "DOES_NOT_EXIST");
- return -1;
- }
-
- /* LibVLC does NOT set the default textdomain, since it is a library.
- * This could otherwise break programs using LibVLC (other than VLC).
- * textdomain (PACKAGE_NAME);
- */
-#endif
- return 0;
-}
-
/*****************************************************************************
* GetFilenames: parse command line options which are not flags
*****************************************************************************
# define CYAN COL(36)
# define WHITE COL(0)
# define GRAY "\033[0m"
-static void print_help_section( module_config_t *p_item, bool b_color, bool b_description )
+static void
+print_help_section( const module_t *m, const module_config_t *p_item,
+ bool b_color, bool b_description )
{
if( !p_item ) return;
if( b_color )
{
- utf8_fprintf( stdout, RED" %s:\n"GRAY, _( p_item->psz_text ) );
- if( b_description && p_item->psz_longtext )
+ utf8_fprintf( stdout, RED" %s:\n"GRAY,
+ module_gettext( m, p_item->psz_text ) );
+ if( b_description && p_item->psz_longtext && *p_item->psz_longtext )
utf8_fprintf( stdout, MAGENTA" %s\n"GRAY,
- _( p_item->psz_longtext ) );
+ module_gettext( m, p_item->psz_longtext ) );
}
else
{
- utf8_fprintf( stdout, " %s:\n", _( p_item->psz_text ) );
- if( b_description && p_item->psz_longtext )
- utf8_fprintf( stdout, " %s\n", _( p_item->psz_longtext ) );
+ utf8_fprintf( stdout, " %s:\n",
+ module_gettext( m, p_item->psz_text ) );
+ if( b_description && p_item->psz_longtext && *p_item->psz_longtext )
+ utf8_fprintf( stdout, " %s\n",
+ module_gettext(m, p_item->psz_longtext ) );
}
}
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
{
if( b_color )
utf8_fprintf( stdout, "\n " GREEN "%s" GRAY " (%s)\n",
- _( p_parser->psz_longname ),
+ module_gettext( p_parser, p_parser->psz_longname ),
p_parser->psz_object_name );
else
- utf8_fprintf( stdout, "\n %s\n", _( p_parser->psz_longname ) );
+ utf8_fprintf( stdout, "\n %s\n",
+ module_gettext(p_parser, p_parser->psz_longname ) );
}
if( p_parser->psz_help )
{
if( b_color )
utf8_fprintf( stdout, CYAN" %s\n"GRAY,
- _( p_parser->psz_help ) );
+ module_gettext( p_parser, p_parser->psz_help ) );
else
- utf8_fprintf( stdout, " %s\n", _( p_parser->psz_help ) );
+ utf8_fprintf( stdout, " %s\n",
+ module_gettext( p_parser, p_parser->psz_help ) );
}
/* Print module options */
{
if( b_color )
utf8_fprintf( stdout, GREEN "\n %s\n" GRAY,
- _( p_item->psz_text ) );
+ module_gettext( p_parser, p_item->psz_text ) );
else
utf8_fprintf( stdout, "\n %s\n",
- _( p_item->psz_text ) );
+ module_gettext( p_parser, p_item->psz_text ) );
}
- if( b_description && p_item->psz_longtext )
+ if( b_description && p_item->psz_longtext
+ && *p_item->psz_longtext )
{
if( b_color )
utf8_fprintf( stdout, CYAN " %s\n" GRAY,
- _( p_item->psz_longtext ) );
+ module_gettext( p_parser, p_item->psz_longtext ) );
else
utf8_fprintf( stdout, " %s\n",
- _( p_item->psz_longtext ) );
+ module_gettext( p_parser, p_item->psz_longtext ) );
}
break;
case CONFIG_ITEM_MODULE_LIST_CAT:
case CONFIG_ITEM_FONT:
case CONFIG_ITEM_PASSWORD:
- print_help_section( p_section, b_color, b_description );
+ print_help_section( p_parser, p_section, b_color,
+ b_description );
p_section = NULL;
psz_bra = OPTION_VALUE_SEP "<";
psz_type = _("string");
break;
case CONFIG_ITEM_INTEGER:
case CONFIG_ITEM_KEY: /* FIXME: do something a bit more clever */
- print_help_section( p_section, b_color, b_description );
+ print_help_section( p_parser, p_section, b_color,
+ b_description );
p_section = NULL;
psz_bra = OPTION_VALUE_SEP "<";
psz_type = _("integer");
if( i ) strcat( psz_buffer, ", " );
sprintf( psz_buffer + strlen(psz_buffer), "%i (%s)",
p_item->pi_list[i],
- _( p_item->ppsz_list_text[i] ) );
+ module_gettext( p_parser, p_item->ppsz_list_text[i] ) );
}
psz_ket = "}";
}
break;
case CONFIG_ITEM_FLOAT:
- print_help_section( p_section, b_color, b_description );
+ print_help_section( p_parser, p_section, b_color,
+ b_description );
p_section = NULL;
psz_bra = OPTION_VALUE_SEP "<";
psz_type = _("float");
}
break;
case CONFIG_ITEM_BOOL:
- print_help_section( p_section, b_color, b_description );
+ print_help_section( p_parser, p_section, b_color,
+ b_description );
p_section = NULL;
psz_bra = ""; psz_type = ""; psz_ket = "";
if( !b_help_module )
psz_spaces[i] = ' ';
/* We wrap the rest of the output */
- sprintf( psz_buffer, "%s%s", _( p_item->psz_text ),
+ sprintf( psz_buffer, "%s%s", module_gettext( p_parser, p_item->psz_text ),
psz_suf );
b_description_hack = b_description;
}
}
- if( b_description_hack && p_item->psz_longtext )
+ if( b_description_hack && p_item->psz_longtext
+ && *p_item->psz_longtext )
{
- sprintf( psz_buffer, "%s%s", _( p_item->psz_longtext ),
+ sprintf( psz_buffer, "%s%s",
+ module_gettext( p_parser, p_item->psz_longtext ),
psz_suf );
b_description_hack = false;
psz_spaces = psz_spaces_longtext;
{
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 */
/* Enumerate each module */
for (size_t j = 0; (p_parser = list[j]) != NULL; j++)
{
- int i;
-
if( b_color )
utf8_fprintf( stdout, GREEN" %-22s "WHITE"%s\n"GRAY,
p_parser->psz_object_name,
- _( p_parser->psz_longname ) );
+ module_gettext( p_parser, p_parser->psz_longname ) );
else
utf8_fprintf( stdout, " %-22s %s\n",
p_parser->psz_object_name,
- _( p_parser->psz_longname ) );
+ module_gettext( p_parser, p_parser->psz_longname ) );
if( b_verbose )
{
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 );