block_File: test case

[vlc] / src / libvlc.h

diff --git a/src/libvlc.h b/src/libvlc.h
index a6ba7be74365b2982e196372593e0ace3b4657c5..a3ef427671ee4bd74608fe33c7f064764a193acf 100644 (file)
--- a/src/libvlc.h
+++ b/src/libvlc.h
@@ -40,32 +40,12 @@ void system_Init      ( libvlc_int_t *, int *, const char *[] );
 void system_Configure ( libvlc_int_t *, int *, const char *[] );
 void system_End       ( libvlc_int_t * );
 
-#if defined( SYS_BEOS )
-/* Nothing at the moment, create beos_specific.h when needed */
-#elif defined( __APPLE__ )
-/* Nothing at the moment, create darwin_specific.h when needed */
-#elif defined( WIN32 ) || defined( UNDER_CE )
-VLC_EXPORT( const char * , system_VLCPath, (void));
-#else
-# define system_Init( a, b, c )      (void)0
-# define system_Configure( a, b, c ) (void)0
-# define system_End( a )             (void)0
-#endif
-
-
 /*
  * Threads subsystem
  */
 int vlc_threads_init( void );
 void vlc_threads_end( void );
 
-/** The global thread var for msg stack context
- *  We store this as a static global variable so we don't need a vlc_object_t
- *  everywhere.
- *  This key is created in vlc_threads_init and is therefore ready to use at
- *  the very beginning of the universe */
-extern vlc_threadvar_t msg_context_global_key;
-
 /*
  * CPU capabilities
  */
@@ -76,12 +56,8 @@ uint32_t CPUCapabilities( void );
  * Message/logging stuff
  */
 
-#define NB_QUEUES 2
-
 typedef struct msg_queue_t
 {
-    int                     i_id;
-
     /** Message queue lock */
     vlc_mutex_t             lock;
     bool              b_overflow;
@@ -102,14 +78,36 @@ typedef struct msg_queue_t
 } msg_queue_t;
 
 /**
- * Store all data requiered by messages interfaces.
+ * Store all data required by messages interfaces.
  */
 typedef struct msg_bank_t
 {
     vlc_mutex_t             lock;
-    msg_queue_t             queues[NB_QUEUES];
+    msg_queue_t             queue;
 } msg_bank_t;
 
+void msg_Create  (libvlc_int_t *);
+void msg_Flush   (libvlc_int_t *);
+void msg_Destroy (libvlc_int_t *);
+
+/** Internal message stack context */
+typedef struct
+{
+    int i_code;
+    char * psz_message;
+} msg_context_t;
+
+void msg_StackSet ( int, const char*, ... );
+void msg_StackAdd ( const char*, ... );
+const char* msg_StackMsg ( void );
+/** The global thread var for msg stack context
+ *  We store this as a static global variable so we don't need a vlc_object_t
+ *  everywhere.
+ *  This key is created in vlc_threads_init and is therefore ready to use at
+ *  the very beginning of the universe */
+extern vlc_threadvar_t msg_context_global_key;
+void msg_StackDestroy (void *);
+
 /*
  * Unicode stuff
  */
@@ -154,14 +152,7 @@ typedef struct libvlc_global_data_t
 
     module_bank_t *        p_module_bank; ///< The module bank
 
-    /* Arch-specific variables */
-#if defined( SYS_BEOS )
-    char *                 psz_vlcpath;
-#elif defined( __APPLE__ )
     char *                 psz_vlcpath;
-#elif defined( WIN32 )
-    char *                 psz_vlcpath;
-#endif
 } libvlc_global_data_t;
 
 
@@ -187,9 +178,12 @@ struct vlc_object_internals_t
     vlc_spinlock_t  spin;
 
     /* Objects management */
+    vlc_spinlock_t   ref_spin;
     unsigned         i_refcount;
     vlc_destructor_t pf_destructor;
-    bool             b_attached;
+
+    vlc_object_t   **pp_children;
+    int              i_children;
 };
 
 #define ZOOM_SECTION N_("Zoom")
@@ -211,9 +205,6 @@ typedef struct libvlc_priv_t
     /* Configuration */
     vlc_mutex_t        config_lock; ///< config file lock
     char *             psz_configfile;   ///< location of config file
-    char              *psz_configdir;    ///< user configuration directory
-    char              *psz_datadir;      ///< user data directory
-    char              *psz_cachedir; ///< user cache directory
 
     /* There is no real reason to keep a list of items, but not to break
      * everything, let's keep it */
@@ -235,7 +226,8 @@ typedef struct libvlc_priv_t
                                           /// (needs cleanup)
 
     module_t          *p_memcpy_module;  ///< Fast memcpy plugin used
-    vlm_t             *p_vlm;  ///< VLM if created from libvlc-common.c
+    playlist_t        *p_playlist; //< the playlist singleton
+    vlm_t             *p_vlm;  ///< the VLM singleton (or NULL)
     vlc_object_t      *p_interaction;    ///< interface interaction object
     httpd_t           *p_httpd; ///< HTTP daemon (src/network/httpd.c)
 } libvlc_priv_t;
@@ -245,10 +237,7 @@ static inline libvlc_priv_t *libvlc_priv (libvlc_int_t *libvlc)
     return (libvlc_priv_t *)(libvlc + 1);
 }
 
-static inline bool libvlc_stats (vlc_object_t *obj)
-{
-   return libvlc_priv (obj->p_libvlc)->b_stats;
-}
+#define libvlc_stats( o ) (libvlc_priv((VLC_OBJECT(o))->p_libvlc)->b_stats)
 
 /**
  * LibVLC "main module" configuration settings array.