* 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 = NULL;
+#define p_libvlc_global (&libvlc_global)
static libvlc_int_t * p_static_vlc = NULL;
static volatile unsigned int i_instances = 0;
static void InitDeviceValues( libvlc_int_t * );
-/* Refs misc/cpu.c */
-uint32_t CPUCapabilities( void );
+libvlc_global_data_t *vlc_global( void )
+{
+ return &libvlc_global;
+}
/*****************************************************************************
* vlc_current_object: return the current object.
vlc_value_t lockval;
char *psz_env = NULL;
+#if 0
/* &libvlc_global never changes,
* so we can safely call this multiple times. */
p_libvlc_global = &libvlc_global;
+#endif
/* vlc_threads_init *must* be the first internal call! No other call is
* allowed before the thread system has been initialized. */
i_instances--;
return NULL;
}
- p_libvlc->thread_id = 0;
p_libvlc->p_playlist = NULL;
p_libvlc->psz_object_name = "libvlc";
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;
}
/* 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
{
- /* check if a Media Player is available
+ /* check if VLC is available on the bus
* if not: D-Bus control is not enabled on the other
* instance and we can't pass MRLs to it */
DBusMessage *p_test_msg = NULL;
DBusMessage *p_test_reply = NULL;
p_test_msg = dbus_message_new_method_call(
- "org.freedesktop.MediaPlayer", "/",
+ "org.mpris.vlc", "/",
"org.freedesktop.MediaPlayer", "Identity" );
/* block until a reply arrives */
p_test_reply = dbus_connection_send_with_reply_and_block(
ppsz_argv[i_input] );
p_dbus_msg = dbus_message_new_method_call(
- "org.freedesktop.MediaPlayer", "/TrackList",
+ "org.mpris.vlc", "/TrackList",
"org.freedesktop.MediaPlayer", "AddTrack" );
if ( NULL == p_dbus_msg )
/* 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" );
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 );
#else
char psz_path[1024];
if (snprintf (psz_path, sizeof (psz_path), "%s/%s",
- vlc_global( &libvlc_global )->psz_vlcpath, "locale")
+ libvlc_global.psz_vlcpath, "locale")
>= (int)sizeof (psz_path))
return -1;
if( psz_module_name && strcmp( psz_module_name,
p_parser->psz_object_name ) )
{
- const char **pp_shortcut = p_parser->pp_shortcuts;
+ const char *const *pp_shortcut = p_parser->pp_shortcuts;
while( *pp_shortcut )
{
if( !strcmp( psz_module_name, *pp_shortcut ) )
if( b_verbose )
{
- const char **pp_shortcut = p_parser->pp_shortcuts;
- while( pp_shortcut && *pp_shortcut )
+ const char *const *pp_shortcut = p_parser->pp_shortcuts;
+ while( *pp_shortcut )
{
if( strcmp( *pp_shortcut, p_parser->psz_object_name ) )
{