Unexport var_OptionParse

include/vlc_variables.h

@@ -124,9 +124,6 @@ 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 ** ) );
 

src/input/input.c

@@ -203,7 +203,7 @@ static input_thread_t *Create( vlc_object_t *p_parent, input_item_t *p_item,
     /* Parse input options */
     vlc_mutex_lock( &p_item->lock );
     for( i = 0; i < p_item->i_options; i++ )
-        var_OptionParse( p_input, p_item->ppsz_options[i] );
+        var_OptionParse( VLC_OBJECT(p_input), p_item->ppsz_options[i] );
     vlc_mutex_unlock( &p_item->lock );
 
     /* Create Object Variables for private use only */

src/interface/interface.c

@@ -44,6 +44,7 @@
 
 #include "vlc_interface.h"
 #include "modules/modules.h" // Gruik!
+#include "libvlc.h"
 
 /*****************************************************************************
  * Local prototypes
@@ -92,9 +93,7 @@ intf_thread_t* __intf_Create( vlc_object_t *p_this, const char *psz_module,
     p_intf->b_should_run_on_first_thread = VLC_FALSE;
 
     for( i = 0 ; i< i_options; i++ )
-    {
-        var_OptionParse( p_intf, ppsz_options[i] );
-    }
+        var_OptionParse( p_this, ppsz_options[i] );
 
     /* Choose the best module */
     p_intf->psz_intf = strdup( psz_module );

src/libvlc.h

@@ -177,4 +177,9 @@ struct module_config_t
 extern module_config_t libvlc_config[];
 extern const size_t libvlc_config_count;
 
+/*
+ * Variables stuff
+ */
+void var_OptionParse (vlc_object_t *, const char *);
+
 #endif

src/libvlc.sym

@@ -364,7 +364,6 @@ __var_Create
 __var_DelCallback
 __var_Destroy
 __var_Get
-__var_OptionParse
 __var_Set
 __var_TriggerCallback
 __var_Type