Hide global object within the thread and object subsystem

[vlc] / src / libvlc.h

diff --git a/src/libvlc.h b/src/libvlc.h
index f6e14e0ccba931abfd5050d3084f619f75f66d4f..15abf67749dac78080e51bb304b5eef068862e4e 100644 (file)
--- a/src/libvlc.h
+++ b/src/libvlc.h
@@ -27,18 +27,44 @@
 
 extern const char vlc_usage[];
 
-extern const module_config_t libvlc_config[];
-extern const size_t libvlc_config_count;
-
+/* Hotkey stuff */
 extern const struct hotkey libvlc_hotkeys[];
 extern const size_t libvlc_hotkeys_size;
+extern int vlc_key_to_action (vlc_object_t *, const char *,
+                              vlc_value_t, vlc_value_t, void *);
+
+/*
+ * OS-specific initialization
+ */
+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( vlc_object_t * );
-int __vlc_threads_end( vlc_object_t * );
+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
@@ -49,14 +75,26 @@ uint32_t CPUCapabilities( void );
 /*
  * Unicode stuff
  */
-int utf8_mkdir( const char *filename );
-
 
 /*
  * LibVLC objects stuff
  */
 
-extern vlc_object_t *
+/**
+ * Creates a VLC object.
+ *
+ * Note that because the object name pointer must remain valid, potentially
+ * even after the destruction of the object (through the message queues), this
+ * function CANNOT be exported to plugins as is. In this case, the old
+ * vlc_object_create() must be used instead.
+ *
+ * @param p_this an existing VLC object
+ * @param i_size byte size of the object structure
+ * @param i_type object type, usually VLC_OBJECT_CUSTOM
+ * @param psz_type object type name
+ * @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);
 
@@ -71,7 +109,7 @@ struct libvlc_global_data_t
 {
     VLC_COMMON_MEMBERS
 
-    vlc_bool_t             b_ready;     ///< Initialization boolean
+    bool             b_ready;     ///< Initialization boolean
 
    /* Object structure data */
     int                    i_counter;   ///< object counter
@@ -83,7 +121,7 @@ struct libvlc_global_data_t
 
     /* Arch-specific variables */
 #if !defined( WIN32 )
-    vlc_bool_t             b_daemon;
+    bool             b_daemon;
 #endif
 #if defined( SYS_BEOS )
     vlc_object_t *         p_appthread;
@@ -110,17 +148,36 @@ struct vlc_object_internals_t
     int             i_vars;
 
     /* Thread properties, if any */
-    vlc_thread_t thread_id;
-    vlc_bool_t   b_thread;
+    vlc_thread_t    thread_id;
+    bool            b_thread;
+
+    /* Objects thread synchronization */
+    int             pipes[2];
+    vlc_spinlock_t  spin;
 
     /* Objects management */
-    vlc_bool_t      b_attached;
+    unsigned         i_refcount;
+    vlc_destructor_t pf_destructor;
+    bool             b_attached;
 };
 
+#define ZOOM_SECTION N_("Zoom")
+#define ZOOM_QUARTER_KEY_TEXT N_("1:4 Quarter")
+#define ZOOM_HALF_KEY_TEXT N_("1:2 Half")
+#define ZOOM_ORIGINAL_KEY_TEXT N_("1:1 Original")
+#define ZOOM_DOUBLE_KEY_TEXT N_("2:1 Double")
 
 static inline vlc_object_internals_t *vlc_internals( vlc_object_t *obj )
 {
     return obj->p_internals;
 }
 
+extern module_config_t libvlc_config[];
+extern const size_t libvlc_config_count;
+
+/*
+ * Variables stuff
+ */
+void var_OptionParse (vlc_object_t *, const char *, bool trusted);
+
 #endif