X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_variables.h;h=04196fdd86aae28c5447c02cf2cbfc24546d0204;hb=39511f2b9c05cbefde171b0fc70ac2f45db5e972;hp=b553a7c3b2fba8f1f44336579b6b59feb084c267;hpb=df61d33b06e2b3cbbe746b2f5a9bea5b370c24ff;p=vlc diff --git a/include/vlc_variables.h b/include/vlc_variables.h index b553a7c3b2..04196fdd86 100644 --- a/include/vlc_variables.h +++ b/include/vlc_variables.h @@ -22,10 +22,6 @@ * 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 @@ -110,6 +106,8 @@ #define VLC_VAR_INHERITVALUE 0x0030 #define VLC_VAR_TRIGGER_CALLBACKS 0x0035 + +#define VLC_VAR_SETISCOMMAND 0x0040 /**@}*/ /***************************************************************************** @@ -359,10 +357,10 @@ 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 )