X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_variables.h;h=ae29949bd68b77570d1504f9a54f4d2ba5c94f58;hb=a52b66d42253f03343197fde517eef915c16de31;hp=991781e5b5080252dc7a531d76735f954df1b09b;hpb=6aa543713d3f9759aac245e4289376ef187770bb;p=vlc diff --git a/include/vlc_variables.h b/include/vlc_variables.h index 991781e5b5..ae29949bd6 100644 --- a/include/vlc_variables.h +++ b/include/vlc_variables.h @@ -94,6 +94,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 @@ -120,12 +124,11 @@ 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. */ @@ -164,6 +167,7 @@ VLC_EXPORT( int, __var_Command, ( vlc_object_t *, const char *, const char *, co *****************************************************************************/ 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 @@ -175,6 +179,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 *****************************************************************************/ @@ -359,11 +368,11 @@ static inline char *__var_GetString( vlc_object_t *p_obj, const char *psz_name ) 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; }