mkv.cpp: add support for the JumpVTS_PTT DVD command

[vlc] / include / variables.h

diff --git a/include/variables.h b/include/variables.h
index c546a88aa6de44f13899d4f68a33376e1b5cd1b0..14203da8d7a9a66071cf947f1e16be25bc51bca0 100644 (file)
--- a/include/variables.h
+++ b/include/variables.h
@@ -87,26 +87,6 @@ struct variable_t
 #define VLC_VAR_TYPE      0x00ff
 #define VLC_VAR_FLAGS     0xff00
 
-/**
- * \defgroup var_type Variable types
- * These are the different types a vlc variable can have.
- * @{
- */
-#define VLC_VAR_VOID      0x0010
-#define VLC_VAR_BOOL      0x0020
-#define VLC_VAR_INTEGER   0x0030
-#define VLC_VAR_HOTKEY    0x0031
-#define VLC_VAR_STRING    0x0040
-#define VLC_VAR_MODULE    0x0041
-#define VLC_VAR_FILE      0x0042
-#define VLC_VAR_DIRECTORY 0x0043
-#define VLC_VAR_VARIABLE  0x0044
-#define VLC_VAR_FLOAT     0x0050
-#define VLC_VAR_TIME      0x0060
-#define VLC_VAR_ADDRESS   0x0070
-#define VLC_VAR_MUTEX     0x0080
-#define VLC_VAR_LIST      0x0090
-/**@}*/
 /** \defgroup var_flags Additive flags
  * These flags are added to the type field of the variable. Most as a result of
  * a __var_Change() call, but some may be added at creation time
@@ -250,6 +230,20 @@ static inline int __var_SetInteger( vlc_object_t *p_obj, const char *psz_name, i
     return __var_Set( p_obj, psz_name, val );
 }
 
+/**
+ * Set the value of an boolean variable
+ *
+ * \param p_obj The object that holds the variable
+ * \param psz_name The name of the variable
+ * \param b The new boolean value of this variable
+ */
+static inline int __var_SetBool( vlc_object_t *p_obj, const char *psz_name, vlc_bool_t b )
+{
+    vlc_value_t val;
+    val.b_bool = b;
+    return __var_Set( p_obj, psz_name, val );
+}
+
 /**
  * Set the value of a time variable
  *
@@ -309,6 +303,11 @@ static inline int __var_SetVoid( vlc_object_t *p_obj, const char *psz_name )
  * __var_SetInteger() with automatic casting
  */
 #define var_SetInteger(a,b,c)   __var_SetInteger( VLC_OBJECT(a),b,c)
+/**
+ * __var_SetBool() with automatic casting
+ */
+#define var_SetBool(a,b,c)   __var_SetBool( VLC_OBJECT(a),b,c)
+
 /**
  * __var_SetTime() with automatic casting
  */
@@ -326,6 +325,103 @@ static inline int __var_SetVoid( vlc_object_t *p_obj, const char *psz_name )
  */
 #define var_SetVoid(a,b)        __var_SetVoid( VLC_OBJECT(a),b)
 
+/**
+ * Get a integer value
+ *
+ * \param p_obj The object that holds the variable
+ * \param psz_name The name of the variable
+ */
+static inline int __var_GetInteger( vlc_object_t *p_obj, const char *psz_name )
+{
+    vlc_value_t val;
+    if( !__var_Get( p_obj, psz_name, &val ) )
+        return val.i_int;
+    else
+        return 0;
+}
+
+/**
+ * Get a boolean value
+ *
+ * \param p_obj The object that holds the variable
+ * \param psz_name The name of the variable
+ */
+static inline int __var_GetBool( vlc_object_t *p_obj, const char *psz_name )
+{
+    vlc_value_t val;
+    if( !__var_Get( p_obj, psz_name, &val ) )
+        return val.b_bool;
+    else
+        return VLC_FALSE;
+}
+
+/**
+ * Get a time value
+ *
+ * \param p_obj The object that holds the variable
+ * \param psz_name The name of the variable
+ */
+static inline int64_t __var_GetTime( vlc_object_t *p_obj, const char *psz_name )
+{
+    vlc_value_t val;
+    if( !__var_Get( p_obj, psz_name, &val ) )
+        return val.i_time;
+    else
+        return 0;
+}
+
+/**
+ * Get a float value
+ *
+ * \param p_obj The object that holds the variable
+ * \param psz_name The name of the variable
+ */
+static inline float __var_GetFloat( vlc_object_t *p_obj, const char *psz_name )
+{
+    vlc_value_t val;
+    if( !__var_Get( p_obj, psz_name, &val ) )
+        return val.f_float;
+    else
+        return 0.0;
+}
+
+/**
+ * Get a string value
+ *
+ * \param p_obj The object that holds the variable
+ * \param psz_name The name of the variable
+ */
+static inline char *__var_GetString( vlc_object_t *p_obj, const char *psz_name )
+{
+    vlc_value_t val;
+    if( !__var_Get( p_obj, psz_name, &val ) )
+        return val.psz_string;
+    else
+        return strdup( "" );
+}
+
+/**
+ * __var_GetInteger() with automatic casting
+ */
+#define var_GetInteger(a,b)   __var_GetInteger( VLC_OBJECT(a),b)
+/**
+ * __var_GetBool() with automatic casting
+ */
+#define var_GetBool(a,b)   __var_GetBool( VLC_OBJECT(a),b)
+/**
+ * __var_GetTime() with automatic casting
+ */
+#define var_GetTime(a,b)   __var_GetTime( VLC_OBJECT(a),b)
+/**
+ * __var_GetFloat() with automatic casting
+ */
+#define var_GetFloat(a,b)   __var_GetFloat( VLC_OBJECT(a),b)
+/**
+ * __var_GetString() with automatic casting
+ */
+#define var_GetString(a,b)   __var_GetString( VLC_OBJECT(a),b)
+
+
 /**
  * Create a integer variable with inherit and get its value.
  *
@@ -343,6 +439,23 @@ static inline int __var_CreateGetInteger( vlc_object_t *p_obj, const char *psz_n
         return 0;
 }
 
+/**
+ * Create a boolean variable with inherit and get its value.
+ *
+ * \param p_obj The object that holds the variable
+ * \param psz_name The name of the variable
+ */
+static inline int __var_CreateGetBool( vlc_object_t *p_obj, const char *psz_name )
+{
+    vlc_value_t val;
+
+    __var_Create( p_obj, psz_name, VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
+    if( !__var_Get( p_obj, psz_name, &val ) )
+        return val.b_bool;
+    else
+        return VLC_FALSE;
+}
+
 /**
  * Create a time variable with inherit and get its value.
  *
@@ -398,6 +511,10 @@ static inline char *__var_CreateGetString( vlc_object_t *p_obj, const char *psz_
  * __var_CreateGetInteger() with automatic casting
  */
 #define var_CreateGetInteger(a,b)   __var_CreateGetInteger( VLC_OBJECT(a),b)
+/**
+ * __var_CreateGetBool() with automatic casting
+ */
+#define var_CreateGetBool(a,b)   __var_CreateGetBool( VLC_OBJECT(a),b)
 /**
  * __var_CreateGetTime() with automatic casting
  */