libvlccore: vlc_thread_cancel() tangled object API

[vlc] / src / libvlc.h

diff --git a/src/libvlc.h b/src/libvlc.h
index c42058edc7a0904b7a2e1d345fd3555f978ce0ef..5e476b2717d7ed816f2ac5b532583a955728986a 100644 (file)
--- a/src/libvlc.h
+++ b/src/libvlc.h
@@ -52,6 +52,10 @@ void vlc_refcheck (vlc_object_t *obj);
 # define vlc_refcheck( obj ) (void)0
 #endif
 
+/* Hopefully, no need to export this. There is a new thread API instead. */
+void vlc_thread_cancel (vlc_object_t *);
+
+
 /*
  * CPU capabilities
  */
@@ -118,7 +122,6 @@ void msg_StackDestroy (void *);
  * Unicode stuff
  */
 char *vlc_fix_readdir (const char *);
-bool vlc_current_charset (char **);
 
 /*
  * LibVLC objects stuff
@@ -139,18 +142,10 @@ bool vlc_current_charset (char **);
  * @return the created object, or NULL.
  */
 extern void *
-vlc_custom_create (vlc_object_t *p_this, size_t i_size, int i_type,
-                   const char *psz_type);
-
-/* Signal an object without checking for locking consistency. This is wrong. */
-#ifdef __GNUC__
-__attribute__((deprecated))
-#endif
-static inline void
-vlc_object_signal_maybe (vlc_object_t *p_this)
-{
-    vlc_cond_signal (&p_this->object_wait);
-}
+__vlc_custom_create (vlc_object_t *p_this, size_t i_size, int i_type,
+                     const char *psz_type);
+#define vlc_custom_create(o, s, t, n) \
+        __vlc_custom_create(VLC_OBJECT(o), s, t, n)
 
 /**
  * libvlc_global_data_t (global variable)
@@ -163,9 +158,6 @@ typedef struct libvlc_global_data_t
 {
     VLC_COMMON_MEMBERS
 
-    /* Object structure data */
-    int                    i_counter;   ///< object counter
-
     module_bank_t *        p_module_bank; ///< The module bank
 
     char *                 psz_vlcpath;
@@ -189,6 +181,8 @@ struct vlc_object_internals_t
     bool            b_thread;
 
     /* Objects thread synchronization */
+    vlc_mutex_t     lock;
+    vlc_cond_t      wait;
     int             pipes[2];
     vlc_spinlock_t  spin;
 
@@ -214,11 +208,23 @@ struct vlc_object_internals_t
 
 #define vlc_internals( obj ) (((vlc_object_internals_t*)(VLC_OBJECT(obj)))-1)
 
+/* Signal an object without checking for locking consistency. This is wrong. */
+#ifdef __GNUC__
+__attribute__((deprecated))
+#endif
+static inline void
+vlc_object_signal_maybe (vlc_object_t *p_this)
+{
+    vlc_cond_signal (&(vlc_internals(p_this)->wait));
+}
+
 /**
  * Private LibVLC instance data.
  */
 typedef struct libvlc_priv_t
 {
+    libvlc_int_t       public_data;
+
     /* Configuration */
     vlc_mutex_t        config_lock; ///< config file lock
     char *             psz_configfile;   ///< location of config file
@@ -242,10 +248,11 @@ typedef struct libvlc_priv_t
     void              *p_stats_computer;  ///< Input thread computing stats
                                           /// (needs cleanup)
 
+    /* Singleton objects */
     module_t          *p_memcpy_module;  ///< Fast memcpy plugin used
     playlist_t        *p_playlist; //< the playlist singleton
     vlm_t             *p_vlm;  ///< the VLM singleton (or NULL)
-    vlc_object_t      *p_interaction;    ///< interface interaction object
+    interaction_t     *p_interaction;    ///< interface interaction object
     httpd_t           *p_httpd; ///< HTTP daemon (src/network/httpd.c)
 
     /* Private playlist data (FIXME - playlist_t is too public...) */
@@ -254,7 +261,7 @@ typedef struct libvlc_priv_t
 
 static inline libvlc_priv_t *libvlc_priv (libvlc_int_t *libvlc)
 {
-    return (libvlc_priv_t *)(libvlc + 1);
+    return (libvlc_priv_t *)libvlc;
 }
 
 void playlist_ServicesDiscoveryKillAll( playlist_t *p_playlist );