* The evil global variable. We handle it with care, don't worry.
*****************************************************************************/
static libvlc_global_data_t libvlc_global;
-static libvlc_global_data_t * p_libvlc_global;
-static libvlc_int_t * p_static_vlc;
+static libvlc_global_data_t * p_libvlc_global = NULL;
+static libvlc_int_t * p_static_vlc = NULL;
static volatile unsigned int i_instances = 0;
/*****************************************************************************
* Local prototypes
*****************************************************************************/
-void LocaleInit( vlc_object_t * );
-void LocaleDeinit( void );
static void SetLanguage ( char const * );
+static inline int LoadMessages (void);
static int GetFilenames ( libvlc_int_t *, int, char *[] );
static void Help ( libvlc_int_t *, char const *psz_help_name );
static void Usage ( libvlc_int_t *, char const *psz_module_name );
int i_ret;
libvlc_int_t * p_libvlc = NULL;
vlc_value_t lockval;
- char *psz_env;
+ char *psz_env = NULL;
/* &libvlc_global never changes,
* so we can safely call this multiple times. */
/* Allocate a libvlc instance object */
p_libvlc = vlc_object_create( p_libvlc_global, VLC_OBJECT_LIBVLC );
- if( p_libvlc == NULL ) { i_instances--; return NULL; }
+ if( p_libvlc == NULL )
+ {
+ i_instances--;
+ return NULL;
+ }
p_libvlc->thread_id = 0;
p_libvlc->p_playlist = NULL;
p_libvlc->psz_object_name = "libvlc";
int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] )
{
char p_capabilities[200];
- char * p_tmp;
- char * psz_modules;
- char * psz_parser;
- char * psz_control;
+ char * p_tmp = NULL;
+ char * psz_modules = NULL;
+ char * psz_parser = NULL;
+ char * psz_control = NULL;
vlc_bool_t b_exit = VLC_FALSE;
int i_ret = VLC_EEXIT;
- module_t *p_help_module;
- playlist_t *p_playlist;
+ module_t *p_help_module = NULL;
+ playlist_t *p_playlist = NULL;
vlc_value_t val;
#if defined( ENABLE_NLS ) \
&& ( defined( HAVE_GETTEXT ) || defined( HAVE_INCLUDED_GETTEXT ) )
/*
* Support for gettext
*/
- SetLanguage( "" );
-
- /*
- * Global iconv, must be done after setlocale()
- * so that vlc_current_charset() works.
- */
- LocaleInit( (vlc_object_t *)p_libvlc );
+#ifdef HAVE_LC_MESSAGES
+ setlocale( LC_MESSAGES, "" );
+#endif
+ setlocale( LC_CTYPE, "" );
+ LoadMessages ();
/* Translate "C" to the language code: "fr", "en_GB", "nl", "ru"... */
msg_Dbg( p_libvlc, "translation test: code is \"%s\"", _("C") );
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] == '/' )
+ 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) );
- /* 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;
+ 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 */
}
/* Check for plugins cache options */
if( config_GetInt( p_libvlc, "daemon" ) )
{
#if HAVE_DAEMON
+ char *psz_pidfile = NULL;
+
if( daemon( 1, 0) != 0 )
{
msg_Err( p_libvlc, "Unable to fork vlc to daemon mode" );
b_exit = VLC_TRUE;
}
-
p_libvlc->p_libvlc_global->b_daemon = VLC_TRUE;
/* lets check if we need to write the pidfile */
- char * psz_pidfile = config_GetPsz( p_libvlc, "pidfile" );
-
+ psz_pidfile = config_GetPsz( p_libvlc, "pidfile" );
if( psz_pidfile != NULL )
{
FILE *pidfile;
/* FIXME: could be replaced by using Unix sockets */
#ifdef HAVE_DBUS_3
+ dbus_threads_init_default();
+
if( config_GetInt( p_libvlc, "one-instance" ) )
{
/* Initialise D-Bus interface, check for other instances */
- DBusConnection *p_conn;
+ DBusConnection *p_conn = NULL;
DBusError dbus_error;
- dbus_threads_init_default();
dbus_error_init( &dbus_error );
/* connect to the session bus */
/* check if a Media Player is available
* if not: D-Bus control is not enabled on the other
* instance and we can't pass MRLs to it */
- DBusMessage *p_test_msg, *p_test_reply;
+ DBusMessage *p_test_msg = NULL;
+ DBusMessage *p_test_reply = NULL;
p_test_msg = dbus_message_new_method_call(
"org.freedesktop.MediaPlayer", "/",
"org.freedesktop.MediaPlayer", "Identity" );
}
else
{
- dbus_message_unref( p_test_reply );
- msg_Warn( p_libvlc, "Another Media Player is running. Exiting");
-
int i_input;
- DBusMessage* p_dbus_msg;
+ DBusMessage* p_dbus_msg = NULL;
DBusMessageIter dbus_args;
- DBusPendingCall* p_dbus_pending;
+ DBusPendingCall* p_dbus_pending = NULL;
dbus_bool_t b_play;
+ dbus_message_unref( p_test_reply );
+ msg_Warn( p_libvlc, "Another Media Player is running. Exiting");
+
for( i_input = optind;i_input < i_argc;i_input++ )
{
msg_Dbg( p_libvlc, "Adds %s to the running Media Player",
*/
msg_Flush( p_libvlc );
- /* p_libvlc initialization. FIXME ? */
-
if( !config_GetInt( p_libvlc, "fpu" ) )
libvlc_global.i_cpu &= ~CPU_CAPABILITY_FPU;
if( config_GetInt( p_libvlc, "syslog" ) == 1 )
{
const char *psz_logmode = "logmode=syslog";
- libvlc_InternalAddIntf( 0, "logger,none", VLC_FALSE, VLC_FALSE,
+ libvlc_InternalAddIntf( p_libvlc, "logger,none", VLC_FALSE, VLC_FALSE,
1, &psz_logmode );
}
#endif
*/
int libvlc_InternalCleanup( libvlc_int_t *p_libvlc )
{
- intf_thread_t * p_intf;
- vout_thread_t * p_vout;
- aout_instance_t * p_aout;
- announce_handler_t * p_announce;
+ intf_thread_t * p_intf = NULL;
+ vout_thread_t * p_vout = NULL;
+ aout_instance_t * p_aout = NULL;
+ announce_handler_t * p_announce = NULL;
/* Ask the interfaces to stop and destroy them */
msg_Dbg( p_libvlc, "removing all interfaces" );
vlc_object_detach( p_intf );
vlc_object_release( p_intf );
intf_Destroy( p_intf );
+ p_intf = NULL;
}
/* Free playlist */
{
vlc_value_t lockval;
+ if( !p_libvlc )
+ return VLC_EGENERIC;
+
+#ifndef WIN32
+ char* psz_pidfile = NULL;
+
+ if( p_libvlc->p_libvlc_global->p_module_bank )
+ if( config_GetInt( p_libvlc, "daemon" ) )
+ {
+ psz_pidfile = config_GetPsz( p_libvlc, "pidfile" );
+ if( psz_pidfile != NULL )
+ {
+ 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) );
+ }
+ }
+ free ( psz_pidfile );
+ }
+#endif
+
if( p_libvlc->p_memcpy_module )
{
module_Unneed( p_libvlc, p_libvlc->p_memcpy_module );
{
/* System specific cleaning code */
system_End( p_libvlc );
-
- /* Destroy global iconv */
- LocaleDeinit();
}
vlc_mutex_unlock( lockval.p_address );
var_Destroy( p_libvlc_global, "libvlc" );
if( b_release ) vlc_object_release( p_libvlc );
vlc_object_destroy( p_libvlc );
+ p_libvlc = NULL;
/* Stop thread system: last one out please shut the door!
* The number of initializations of the thread system is counted, we
int i_options, const char *const *ppsz_options )
{
int i_err;
- intf_thread_t *p_intf;
+ intf_thread_t *p_intf = NULL;
+
+ if( !p_libvlc )
+ return VLC_EGENERIC;
#ifndef WIN32
if( p_libvlc->p_libvlc_global->b_daemon && b_block && !psz_module )
/* Try to create the interface */
p_intf = intf_Create( p_libvlc, psz_module ? psz_module : "$intf",
i_options, ppsz_options );
-
if( p_intf == NULL )
{
msg_Err( p_libvlc, "interface \"%s\" initialization failed",
{
vlc_object_detach( p_intf );
intf_Destroy( p_intf );
+ p_intf = NULL;
return i_err;
}
return VLC_SUCCESS;
};
-
+#if defined (__APPLE__) || defined (WIN32)
/*****************************************************************************
* SetLanguage: set the interface language.
*****************************************************************************
* as well as the LC_CTYPE category for string sorting and possible wide
* character support.
*****************************************************************************/
-static void SetLanguage ( char const *psz_lang )
+static void SetLanguage ( const char *psz_lang )
{
-#if defined( ENABLE_NLS ) \
- && ( defined( HAVE_GETTEXT ) || defined( HAVE_INCLUDED_GETTEXT ) )
+#ifdef __APPLE__
+ /* I need that under Darwin, please check it doesn't disturb
+ * other platforms. --Meuuh */
+ setenv( "LANG", psz_lang, 1 );
- const char * psz_path;
-#if defined( __APPLE__ ) || defined ( WIN32 ) || defined( SYS_BEOS )
- char psz_tmp[1024];
+#else
+ /* We set LC_ALL manually because it is the only way to set
+ * the language at runtime under eg. Windows. Beware that this
+ * makes the environment unconsistent when libvlc is unloaded and
+ * should probably be moved to a safer place like vlc.c. */
+ static char psz_lcall[20];
+ snprintf( psz_lcall, 19, "LC_ALL=%s", psz_lang );
+ psz_lcall[19] = '\0';
+ putenv( psz_lcall );
#endif
- if( psz_lang && !*psz_lang )
- {
-# if defined( HAVE_LC_MESSAGES )
- setlocale( LC_MESSAGES, psz_lang );
-# endif
- setlocale( LC_CTYPE, psz_lang );
- }
- else if( psz_lang )
- {
-#ifdef __APPLE__
- /* I need that under Darwin, please check it doesn't disturb
- * other platforms. --Meuuh */
- setenv( "LANG", psz_lang, 1 );
-
-#elif defined( SYS_BEOS ) || defined( WIN32 )
- /* We set LC_ALL manually because it is the only way to set
- * the language at runtime under eg. Windows. Beware that this
- * makes the environment unconsistent when libvlc is unloaded and
- * should probably be moved to a safer place like vlc.c. */
- static char psz_lcall[20];
- snprintf( psz_lcall, 19, "LC_ALL=%s", psz_lang );
- psz_lcall[19] = '\0';
- putenv( psz_lcall );
+ setlocale( LC_ALL, psz_lang );
+}
#endif
- setlocale( LC_ALL, psz_lang );
- }
+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 )
- psz_path = LOCALEDIR;
+ static const char psz_path[] = LOCALEDIR;
#else
- snprintf( psz_tmp, sizeof(psz_tmp), "%s/%s", libvlc_global.psz_vlcpath,
- "locale" );
- psz_path = psz_tmp;
+ char psz_path[1024];
+ if (snprintf (psz_path, sizeof (psz_path), "%s/%s",
+ libvlc_global.psz_vlcpath, "locale")
+ >= (int)sizeof (psz_path))
+ return -1;
+
#endif
- if( !bindtextdomain( PACKAGE_NAME, psz_path ) )
+ 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(), strsignal()
+ * and other functions that are not part of our text domain.
+ */
+ if (bind_textdomain_codeset (PACKAGE_NAME, "UTF-8") == NULL)
{
- fprintf( stderr, "warning: couldn't bind domain %s in directory %s\n",
- PACKAGE_NAME, psz_path );
+ 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;
}
- /* Set the default domain */
- bind_textdomain_codeset( PACKAGE_NAME, "UTF-8" );
+ /* 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;
}
/*****************************************************************************
* and their input options */
for( i_opt = i_argc - 1; i_opt >= optind; i_opt-- )
{
- const char *psz_target;
i_options = 0;
/* Count the input options */
/* TODO: write an internal function of this one, to avoid
* unnecessary lookups. */
- /* FIXME: should we convert options to UTF-8 as well ?? */
-#ifdef WIN32
- if( GetVersion() < 0x80000000 )
- {
- VLC_AddTarget( p_vlc->i_object_id, ppsz_argv[i_opt],
+ VLC_AddTarget( p_vlc->i_object_id, ppsz_argv[i_opt],
(char const **)( i_options ? &ppsz_argv[i_opt + 1] :
NULL ), i_options,
PLAYLIST_INSERT, 0 );
- }
- else
-#endif
- {
- psz_target = FromLocale( ppsz_argv[ i_opt ] );
- VLC_AddTarget( p_vlc->i_object_id, psz_target,
- (char const **)( i_options ? &ppsz_argv[i_opt + 1] :
- NULL ), i_options,
- PLAYLIST_INSERT, 0 );
- LocaleFree( psz_target );
- }
}
return VLC_SUCCESS;
#else
# define OPTION_VALUE_SEP " "
#endif
- vlc_list_t *p_list;
+ vlc_list_t *p_list = NULL;
char psz_spaces_text[PADDING_SPACES+LINE_START+1];
char psz_spaces_longtext[LINE_START+3];
char psz_format[sizeof(FORMAT_STRING)];
{
vlc_bool_t b_help_module;
module_t *p_parser = (module_t *)p_list->p_values[i_index].p_object;
- module_config_t *p_item,
- *p_end = p_parser->p_config + p_parser->confsize;
+ module_config_t *p_item = NULL;
+ module_config_t *p_end = p_parser->p_config + p_parser->confsize;
if( psz_module_name && strcmp( psz_module_name,
p_parser->psz_object_name ) )
{
- continue;
+ char **pp_shortcut = p_parser->pp_shortcuts;
+ while( *pp_shortcut )
+ {
+ if( !strcmp( psz_module_name, *pp_shortcut ) )
+ break;
+ pp_shortcut ++;
+ }
+ if( !*pp_shortcut )
+ continue;
}
/* Ignore modules without config options */
*****************************************************************************/
static void ListModules( libvlc_int_t *p_this )
{
- vlc_list_t *p_list;
- module_t *p_parser;
+ vlc_list_t *p_list = NULL;
+ module_t *p_parser = NULL;
char psz_spaces[22];
int i_index;
static void ShowConsole( vlc_bool_t b_dofile )
{
# ifndef UNDER_CE
- FILE *f_help;
+ FILE *f_help = NULL;
if( getenv( "PWD" ) && getenv( "PS1" ) ) return; /* cygwin shell */
freopen( "vlc-help.txt", "wt", stdout );
utf8_fprintf( stderr, _("\nDumped content to vlc-help.txt file.\n") );
}
-
else freopen( "CONOUT$", "w", stdout );
# endif
int i_width = 80;
#ifndef WIN32
- char buf[20], *psz_parser;
- FILE *file;
+ char buf[20];
+ char *psz_parser = NULL;
+ FILE *file = NULL;
int i_ret;
file = popen( "stty size 2>/dev/null", "r" );
static void InitDeviceValues( libvlc_int_t *p_vlc )
{
#ifdef HAVE_HAL
- LibHalContext * ctx;
+ LibHalContext * ctx = NULL;
int i, i_devices;
- char **devices;
- char *block_dev;
+ char **devices = NULL;
+ char *block_dev = NULL;
dbus_bool_t b_dvd;
- DBusConnection *p_connection;
+ DBusConnection *p_connection = NULL;
DBusError error;
#ifdef HAVE_HAL_1
- ctx = libhal_ctx_new();
+ ctx = libhal_ctx_new();
if( !ctx ) return;
dbus_error_init( &error );
p_connection = dbus_bus_get ( DBUS_BUS_SYSTEM, &error );
if( dbus_error_is_set( &error ) )
{
+#ifdef HAVE_HAL_1
+ libhal_ctx_shutdown( ctx, NULL );
+#else
+ hal_shutdown( ctx );
+#endif
dbus_error_free( &error );
return;
}
projects / vlc / blobdiff