Use \033[0;1m instead of \033[37;1m for bold text using the default color (prevent...

[vlc] / include / main.h

diff --git a/include/main.h b/include/main.h
index a8a08f921987ea60e75b4a9a4631dafddaa887dd..29e90605d60bce7bbea3e5ed61948ab8c04ef905 100644 (file)
--- a/include/main.h
+++ b/include/main.h
@@ -26,49 +26,6 @@
   #error You are not libvlc or one of its plugins. You cannot include this file
 #endif
 
-/*****************************************************************************
- * libvlc_global_data_t (global variable)
- *****************************************************************************
- * This structure has an unique instance, statically allocated in main and
- * never accessed from the outside. It stores once-initialized data such as
- * the CPU capabilities or the global lock.
- *****************************************************************************/
-struct libvlc_global_data_t
-{
-    VLC_COMMON_MEMBERS
-
-    vlc_bool_t             b_ready;     ///< Initialization boolean
-    uint32_t               i_cpu;       ///< CPU extensions
-
-   /* Object structure data */
-    int                    i_counter;   ///< object counter
-    int                    i_objects;   ///< Attached objects count
-    vlc_object_t **        pp_objects;  ///< Array of all objects
-
-    module_bank_t *        p_module_bank; ///< The module bank
-    intf_thread_t         *p_probe;       ///< Devices prober
-
-    /* Arch-specific variables */
-#if !defined( WIN32 )
-    vlc_bool_t             b_daemon;
-#endif
-#if defined( SYS_BEOS )
-    vlc_object_t *         p_appthread;
-    char *                 psz_vlcpath;
-#elif defined( __APPLE__ )
-    char *                 psz_vlcpath;
-    vlc_iconv_t            iconv_macosx; /* for HFS+ file names */
-    vlc_mutex_t            iconv_lock;
-#elif defined( WIN32 ) && !defined( UNDER_CE )
-    SIGNALOBJECTANDWAIT    SignalObjectAndWait;
-    vlc_bool_t             b_fast_mutex;
-    int                    i_win9x_cv;
-    char *                 psz_vlcpath;
-#elif defined( UNDER_CE )
-    char *                 psz_vlcpath;
-#endif
-};
-
 /*****************************************************************************
  * libvlc_internal_instance_t
  *****************************************************************************
@@ -80,9 +37,13 @@ struct libvlc_int_t
 
     /* Global properties */
     int                    i_argc;           ///< command line arguments count
-    char **                ppsz_argv;        ///< command line arguments
-    char *                 psz_homedir;      ///< configuration directory
-    char *                 psz_userdir;      ///< user's home directory
+    const char **          ppsz_argv;        ///< command line arguments
+
+    char *                 psz_homedir;      ///< user's home directory
+    char *                 psz_configdir;    ///< user's configuration directory
+    char *                 psz_datadir;      ///< user's data directory
+    char *                 psz_cachedir;     ///< user's cache directory
+
     char *                 psz_configfile;   ///< location of config file
 
     playlist_t            *p_playlist;       ///< playlist object