X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_variables.h;h=04196fdd86aae28c5447c02cf2cbfc24546d0204;hb=de587c237065de4696d9d035d0504cdf34990d87;hp=2b2630c3876f696655639a0f9970d3c563b6e2f6;hpb=88870d9b7de97440905805c6c50980bf07367909;p=vlc

diff --git a/include/vlc_variables.h b/include/vlc_variables.h
index 2b2630c387..04196fdd86 100644
--- a/include/vlc_variables.h
+++ b/include/vlc_variables.h
@@ -22,9 +22,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#if !defined( __LIBVLC__ )
-  #error You are not libvlc or one of its plugins. You cannot include this file
-#endif
+#ifndef _VLC_VARIABLES_H
+#define _VLC_VARIABLES_H 1
 
 /**
  * \defgroup variables Variables
@@ -91,6 +90,10 @@
 #define VLC_VAR_SETTEXT             0x0014
 #define VLC_VAR_GETTEXT             0x0015
 
+#define VLC_VAR_GETMIN              0x0016
+#define VLC_VAR_GETMAX              0x0017
+#define VLC_VAR_GETSTEP             0x0018
+
 #define VLC_VAR_ADDCHOICE           0x0020
 #define VLC_VAR_DELCHOICE           0x0021
 #define VLC_VAR_CLEARCHOICES        0x0022
@@ -103,6 +106,8 @@
 
 #define VLC_VAR_INHERITVALUE        0x0030
 #define VLC_VAR_TRIGGER_CALLBACKS   0x0035
+
+#define VLC_VAR_SETISCOMMAND        0x0040
 /**@}*/
 
 /*****************************************************************************
@@ -117,8 +122,10 @@ VLC_EXPORT( int, __var_Type, ( vlc_object_t *, const char * ) );
 VLC_EXPORT( int, __var_Set, ( vlc_object_t *, const char *, vlc_value_t ) );
 VLC_EXPORT( int, __var_Get, ( vlc_object_t *, const char *, vlc_value_t * ) );
 
-#define var_OptionParse(a,b) __var_OptionParse( VLC_OBJECT( a ) , b )
-VLC_EXPORT( void, __var_OptionParse, ( vlc_object_t *, const char * ) );
+#define var_Command(a,b,c,d,e) __var_Command( VLC_OBJECT( a ), b, c, d, e )
+VLC_EXPORT( int, __var_Command, ( vlc_object_t *, const char *, const char *, const char *, char ** ) );
+
+VLC_EXPORT( vlc_mutex_t *, var_AcquireMutex, ( const char * ) );
 
 /**
  * __var_Create() with automatic casting.
@@ -158,6 +165,7 @@ VLC_EXPORT( void, __var_OptionParse, ( vlc_object_t *, const char * ) );
  *****************************************************************************/
 VLC_EXPORT( int, __var_AddCallback, ( vlc_object_t *, const char *, vlc_callback_t, void * ) );
 VLC_EXPORT( int, __var_DelCallback, ( vlc_object_t *, const char *, vlc_callback_t, void * ) );
+VLC_EXPORT( int, __var_TriggerCallback, ( vlc_object_t *, const char * ) );
 
 /**
  * __var_AddCallback() with automatic casting
@@ -169,6 +177,11 @@ VLC_EXPORT( int, __var_DelCallback, ( vlc_object_t *, const char *, vlc_callback
  */
 #define var_DelCallback(a,b,c,d) __var_DelCallback( VLC_OBJECT(a), b, c, d )
 
+/**
+ * __var_TriggerCallback() with automatic casting
+ */
+#define var_TriggerCallback(a,b) __var_TriggerCallback( VLC_OBJECT(a), b )
+
 /*****************************************************************************
  * helpers functions
  *****************************************************************************/
@@ -194,7 +207,7 @@ static inline int __var_SetInteger( vlc_object_t *p_obj, const char *psz_name, i
  * \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 )
+static inline int __var_SetBool( vlc_object_t *p_obj, const char *psz_name, bool b )
 {
     vlc_value_t val;
     val.b_bool = b;
@@ -252,7 +265,7 @@ static inline int __var_SetString( vlc_object_t *p_obj, const char *psz_name, co
 static inline int __var_SetVoid( vlc_object_t *p_obj, const char *psz_name )
 {
     vlc_value_t val;
-    val.b_bool = VLC_TRUE;
+    val.b_bool = true;
     return __var_Set( p_obj, psz_name, val );
 }
 #define var_SetVoid(a,b)        __var_SetVoid( VLC_OBJECT(a),b)
@@ -298,11 +311,11 @@ static inline int __var_GetInteger( vlc_object_t *p_obj, const char *psz_name )
  */
 static inline int __var_GetBool( vlc_object_t *p_obj, const char *psz_name )
 {
-    vlc_value_t val; val.b_bool = VLC_FALSE;
+    vlc_value_t val; val.b_bool = false;
     if( !__var_Get( p_obj, psz_name, &val ) )
         return val.b_bool;
     else
-        return VLC_FALSE;
+        return false;
 }
 
 /**
@@ -344,20 +357,20 @@ static inline float __var_GetFloat( vlc_object_t *p_obj, const char *psz_name )
 static inline char *__var_GetString( vlc_object_t *p_obj, const char *psz_name )
 {
     vlc_value_t val; val.psz_string = NULL;
-    if( !__var_Get( p_obj, psz_name, &val ) )
-        return val.psz_string;
+    if( __var_Get( p_obj, psz_name, &val ) )
+        return NULL;
     else
-        return strdup( "" );
+        return val.psz_string;
 }
 
 static inline char *__var_GetNonEmptyString( vlc_object_t *obj, const char *name )
 {
     vlc_value_t val;
-    if (__var_Get (obj, name, &val))
+    if( __var_Get( obj, name, &val ) )
         return NULL;
-    if (*val.psz_string)
+    if( *val.psz_string )
         return val.psz_string;
-    free (val.psz_string);
+    free( val.psz_string );
     return NULL;
 }
 
@@ -598,4 +611,4 @@ static inline char *__var_CreateGetNonEmptyStringCommand( vlc_object_t *p_obj,
 /**
  * @}
  */
-
+#endif /*  _VLC_VARIABLES_H */