Privatize input_Preparse

diff --git a/include/vlc_input.h b/include/vlc_input.h
index 5d336fd457bad2803390b42b475b20a3cdabc8dd..55173d318bb49c8d288ac1867328efa20c8f71a5 100644 (file)
--- a/include/vlc_input.h
+++ b/include/vlc_input.h
@@ -439,9 +439,6 @@ VLC_EXPORT( input_thread_t *, __input_CreateThread, ( vlc_object_t *, input_item
 
 VLC_EXPORT( void,             input_StopThread,     ( input_thread_t * ) );
 
-#define input_Preparse(a,b) __input_Preparse(VLC_OBJECT(a),b)
-VLC_EXPORT( int, __input_Preparse, ( vlc_object_t *, input_item_t * ) );
-
 #define input_Read(a,b,c) __input_Read(VLC_OBJECT(a),b, c)
 VLC_EXPORT( int, __input_Read, ( vlc_object_t *, input_item_t *, bool ) );
 

diff --git a/src/input/input.c b/src/input/input.c
index 53b6caf91f99f9c150133f541ac74518fa098ab2..79e42ebf9f5073275bf4e7d484559b63022f9949 100644 (file)
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -412,13 +412,13 @@ int __input_Read( vlc_object_t *p_parent, input_item_t *p_item,
 
 /**
  * Initialize an input and initialize it to preparse the item
- * This function is blocking. It will only accept to parse files
+ * This function is blocking. It will only accept parsing regular files.
  *
  * \param p_parent a vlc_object_t
  * \param p_item an input item
  * \return VLC_SUCCESS or an error
  */
-int __input_Preparse( vlc_object_t *p_parent, input_item_t *p_item )
+int input_Preparse( vlc_object_t *p_parent, input_item_t *p_item )
 {
     input_thread_t *p_input;
 

diff --git a/src/input/input_interface.h b/src/input/input_interface.h
index ae963b5958e2e0c59669ce22d61e631b0b0a0d0b..e1139440a22acacdc9177a5e286ad6680daecc91 100644 (file)
--- a/src/input/input_interface.h
+++ b/src/input/input_interface.h
@@ -38,6 +38,8 @@ void input_item_SetPreparsed( input_item_t *p_i, bool b_preparsed );
 void input_item_SetArtNotFound( input_item_t *p_i, bool b_not_found );
 void input_item_SetArtFetched( input_item_t *p_i, bool b_art_fetched );
 
+int input_Preparse( vlc_object_t *, input_item_t * );
+
 /* misc/stats.c
  * FIXME it should NOT be defined here or not coded in misc/stats.c */
 input_stats_t *stats_NewInputStats( input_thread_t *p_input );

diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index ac593f7369841c8e47fb45997962e86e1bde5237..b022e751e452f6696653694e246b203584510128 100644 (file)
--- a/src/libvlccore.sym
+++ b/src/libvlccore.sym
@@ -182,7 +182,6 @@ input_item_SetMeta
 input_item_SetName
 input_item_SetURI
 input_MetaTypeToLocalizedString
-__input_Preparse
 __input_Read
 input_SplitMRL
 input_StopThread

diff --git a/src/playlist/preparser.c b/src/playlist/preparser.c
index c8c52cadf149599655286a805365256949cc4340..74b3961f475a75e0e3dd8c345d1e81815c058c76 100644 (file)
--- a/src/playlist/preparser.c
+++ b/src/playlist/preparser.c
@@ -127,7 +127,7 @@ static void Preparse( playlist_t *p_playlist, input_item_t *p_item )
     /* Do not preparse if it is already done (like by playing it) */
     if( !input_item_IsPreparsed( p_item ) )
     {
-        input_Preparse( p_playlist, p_item );
+        input_Preparse( VLC_OBJECT(p_playlist), p_item );
         input_item_SetPreparsed( p_item, true );
 
         var_SetInteger( p_playlist, "item-change", p_item->i_id );