/* Initialize mutexes */
vlc_mutex_init( &priv->timer_lock );
- vlc_cond_init( &priv->exiting );
return p_libvlc;
}
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;
priv->i_verbose = config_GetInt( 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 );
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_CreateGetNonEmptyString( p_libvlc, "module" )) )
{
Help( p_libvlc, p_tmp );
free( p_tmp );
}
}
+ 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 );
/*
* 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;
if( priv->b_color )
priv->b_color = config_GetInt( p_libvlc, "color" ) > 0;
- if( !config_GetInt( p_libvlc, "fpu" ) )
- cpu_flags &= ~CPU_CAPABILITY_FPU;
-
char p_capabilities[200];
#define PRINT_CAPABILITY( capability, string ) \
if( vlc_CPU() & capability ) \
cpu_flags &= ~CPU_CAPABILITY_SSE2;
if( !config_GetInt( p_libvlc, "sse3" ) )
cpu_flags &= ~CPU_CAPABILITY_SSE3;
+ if( !config_GetInt( p_libvlc, "ssse3" ) )
+ cpu_flags &= ~CPU_CAPABILITY_SSSE3;
+ if( !config_GetInt( p_libvlc, "sse41" ) )
+ cpu_flags &= ~CPU_CAPABILITY_SSE4_1;
+ if( !config_GetInt( 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_SSE3, "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" ) )
#endif
- PRINT_CAPABILITY( CPU_CAPABILITY_FPU, "FPU" );
+#if HAVE_FPU
+ strncat( p_capabilities, "FPU ",
+ sizeof(p_capabilities) - strlen( p_capabilities) );
+ p_capabilities[sizeof(p_capabilities) - 1] = '\0';
+#endif
+
msg_Dbg( p_libvlc, "CPU has capabilities %s", p_capabilities );
/*
/*
* 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 );
&& config_GetInt( 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 )
intf_Create( p_libvlc, "inhibit,none" );
-#endif
-
- /*
- * If needed, load the Xscreensaver interface
- * Currently, only for X
- */
-#ifdef HAVE_X11_XLIB_H
- if( config_GetInt( p_libvlc, "disable-screensaver" ) )
- {
- intf_Create( p_libvlc, "screensaver,none" );
- }
+# endif
#endif
if( (config_GetInt( p_libvlc, "file-logging" ) > 0) &&
#ifdef HAVE_SYSLOG_H
if( config_GetInt( p_libvlc, "syslog" ) > 0 )
{
- 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
#ifdef WIN32
if( config_GetInt( p_libvlc, "prefer-system-codecs") > 0 )
{
- 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 );
}
#else
char psz_path[1024];
if (snprintf (psz_path, sizeof (psz_path), "%s" DIR_SEP "%s",
- config_GetDataDir(), "locale")
+ config_GetDataDirDefault(), "locale")
>= (int)sizeof (psz_path))
return -1;
if( !p_item ) return;
if( b_color )
{
- utf8_fprintf( stdout, RED" %s:\n"GRAY,
- p_item->psz_text );
+ utf8_fprintf( stdout, RED" %s:\n"GRAY, _( p_item->psz_text ) );
if( b_description && p_item->psz_longtext )
utf8_fprintf( stdout, MAGENTA" %s\n"GRAY,
- p_item->psz_longtext );
+ _( p_item->psz_longtext ) );
}
else
{
- utf8_fprintf( stdout, " %s:\n", p_item->psz_text );
+ 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", _( p_item->psz_longtext ) );
}
}
{
if( b_color )
utf8_fprintf( stdout, "\n " GREEN "%s" GRAY " (%s)\n",
- p_parser->psz_longname,
- p_parser->psz_object_name );
+ _( 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", _( p_parser->psz_longname ) );
}
if( p_parser->psz_help )
{
if( b_color )
- utf8_fprintf( stdout, CYAN" %s\n"GRAY, p_parser->psz_help );
+ utf8_fprintf( stdout, CYAN" %s\n"GRAY,
+ _( p_parser->psz_help ) );
else
- utf8_fprintf( stdout, " %s\n", p_parser->psz_help );
+ utf8_fprintf( stdout, " %s\n", _( p_parser->psz_help ) );
}
/* Print module options */
{
if( b_color )
utf8_fprintf( stdout, GREEN "\n %s\n" GRAY,
- p_item->psz_text );
+ _( p_item->psz_text ) );
else
- utf8_fprintf( stdout, "\n %s\n", p_item->psz_text );
+ utf8_fprintf( stdout, "\n %s\n",
+ _( p_item->psz_text ) );
}
if( b_description && p_item->psz_longtext )
{
if( b_color )
utf8_fprintf( stdout, CYAN " %s\n" GRAY,
- p_item->psz_longtext );
+ _( p_item->psz_longtext ) );
else
- utf8_fprintf( stdout, " %s\n", p_item->psz_longtext );
+ utf8_fprintf( stdout, " %s\n",
+ _( p_item->psz_longtext ) );
}
break;
if( i ) strcat( psz_buffer, ", " );
sprintf( psz_buffer + strlen(psz_buffer), "%i (%s)",
p_item->pi_list[i],
- p_item->ppsz_list_text[i] );
+ _( p_item->ppsz_list_text[i] ) );
}
psz_ket = "}";
}
psz_spaces[i] = ' ';
/* We wrap the rest of the output */
- sprintf( psz_buffer, "%s%s", p_item->psz_text, psz_suf );
+ sprintf( psz_buffer, "%s%s", _( p_item->psz_text ),
+ psz_suf );
b_description_hack = b_description;
description:
if( b_description_hack && p_item->psz_longtext )
{
- sprintf( psz_buffer, "%s%s", p_item->psz_longtext, psz_suf );
+ sprintf( psz_buffer, "%s%s", _( p_item->psz_longtext ),
+ psz_suf );
b_description_hack = false;
psz_spaces = psz_spaces_longtext;
utf8_fprintf( stdout, "%s", psz_spaces );
static void ListModules( libvlc_int_t *p_this, bool b_verbose )
{
module_t *p_parser;
- char psz_spaces[22];
bool b_color = config_GetInt( p_this, "color" ) > 0;
- memset( psz_spaces, ' ', 22 );
-
#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;
-
- /* Nasty hack, but right now I'm too tired to think about a nice
- * solution */
- i = 22 - strlen( p_parser->psz_object_name ) - 1;
- if( i < 0 ) i = 0;
- psz_spaces[i] = 0;
-
if( b_color )
- utf8_fprintf( stdout, GREEN" %s%s "WHITE"%s\n"GRAY,
+ utf8_fprintf( stdout, GREEN" %-22s "WHITE"%s\n"GRAY,
p_parser->psz_object_name,
- psz_spaces,
- p_parser->psz_longname );
+ _( p_parser->psz_longname ) );
else
- utf8_fprintf( stdout, " %s%s %s\n",
+ utf8_fprintf( stdout, " %-22s %s\n",
p_parser->psz_object_name,
- psz_spaces, p_parser->psz_longname );
+ _( p_parser->psz_longname ) );
if( b_verbose )
{
p_parser->i_score );
}
}
-
- psz_spaces[i] = ' ';
}
module_list_free (list);