#include <errno.h> /* ENOMEM */
#include <stdio.h> /* sprintf() */
-#include <string.h> /* strerror() */
+#include <string.h>
#include <stdlib.h> /* free() */
#ifndef WIN32
/* Initialize message queue */
msg_Create( p_libvlc );
- /* Announce who we are - Do it only for first instance ? */
- msg_Dbg( p_libvlc, COPYRIGHT_MESSAGE );
- msg_Dbg( p_libvlc, "libvlc was configured with %s", CONFIGURE_LINE );
/* Find verbosity from VLC_VERBOSE environment variable */
psz_env = getenv( "VLC_VERBOSE" );
- p_libvlc->i_verbose = psz_env ? atoi( psz_env ) : -1;
-
+ if( psz_env != NULL )
+ p_libvlc->i_verbose = atoi( psz_env );
+ else
+ p_libvlc->i_verbose = 3;
#if defined( HAVE_ISATTY ) && !defined( WIN32 )
p_libvlc->b_color = isatty( 2 ); /* 2 is for stderr */
#else
p_libvlc->b_color = VLC_FALSE;
#endif
+ /* Announce who we are - Do it only for first instance ? */
+ msg_Dbg( p_libvlc, COPYRIGHT_MESSAGE );
+ msg_Dbg( p_libvlc, "libvlc was configured with %s", CONFIGURE_LINE );
+
/* Initialize mutexes */
vlc_mutex_init( p_libvlc, &p_libvlc->config_lock );
#ifdef __APPLE__
vlc_mutex_init( p_libvlc, &p_libvlc->quicktime_lock );
vlc_thread_set_priority( p_libvlc, VLC_THREAD_PRIORITY_LOW );
#endif
- /* Fake attachment */
- p_libvlc->b_attached = VLC_TRUE;
/* Store data for the non-reentrant API */
p_static_vlc = p_libvlc;
/*
* Support for gettext
*/
-#ifdef HAVE_LC_MESSAGES
- setlocale( LC_MESSAGES, "" );
-#endif
- setlocale( LC_CTYPE, "" );
LoadMessages ();
/* Translate "C" to the language code: "fr", "en_GB", "nl", "ru"... */
}
/* Set the config file stuff */
- p_libvlc->psz_homedir = config_GetHomeDir();
- p_libvlc->psz_userdir = config_GetUserDir();
- if( p_libvlc->psz_userdir == NULL )
- p_libvlc->psz_userdir = strdup(p_libvlc->psz_homedir);
- p_libvlc->psz_configfile = config_GetPsz( p_libvlc, "config" );
- if( (p_libvlc->psz_configfile != NULL) && (p_libvlc->psz_configfile[0] == '~')
- && (p_libvlc->psz_configfile[1] == '/') )
- {
- char *psz = malloc( strlen(p_libvlc->psz_userdir)
- + strlen(p_libvlc->psz_configfile) );
- if( psz )
- {
- /* This is incomplete : we should also support the ~cmassiot/ syntax. */
- sprintf( psz, "%s/%s", p_libvlc->psz_userdir,
- p_libvlc->psz_configfile + 2 );
- free( p_libvlc->psz_configfile );
- p_libvlc->psz_configfile = psz;
- } /* else keep old config stuff */
- }
+ p_libvlc->psz_homedir = config_GetHomeDir();
+ p_libvlc->psz_configdir = config_GetConfigDir( p_libvlc );
+ p_libvlc->psz_datadir = config_GetUserDataDir( p_libvlc );
+ p_libvlc->psz_cachedir = config_GetCacheDir( p_libvlc );
+ p_libvlc->psz_configfile = config_GetCustomConfigFile( p_libvlc );
/* Check for plugins cache options */
if( config_GetInt( p_libvlc, "reset-plugins-cache" ) )
}
else
{
- msg_Err( p_libvlc, "cannot open pid file for writing: %s (%s)",
- psz_pidfile, strerror(errno) );
+ msg_Err( p_libvlc, "cannot open pid file for writing: %s (%m)",
+ psz_pidfile );
}
}
free( psz_pidfile );
/* append MRLs */
dbus_message_iter_init_append( p_dbus_msg, &dbus_args );
- if ( !dbus_message_iter_append_basic( &dbus_args,
+ if ( !dbus_message_iter_append_basic( &dbus_args,
DBUS_TYPE_STRING, &ppsz_argv[i_input] ) )
{
msg_Err( p_libvlc, "Out of memory" );
}
else if( psz_control && *psz_control )
{
- if( psz_modules ) free( psz_modules );
+ free( psz_modules );
psz_modules = strdup( psz_control );
}
free( psz_temp );
}
}
- if ( psz_modules )
- {
- free( psz_modules );
- }
+ free( psz_modules );
+ free( psz_control );
/*
* Always load the hotkeys interface if it exists
msg_Dbg( p_libvlc, "removing pid file %s", psz_pidfile );
if( unlink( psz_pidfile ) == -1 )
{
- msg_Dbg( p_libvlc, "removing pid file %s: failed: %s",
- psz_pidfile, strerror(errno) );
+ msg_Dbg( p_libvlc, "removing pid file %s: %m",
+ psz_pidfile );
}
}
free ( psz_pidfile );
module_EndBank( p_libvlc );
FREENULL( p_libvlc->psz_homedir );
- FREENULL( p_libvlc->psz_userdir );
+ FREENULL( p_libvlc->psz_configdir );
+ FREENULL( p_libvlc->psz_datadir );
+ FREENULL( p_libvlc->psz_cachedir );
FREENULL( p_libvlc->psz_configfile );
FREENULL( p_libvlc->p_hotkeys );
p_libvlc = NULL;
/* Stop thread system: last one out please shut the door!
- * The number of initializations of the thread system is counted, we
+ * The number of initializations of the thread system is counted, we
* can call this each time */
vlc_threads_end( p_libvlc_global );
/* Try to run the interface */
p_intf->b_play = b_play;
- p_intf->b_block = b_block;
i_err = intf_RunThread( p_intf );
- if( i_err )
+ if( i_err || p_intf->b_should_run_on_first_thread )
{
vlc_object_detach( p_intf );
intf_Destroy( p_intf );
p_intf = NULL;
return i_err;
}
+
+ if( b_block )
+ {
+ /* FIXME: should be moved to interface/interface.c */
+ if( p_intf->pf_run )
+ vlc_thread_join( p_intf );
+ else
+ while( vlc_object_lock_and_wait( p_intf ) == 0 );
+
+ vlc_object_detach( p_intf );
+ intf_Destroy( p_intf );
+ }
+
return VLC_SUCCESS;
};
}
/* LibVLC wants all messages in UTF-8.
- * Unfortunately, we cannot ask UTF-8 for strerror(), strsignal()
+ * 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)
break;
pp_shortcut ++;
}
+ if( !*pp_shortcut )
+ continue;
}
/* Ignore modules without config options */
if( b_verbose )
{
- const char **pp_shortcut = p_parser->pp_shortcuts;
+ const char *const *pp_shortcut = p_parser->pp_shortcuts;
while( *pp_shortcut )
{
if( strcmp( *pp_shortcut, p_parser->psz_object_name ) )
projects / vlc / blobdiff