Merge branch 'master' of git@git.videolan.org:vlc

[vlc] / src / libvlc.h

diff --git a/src/libvlc.h b/src/libvlc.h
index 046f0f4f82c753fa0d714fee0ddfad3caf04e0e0..da25c7d6a7ffebaa307e5c251875cf24c84f731c 100644 (file)
--- a/src/libvlc.h
+++ b/src/libvlc.h
@@ -27,9 +27,11 @@
 
 extern const char vlc_usage[];
 
+/* 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
@@ -85,7 +87,7 @@ uint32_t CPUCapabilities( void );
  * @param psz_type object type name
  * @return the created object, or NULL.
  */
-extern vlc_object_t *
+extern void *
 vlc_custom_create (vlc_object_t *p_this, size_t i_size, int i_type,
                    const char *psz_type);
 
@@ -100,7 +102,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
@@ -112,7 +114,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;
@@ -140,7 +142,7 @@ struct vlc_object_internals_t
 
     /* Thread properties, if any */
     vlc_thread_t    thread_id;
-    vlc_bool_t      b_thread;
+    bool      b_thread;
 
     /* Objects thread synchronization */
     int             pipes[2];
@@ -149,7 +151,7 @@ struct vlc_object_internals_t
     /* Objects management */
     unsigned         i_refcount;
     vlc_destructor_t pf_destructor;
-    vlc_bool_t       b_attached;
+    bool       b_attached;
 };
 
 #define ZOOM_SECTION N_("Zoom")