qt4: fix the use of HTTP in open dialog

[vlc] / include / vlc_variables.h

diff --git a/include/vlc_variables.h b/include/vlc_variables.h
index 78cf0e6a8281a2d1f001ab9d8ac550a62df0536e..2b57a6104ea56bd2c65f5393bd3534e4541392ba 100644 (file)
--- a/include/vlc_variables.h
+++ b/include/vlc_variables.h
@@ -123,6 +123,11 @@ 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.
  */
@@ -161,6 +166,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
@@ -172,6 +178,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
  *****************************************************************************/
@@ -356,11 +367,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;
 }