Add key-action variable - automatically mapped action from key-pressed

[vlc] / src / libvlc.h

diff --git a/src/libvlc.h b/src/libvlc.h
index bb87dcd7a16fb327e8fc67e16bb0ec6b84373129..30a2137d77ff716242efdde9d7d1567a16d90946 100644 (file)
--- a/src/libvlc.h
+++ b/src/libvlc.h
@@ -27,8 +27,30 @@
 
 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
+ */
+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
 
 
 /*
@@ -51,6 +73,20 @@ uint32_t CPUCapabilities( void );
  * LibVLC objects stuff
  */
 
+/**
+ * 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 vlc_object_t *
 vlc_custom_create (vlc_object_t *p_this, size_t i_size, int i_type,
                    const char *psz_type);
@@ -110,70 +146,31 @@ struct vlc_object_internals_t
 
     /* Objects thread synchronization */
     int             pipes[2];
+    vlc_spinlock_t  spin;
 
     /* Objects management */
-    unsigned        i_refcount;
-    vlc_bool_t      b_attached;
+    unsigned         i_refcount;
+    vlc_destructor_t pf_destructor;
+    vlc_bool_t       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;
+
 /*
- * Configuration stuff
+ * Variables stuff
  */
-#if 0
-struct module_config_t
-{
-    int          i_type;                               /* Configuration type */
-    const char  *psz_type;                          /* Configuration subtype */
-    const char  *psz_name;                                    /* Option name */
-    char         i_short;                      /* Optional short option name */
-    const char  *psz_text;      /* Short comment on the configuration option */
-    const char  *psz_longtext;   /* Long comment on the configuration option */
-    module_value_t value;                                    /* Option value */
-    module_value_t orig;
-    module_value_t saved;
-    module_nvalue_t min;
-    module_nvalue_t max;
-
-    /* Function to call when commiting a change */
-    vlc_callback_t pf_callback;
-    void          *p_callback_data;
-
-    /* Values list */
-    const char **ppsz_list;       /* List of possible values for the option */
-    int         *pi_list;                              /* Idem for integers */
-    const char **ppsz_list_text;          /* Friendly names for list values */
-    int          i_list;                               /* Options list size */
-
-    /* Actions list */
-    vlc_callback_t *ppf_action;    /* List of possible actions for a config */
-    const char    **ppsz_action_text;         /* Friendly names for actions */
-    int            i_action;                           /* actions list size */
-
-    /* Misc */
-    vlc_mutex_t *p_lock;            /* Lock to use when modifying the config */
-    vlc_bool_t   b_dirty;          /* Dirty flag to indicate a config change */
-    vlc_bool_t   b_advanced;          /* Flag to indicate an advanced option */
-    vlc_bool_t   b_internal;   /* Flag to indicate option is not to be shown */
-    vlc_bool_t   b_restart;   /* Flag to indicate the option needs a restart */
-                              /* to take effect */
-
-    /* Deprecated */
-    const char    *psz_current;                         /* Good option name */
-    vlc_bool_t     b_strict;                     /* Transitionnal or strict */
-
-    /* Option values loaded from config file */
-    vlc_bool_t   b_autosave;      /* Config will be auto-saved at exit time */
-    vlc_bool_t   b_unsaveable;                    /* Config should be saved */
-};
-#endif
-
-extern const module_config_t libvlc_config[];
-extern const size_t libvlc_config_count;
+void var_OptionParse (vlc_object_t *, const char *, bool trusted);
 
 #endif