Removes trailing spaces. Removes tabs.

[vlc] / src / libvlc-common.c

diff --git a/src/libvlc-common.c b/src/libvlc-common.c
index 57a2a6a101e880460e0325fb9acc16d5606f3ad4..f97f4defc175d9745d5e9a7159a4a9932965a121 100644 (file)
--- a/src/libvlc-common.c
+++ b/src/libvlc-common.c
@@ -122,6 +122,11 @@ static int  VerboseCallback( vlc_object_t *, char const *,
 
 static void InitDeviceValues( libvlc_int_t * );
 
+libvlc_global_data_t *vlc_global( void )
+{
+    return &libvlc_global;
+}
+
 /*****************************************************************************
  * vlc_current_object: return the current object.
  *****************************************************************************
@@ -188,7 +193,6 @@ libvlc_int_t * libvlc_InternalCreate( void )
         i_instances--;
         return NULL;
     }
-    p_libvlc->thread_id = 0;
     p_libvlc->p_playlist = NULL;
     p_libvlc->psz_object_name = "libvlc";
 
@@ -214,8 +218,6 @@ libvlc_int_t * libvlc_InternalCreate( void )
     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;
 
@@ -323,25 +325,11 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] )
     }
 
     /* 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" ) )
@@ -605,13 +593,13 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] )
         }
         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(
@@ -640,7 +628,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] )
                             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 )
@@ -652,7 +640,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, char *ppsz_argv[] )
 
                     /* 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" );
@@ -1065,7 +1053,9 @@ int libvlc_InternalDestroy( libvlc_int_t *p_libvlc, vlc_bool_t b_release )
     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 );
 
@@ -1094,7 +1084,7 @@ int libvlc_InternalDestroy( libvlc_int_t *p_libvlc, vlc_bool_t b_release )
     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 );
 
@@ -1376,7 +1366,7 @@ static void Usage( libvlc_int_t *p_this, char const *psz_module_name )
         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 ) )
@@ -1769,8 +1759,8 @@ static void ListModules( libvlc_int_t *p_this, vlc_bool_t b_verbose )
 
         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 ) )
                 {