Rename vlc_input_item_* functions to input_Item* for consistency

Add input_ItemAddOptionNoDup (unused at the moment)
+ free warning fix

diff --git a/include/vlc_input.h b/include/vlc_input.h
index d4e089d9e9164e3a735559ca1e34549912464237..9dae31964718c75d873a218201608b1cb922bdd3 100644 (file)
--- a/include/vlc_input.h
+++ b/include/vlc_input.h
@@ -90,7 +90,7 @@ struct input_item_t
 #define ITEM_TYPE_NODE          9
 #define ITEM_TYPE_NUMBER        10
 
-static inline void vlc_input_item_Init( vlc_object_t *p_o, input_item_t *p_i )
+static inline void input_ItemInit( vlc_object_t *p_o, input_item_t *p_i )
 {
     memset( p_i, 0, sizeof(input_item_t) );
     p_i->psz_name = 0;
@@ -111,8 +111,8 @@ static inline void vlc_input_item_Init( vlc_object_t *p_o, input_item_t *p_i )
     vlc_mutex_init( p_o, &p_i->lock );
 }
 
-static inline void vlc_input_item_CopyOptions( input_item_t *p_parent,
-                                               input_item_t *p_child )
+static inline void input_ItemCopyOptions( input_item_t *p_parent,
+                                          input_item_t *p_child )
 {
     int i;
     for( i = 0 ; i< p_parent->i_options; i++ )
@@ -126,9 +126,10 @@ static inline void vlc_input_item_CopyOptions( input_item_t *p_parent,
     }
 }
 
-VLC_EXPORT( void, vlc_input_item_AddOption, ( input_item_t *p_input, const char *psz_option ) );
+VLC_EXPORT( void, input_ItemAddOption,( input_item_t *, const char * ) );
+VLC_EXPORT( void, input_ItemAddOptionNoDup,( input_item_t *, const char * ) );
 
-static inline void vlc_input_item_Clean( input_item_t *p_i )
+static inline void input_ItemClean( input_item_t *p_i )
 {
     if( p_i->psz_name ) free( p_i->psz_name );
     if( p_i->psz_uri ) free( p_i->psz_uri );
@@ -180,8 +181,8 @@ static inline void vlc_input_item_Clean( input_item_t *p_i )
     vlc_mutex_destroy( &p_i->lock );
 }
 
-VLC_EXPORT( char *, vlc_input_item_GetInfo, ( input_item_t *p_i, const char *psz_cat,const char *psz_name ) );
-VLC_EXPORT(int, vlc_input_item_AddInfo, ( input_item_t *p_i, const char *psz_cat, const char *psz_name, const char *psz_format, ... ) );
+VLC_EXPORT( char *, input_ItemGetInfo, ( input_item_t *p_i, const char *psz_cat,const char *psz_name ) );
+VLC_EXPORT(int, input_ItemAddInfo, ( input_item_t *p_i, const char *psz_cat, const char *psz_name, const char *psz_format, ... ) );
 
 #define input_ItemNew( a,b,c ) input_ItemNewExt( a, b, c, 0, NULL, -1 )
 #define input_ItemNewExt(a,b,c,d,e,f) __input_ItemNewExt( VLC_OBJECT(a),b,c,d,e,f)

diff --git a/include/vlc_symbols.h b/include/vlc_symbols.h
index b87081d18614d4a5902ae97b114d53be77522913..601b3d8ad8e2a88e564b4cae2c5fa4e7af437349 100644 (file)
--- a/include/vlc_symbols.h
+++ b/include/vlc_symbols.h
@@ -223,8 +223,8 @@ struct module_symbols_t
     void (*tls_ClientDelete_inner) (tls_session_t *);
     image_handler_t * (*__image_HandlerCreate_inner) (vlc_object_t *);
     void (*image_HandlerDelete_inner) (image_handler_t *);
-    char * (*vlc_input_item_GetInfo_inner) (input_item_t *p_i, const char *psz_cat,const char *psz_name);
-    int (*vlc_input_item_AddInfo_inner) (input_item_t *p_i, const char *psz_cat, const char *psz_name, const char *psz_format, ...);
+    void *vlc_input_item_GetInfo_deprecated;
+    void *vlc_input_item_AddInfo_deprecated;
     input_thread_t * (*__input_CreateThread_inner) (vlc_object_t *, input_item_t *);
     int (*__input_Preparse_inner) (vlc_object_t *, input_item_t *);
     void (*input_StopThread_inner) (input_thread_t *);
@@ -502,7 +502,7 @@ struct module_symbols_t
     playlist_item_t * (*__playlist_ItemNewFromInput_inner) (vlc_object_t *p_obj,input_item_t *p_input);
     input_item_t * (*input_ItemGetById_inner) (playlist_t *, int);
     int (*playlist_LiveSearchUpdate_inner) (playlist_t *, playlist_item_t *, const char *);
-    void (*vlc_input_item_AddOption_inner) (input_item_t *p_input, const char *psz_option);
+    void *vlc_input_item_AddOption_deprecated;
     int (*playlist_DeleteFromInput_inner) (playlist_t *, int, playlist_item_t *, vlc_bool_t);
     int (*playlist_DeleteAllFromInput_inner) (playlist_t *, int);
     int (*playlist_LockDeleteAllFromInput_inner) (playlist_t *, int);
@@ -539,6 +539,10 @@ struct module_symbols_t
     void (*playlist_NodesPairCreate_inner) (playlist_t *, char *, playlist_item_t **, playlist_item_t **, vlc_bool_t);
     char * (*aout_VisualChange_inner) (vlc_object_t *, int);
     int (*__input_SecondaryPreparse_inner) (vlc_object_t *, input_item_t *);
+    void (*input_ItemAddOption_inner) (input_item_t *, const char *);
+    char * (*input_ItemGetInfo_inner) (input_item_t *p_i, const char *psz_cat,const char *psz_name);
+    int (*input_ItemAddInfo_inner) (input_item_t *p_i, const char *psz_cat, const char *psz_name, const char *psz_format, ...);
+    void (*input_ItemAddOptionNoDup_inner) (input_item_t *, const char *);
 };
 # if defined (__PLUGIN__)
 #  define aout_FiltersCreatePipeline (p_symbols)->aout_FiltersCreatePipeline_inner
@@ -744,8 +748,6 @@ struct module_symbols_t
 #  define tls_ClientDelete (p_symbols)->tls_ClientDelete_inner
 #  define __image_HandlerCreate (p_symbols)->__image_HandlerCreate_inner
 #  define image_HandlerDelete (p_symbols)->image_HandlerDelete_inner
-#  define vlc_input_item_GetInfo (p_symbols)->vlc_input_item_GetInfo_inner
-#  define vlc_input_item_AddInfo (p_symbols)->vlc_input_item_AddInfo_inner
 #  define __input_CreateThread (p_symbols)->__input_CreateThread_inner
 #  define __input_Preparse (p_symbols)->__input_Preparse_inner
 #  define input_StopThread (p_symbols)->input_StopThread_inner
@@ -982,7 +984,6 @@ struct module_symbols_t
 #  define __playlist_ItemNewFromInput (p_symbols)->__playlist_ItemNewFromInput_inner
 #  define input_ItemGetById (p_symbols)->input_ItemGetById_inner
 #  define playlist_LiveSearchUpdate (p_symbols)->playlist_LiveSearchUpdate_inner
-#  define vlc_input_item_AddOption (p_symbols)->vlc_input_item_AddOption_inner
 #  define playlist_DeleteFromInput (p_symbols)->playlist_DeleteFromInput_inner
 #  define playlist_DeleteAllFromInput (p_symbols)->playlist_DeleteAllFromInput_inner
 #  define playlist_LockDeleteAllFromInput (p_symbols)->playlist_LockDeleteAllFromInput_inner
@@ -1012,6 +1013,10 @@ struct module_symbols_t
 #  define playlist_NodesPairCreate (p_symbols)->playlist_NodesPairCreate_inner
 #  define aout_VisualChange (p_symbols)->aout_VisualChange_inner
 #  define __input_SecondaryPreparse (p_symbols)->__input_SecondaryPreparse_inner
+#  define input_ItemAddOption (p_symbols)->input_ItemAddOption_inner
+#  define input_ItemGetInfo (p_symbols)->input_ItemGetInfo_inner
+#  define input_ItemAddInfo (p_symbols)->input_ItemAddInfo_inner
+#  define input_ItemAddOptionNoDup (p_symbols)->input_ItemAddOptionNoDup_inner
 # elif defined (HAVE_DYNAMIC_PLUGINS) && !defined (__BUILTIN__)
 /******************************************************************
  * STORE_SYMBOLS: store VLC APIs into p_symbols for plugin access.
@@ -1220,8 +1225,6 @@ struct module_symbols_t
     ((p_symbols)->tls_ClientDelete_inner) = tls_ClientDelete; \
     ((p_symbols)->__image_HandlerCreate_inner) = __image_HandlerCreate; \
     ((p_symbols)->image_HandlerDelete_inner) = image_HandlerDelete; \
-    ((p_symbols)->vlc_input_item_GetInfo_inner) = vlc_input_item_GetInfo; \
-    ((p_symbols)->vlc_input_item_AddInfo_inner) = vlc_input_item_AddInfo; \
     ((p_symbols)->__input_CreateThread_inner) = __input_CreateThread; \
     ((p_symbols)->__input_Preparse_inner) = __input_Preparse; \
     ((p_symbols)->input_StopThread_inner) = input_StopThread; \
@@ -1458,7 +1461,6 @@ struct module_symbols_t
     ((p_symbols)->__playlist_ItemNewFromInput_inner) = __playlist_ItemNewFromInput; \
     ((p_symbols)->input_ItemGetById_inner) = input_ItemGetById; \
     ((p_symbols)->playlist_LiveSearchUpdate_inner) = playlist_LiveSearchUpdate; \
-    ((p_symbols)->vlc_input_item_AddOption_inner) = vlc_input_item_AddOption; \
     ((p_symbols)->playlist_DeleteFromInput_inner) = playlist_DeleteFromInput; \
     ((p_symbols)->playlist_DeleteAllFromInput_inner) = playlist_DeleteAllFromInput; \
     ((p_symbols)->playlist_LockDeleteAllFromInput_inner) = playlist_LockDeleteAllFromInput; \
@@ -1488,7 +1490,13 @@ struct module_symbols_t
     ((p_symbols)->playlist_NodesPairCreate_inner) = playlist_NodesPairCreate; \
     ((p_symbols)->aout_VisualChange_inner) = aout_VisualChange; \
     ((p_symbols)->__input_SecondaryPreparse_inner) = __input_SecondaryPreparse; \
+    ((p_symbols)->input_ItemAddOption_inner) = input_ItemAddOption; \
+    ((p_symbols)->input_ItemGetInfo_inner) = input_ItemGetInfo; \
+    ((p_symbols)->input_ItemAddInfo_inner) = input_ItemAddInfo; \
+    ((p_symbols)->input_ItemAddOptionNoDup_inner) = input_ItemAddOptionNoDup; \
     (p_symbols)->net_ConvertIPv4_deprecated = NULL; \
+    (p_symbols)->vlc_input_item_GetInfo_deprecated = NULL; \
+    (p_symbols)->vlc_input_item_AddInfo_deprecated = NULL; \
     (p_symbols)->__playlist_ItemNew_deprecated = NULL; \
     (p_symbols)->__playlist_ItemCopy_deprecated = NULL; \
     (p_symbols)->playlist_ItemAddParent_deprecated = NULL; \
@@ -1530,6 +1538,7 @@ struct module_symbols_t
     (p_symbols)->playlist_PlaylistAdd_deprecated = NULL; \
     (p_symbols)->playlist_PlaylistAddExt_deprecated = NULL; \
     (p_symbols)->playlist_PlaylistAddInput_deprecated = NULL; \
+    (p_symbols)->vlc_input_item_AddOption_deprecated = NULL; \
     (p_symbols)->__intf_UserOkayCancel_deprecated = NULL; \
     (p_symbols)->playlist_NodesCreateForSD_deprecated = NULL; \
     (p_symbols)->stats_TimerClean_deprecated = NULL; \

diff --git a/modules/access/cdda.c b/modules/access/cdda.c
index 47b0290537d969e9cc79f856bf193bfa23d9a6e2..a09ebd8960adf847df937dc17953a6b3bf5bd65c 100644 (file)
--- a/modules/access/cdda.c
+++ b/modules/access/cdda.c
@@ -469,9 +469,9 @@ static int GetTracks( access_t *p_access,
         p_input_item = input_ItemNewWithType( VLC_OBJECT( p_playlist ),
                                               psz_uri, psz_name, 0, NULL, -1,
                                               ITEM_TYPE_DISC );
-        vlc_input_item_AddOption( p_input_item, psz_first );
-        vlc_input_item_AddOption( p_input_item, psz_last );
-        vlc_input_item_AddOption( p_input_item, psz_opt );
+        input_ItemAddOption( p_input_item, psz_first );
+        input_ItemAddOption( p_input_item, psz_last );
+        input_ItemAddOption( p_input_item, psz_opt );
 
 #ifdef HAVE_LIBCDDB
         /* If we have CDDB info, change the name */
@@ -483,7 +483,7 @@ static int GetTracks( access_t *p_access,
             {
                 if( cddb_track_get_title( t )  != NULL )
                 {
-                    vlc_input_item_AddInfo( p_input_item, _(VLC_META_INFO_CAT),
+                    input_ItemAddInfo( p_input_item, _(VLC_META_INFO_CAT),
                                             _(VLC_META_TITLE),
                                             cddb_track_get_title( t ) );
                     if( p_input_item->psz_name )
@@ -494,7 +494,7 @@ static int GetTracks( access_t *p_access,
                 psz_result = cddb_track_get_artist( t );
                 if( psz_result )
                 {
-                    vlc_input_item_AddInfo( p_input_item, _(VLC_META_INFO_CAT),
+                    input_ItemAddInfo( p_input_item, _(VLC_META_INFO_CAT),
                                             _(VLC_META_ARTIST), psz_result );
                 }
             }

diff --git a/modules/access/cdda/info.c b/modules/access/cdda/info.c
index dd8db4cf71f889e9bbd7c95ba0c8dff8909006a8..cc6e596c8f545073a5ade7c06914dc965e306cd8 100644 (file)
--- a/modules/access/cdda/info.c
+++ b/modules/access/cdda/info.c
@@ -812,7 +812,7 @@ CDDAFormatTitle( const access_t *p_access, track_t i_track )
 #define add_playlist_track_info_str(TITLE, FIELD)                        \
     if (FIELD && strlen(FIELD))                                          \
     {                                                                    \
-        vlc_input_item_AddInfo( &p_item->input, _("Track"), _(TITLE),    \
+        input_ItemAddInfo( &p_item->input, _("Track"), _(TITLE),    \
                               "%s", FIELD);                              \
     }
 
@@ -859,7 +859,7 @@ int CDDAAddMetaToItem( access_t *p_access, cdda_data_t *p_cdda,
 {
 #if 0
     add_playlist_track_info_str("Source",  p_cdda->psz_source);
-    vlc_input_item_AddInfo( &p_item->input, _("Track"), _("Track Number"),
+    input_ItemAddInfo( &p_item->input, _("Track"), _("Track Number"),
                            "%d", i_track );
 
     if (p_cdda->p_cdtext[i_track])

diff --git a/modules/codec/vorbis.c b/modules/codec/vorbis.c
index 1064af0c8d7349b10da8689501232cc00a840a54..e17e28ac8bb23cad82b727f6908d84b0bf836c74 100644 (file)
--- a/modules/codec/vorbis.c
+++ b/modules/codec/vorbis.c
@@ -619,7 +619,7 @@ static void ParseVorbisComments( decoder_t *p_dec )
             {
                 vlc_meta_SetArtist( p_input->input.p_item->p_meta,
                                     psz_value );
-                vlc_input_item_AddInfo( p_input->input.p_item,
+                input_ItemAddInfo( p_input->input.p_item,
                                         _(VLC_META_INFO_CAT), _(VLC_META_ARTIST),
                                         "%s", psz_value );
             }

diff --git a/modules/control/http/rpn.c b/modules/control/http/rpn.c
index 1efe2bf4a849d81076b4aeb2faed04d4a785c5bf..ee9291bd23ca88f6f8529e4da67729f0d7b6231a 100644 (file)
--- a/modules/control/http/rpn.c
+++ b/modules/control/http/rpn.c
@@ -981,29 +981,29 @@ void E_(EvaluateRPN)( intf_thread_t *p_intf, mvar_t  *vars,
 #define p_item  p_sys->p_input->input.p_item
                 if( !strcmp( psz_meta, "ARTIST" ) )
                 {
-                    psz_val = vlc_input_item_GetInfo( p_item,
+                    psz_val = input_ItemGetInfo( p_item,
                                 _(VLC_META_INFO_CAT), _(VLC_META_ARTIST) );
                 }
                 else if( !strcmp( psz_meta, "TITLE" ) )
                 {
-                    psz_val = vlc_input_item_GetInfo( p_item,
+                    psz_val = input_ItemGetInfo( p_item,
                                 _(VLC_META_INFO_CAT), _(VLC_META_TITLE) );
                     if( psz_val == NULL )
                         psz_val = strdup( p_item->psz_name );
                 }
                 else if( !strcmp( psz_meta, "ALBUM" ) )
                 {
-                    psz_val = vlc_input_item_GetInfo( p_item,
+                    psz_val = input_ItemGetInfo( p_item,
                                 _(VLC_META_INFO_CAT), _(VLC_META_COLLECTION) );
                 }
                 else if( !strcmp( psz_meta, "GENRE" ) )
                 {
-                    psz_val = vlc_input_item_GetInfo( p_item,
+                    psz_val = input_ItemGetInfo( p_item,
                                 _(VLC_META_INFO_CAT), _(VLC_META_GENRE) );
                 }
                 else
                 {
-                    psz_val = vlc_input_item_GetInfo( p_item,
+                    psz_val = input_ItemGetInfo( p_item,
                                             _(VLC_META_INFO_CAT), psz_meta );
                 }
 #undef p_item

diff --git a/modules/control/http/util.c b/modules/control/http/util.c
index 5c4cae3a5c35797cd1260efa5fdebc710476f6e2..b89a73c8e333691aeacafe240deda8616a01771c 100644 (file)
--- a/modules/control/http/util.c
+++ b/modules/control/http/util.c
@@ -902,7 +902,7 @@ input_item_t *E_(MRLParse)( intf_thread_t *p_intf, char *_psz,
         {
             s_temp = s_mrl + strlen( s_mrl );
         }
-        vlc_input_item_AddOption( p_input, s_mrl );
+        input_ItemAddOption( p_input, s_mrl );
         s_mrl = s_temp;
     }
 

diff --git a/modules/control/rc.c b/modules/control/rc.c
index 7587a1b8bc549630319e36333723963d0c8933fa..bfa7ffbd3b59f99c24d23c3b4df715ba97abf006 100644 (file)
--- a/modules/control/rc.c
+++ b/modules/control/rc.c
@@ -2367,7 +2367,7 @@ static input_item_t *parse_MRL( intf_thread_t *p_intf, char *psz_mrl )
         p_item = input_ItemNew( p_intf, psz_item_mrl, psz_item_mrl );
         for( i = 0; i < i_options; i++ )
         {
-            vlc_input_item_AddOption( p_item, ppsz_options[i] );
+            input_ItemAddOption( p_item, ppsz_options[i] );
         }
     }
 

diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c
index 5a533248ae3b96e019ee4b10fb3512a39f9f9830..d3af967172288a4d86a7963f65427ed449fae475 100644 (file)
--- a/modules/demux/mp4/mp4.c
+++ b/modules/demux/mp4/mp4.c
@@ -414,7 +414,7 @@ static int Open( vlc_object_t * p_this )
                         msg_Dbg( p_demux, "adding ref = `%s'", psz_ref );
                         p_input = input_ItemNewExt( p_playlist, psz_ref, NULL,
                                             0, NULL, -1 );
-                        vlc_input_item_CopyOptions( p_current->p_input, p_input );
+                        input_ItemCopyOptions( p_current->p_input, p_input );
                         playlist_AddWhereverNeeded( p_playlist, p_input, p_current,
                                 p_item_in_category, VLC_FALSE, PLAYLIST_APPEND );
                     }

diff --git a/modules/demux/playlist/asx.c b/modules/demux/playlist/asx.c
index b6963c7d7aeac7ffd2a18ac4cb8dc0d5c61378ac..f1b02b2697fb0b3f241ac22a20061d5ed5fc0dbf 100644 (file)
--- a/modules/demux/playlist/asx.c
+++ b/modules/demux/playlist/asx.c
@@ -353,7 +353,7 @@ static int Demux( demux_t *p_demux )
                             memcpy( psz_string, psz_backup, i_strlen );
                             psz_string[i_strlen] = '\0';
                             p_input = input_ItemNew( p_playlist, psz_string, psz_title_asx );
-                            vlc_input_item_CopyOptions( p_current->p_input, p_input );
+                            input_ItemCopyOptions( p_current->p_input, p_input );
                             playlist_AddWhereverNeeded( p_playlist, p_input, p_current,
                                  p_item_in_category, (i_parent_id > 0 )? VLC_TRUE : VLC_FALSE,
                                  PLAYLIST_APPEND );
@@ -426,7 +426,7 @@ static int Demux( demux_t *p_demux )
                             p_entry = input_ItemNew( p_playlist, psz_string, psz_name );
                             FREENULL( psz_name );
                             
-                            vlc_input_item_CopyOptions( p_current->p_input, p_entry );
+                            input_ItemCopyOptions( p_current->p_input, p_entry );
                             p_entry->p_meta = vlc_meta_New();
                             if( psz_title_entry ) vlc_meta_SetTitle( p_entry->p_meta, psz_title_entry );
                             if( psz_author_entry ) vlc_meta_SetAuthor( p_entry->p_meta, psz_author_entry );

diff --git a/modules/demux/playlist/dvb.c b/modules/demux/playlist/dvb.c
index 403d5e3fafcb0cd1e9467233586e7fc3863ebd79..38d7ef5b2136d85203609ca2e75f5f60866d1494 100644 (file)
--- a/modules/demux/playlist/dvb.c
+++ b/modules/demux/playlist/dvb.c
@@ -115,7 +115,7 @@ static int Demux( demux_t *p_demux )
         for( i = 0; i< i_options; i++ )
         {
             EnsureUTF8( ppsz_options[i] );
-            vlc_input_item_AddOption( p_input, ppsz_options[i] );
+            input_ItemAddOption( p_input, ppsz_options[i] );
         }
         playlist_AddWhereverNeeded( p_playlist, p_input, p_current, 
                                     p_item_in_category,

diff --git a/modules/demux/playlist/gvp.c b/modules/demux/playlist/gvp.c
index 4a0b3496bd7959e9b86cc5c31e04100eb3258c01..fe3033a0fd761d489f9b760d0d0cd310ea2fd18b 100644 (file)
--- a/modules/demux/playlist/gvp.c
+++ b/modules/demux/playlist/gvp.c
@@ -189,7 +189,7 @@ static int Demux( demux_t *p_demux )
     {
         p_input = input_ItemNewExt( p_sys->p_playlist,
                                     psz_url, psz_title, 0, NULL, -1 );
-#define SADD_INFO( type, field ) if( field ) { vlc_input_item_AddInfo( \
+#define SADD_INFO( type, field ) if( field ) { input_ItemAddInfo( \
                     p_input, _("Google Video"), _(type), "%s", field ) ; }
         SADD_INFO( "gvp_version", psz_version );
         SADD_INFO( "docid", psz_docid );

diff --git a/modules/demux/playlist/m3u.c b/modules/demux/playlist/m3u.c
index 30bcc8c5939f78566cd25c06ce16bfbcb6e2bb75..f79dd5eaa8d519746e93a75f096a65becbb785d2 100644 (file)
--- a/modules/demux/playlist/m3u.c
+++ b/modules/demux/playlist/m3u.c
@@ -170,7 +170,7 @@ static int Demux( demux_t *p_demux )
             p_input = input_ItemNewExt( p_playlist, psz_mrl, psz_name,
                                         i_options, ppsz_options, i_duration );
             if ( psz_artist && *psz_artist )
-                vlc_input_item_AddInfo( p_input, _(VLC_META_INFO_CAT),
+                input_ItemAddInfo( p_input, _(VLC_META_INFO_CAT),
                                         _(VLC_META_ARTIST), "%s", psz_artist );
             playlist_AddWhereverNeeded( p_playlist, p_input, p_current,
                  p_item_in_category, (i_parent_id > 0 )? VLC_TRUE : VLC_FALSE,

diff --git a/modules/demux/playlist/playlist.c b/modules/demux/playlist/playlist.c
index bb26f860d0bca4805c49b93483dcfb757b63e0aa..9cff0264da4946f85333c55cd6510d42ba2b9046 100644 (file)
--- a/modules/demux/playlist/playlist.c
+++ b/modules/demux/playlist/playlist.c
@@ -185,7 +185,7 @@ void E_(AddToPlaylist)( demux_t *p_demux, playlist_t *p_playlist,
        playlist_BothAddInput( p_playlist, p_input, p_item,
                               PLAYLIST_APPEND, PLAYLIST_END );
    }
-   vlc_input_item_CopyOptions( p_item->p_input, p_input );
+   input_ItemCopyOptions( p_item->p_input, p_input );
 }
 
 

diff --git a/modules/demux/playlist/pls.c b/modules/demux/playlist/pls.c
index 6230c667df8673a72077c62037266ac787dcb540..fec4b769896b6536ac379c07183fea24e774355d 100644 (file)
--- a/modules/demux/playlist/pls.c
+++ b/modules/demux/playlist/pls.c
@@ -154,7 +154,7 @@ static int Demux( demux_t *p_demux )
             {
                 p_input = input_ItemNewExt( p_playlist, psz_mrl, psz_name,
                                             0, NULL, -1 );
-                vlc_input_item_CopyOptions( p_current->p_input, p_input );
+                input_ItemCopyOptions( p_current->p_input, p_input );
                 playlist_AddWhereverNeeded( p_playlist, p_input, p_current,
                                 p_item_in_category, (i_parent_id > 0 ) ?
                                 VLC_TRUE: VLC_FALSE, PLAYLIST_APPEND );
@@ -211,7 +211,7 @@ static int Demux( demux_t *p_demux )
     if( psz_mrl )
     {
         p_input = input_ItemNewExt( p_playlist, psz_mrl, psz_name,0, NULL, -1 );
-        vlc_input_item_CopyOptions( p_current->p_input, p_input );
+        input_ItemCopyOptions( p_current->p_input, p_input );
         playlist_AddWhereverNeeded( p_playlist, p_input, p_current,
                                 p_item_in_category, (i_parent_id > 0 ) ?
                                 VLC_TRUE: VLC_FALSE, PLAYLIST_APPEND );

diff --git a/modules/demux/playlist/podcast.c b/modules/demux/playlist/podcast.c
index 6d6090d8fc996eb66ca795c945711907cf782e09..6e07bb074f4d27c97d77515837b520fbbf6a2ee5 100644 (file)
--- a/modules/demux/playlist/podcast.c
+++ b/modules/demux/playlist/podcast.c
@@ -234,7 +234,7 @@ static int Demux( demux_t *p_demux )
 #define ADD_GINFO( info, name ) \
     else if( !b_item && !b_image && !strcmp( psz_elname, name ) ) \
     { \
-        vlc_input_item_AddInfo( p_current->p_input, _("Podcast Info"), \
+        input_ItemAddInfo( p_current->p_input, _("Podcast Info"), \
                                 _( info ), "%s", psz_text ); \
     }
                 ADD_GINFO( "Podcast Link", "link" )
@@ -247,7 +247,7 @@ static int Demux( demux_t *p_demux )
                          && ( !strcmp( psz_elname, "itunes:summary" )
                             ||!strcmp( psz_elname, "description" ) ) )
                 { /* <description> isn't standard iTunes podcast stuff */
-                    vlc_input_item_AddInfo( p_current->p_input,
+                    input_ItemAddInfo( p_current->p_input,
                              _( "Podcast Info" ), _( "Podcast Summary" ),
                              "%s", psz_text );
                 }
@@ -272,7 +272,7 @@ static int Demux( demux_t *p_demux )
                                                 psz_item_name, 0, NULL, -1 );
                     if( p_input == NULL ) break;
 #define ADD_INFO( info, field ) \
-    if( field ) { vlc_input_item_AddInfo( p_input, \
+    if( field ) { input_ItemAddInfo( p_input, \
                             _( "Podcast Info" ),  _( info ), "%s", field ); }
                     ADD_INFO( "Podcast Publication Date", psz_item_date  );
                     ADD_INFO( "Podcast Author", psz_item_author );
@@ -284,7 +284,7 @@ static int Demux( demux_t *p_demux )
                     ADD_INFO( "Podcast Type", psz_item_type );
                     if( psz_item_size )
                     {
-                        vlc_input_item_AddInfo( p_input,
+                        input_ItemAddInfo( p_input,
                                                 _( "Podcast Info" ),
                                                 _( "Podcast Size" ),
                                                 "%s bytes",

diff --git a/modules/demux/playlist/qtl.c b/modules/demux/playlist/qtl.c
index 2d906da0d56cc6be602bd5a2c61f0b287303f87a..841d07450864906b746379c57af5284898793970 100644 (file)
--- a/modules/demux/playlist/qtl.c
+++ b/modules/demux/playlist/qtl.c
@@ -357,7 +357,7 @@ static int Demux( demux_t *p_demux )
     {
         p_input = input_ItemNewExt( p_sys->p_playlist,
                                 psz_src, psz_moviename, 0, NULL, -1 );
-#define SADD_INFO( type, field ) if( field ) { vlc_input_item_AddInfo( \
+#define SADD_INFO( type, field ) if( field ) { input_ItemAddInfo( \
                     p_input, "QuickTime Media Link", _(type), "%s", field ) ; }
         SADD_INFO( "href", psz_href );
         SADD_INFO( "mime type", psz_mimetype );

diff --git a/modules/demux/playlist/sgimb.c b/modules/demux/playlist/sgimb.c
index d8c3211e7e9b04a6295267ea14a2431b84891c34..c2ca33e0ca11f72bfbef6c5da7a5da00bf8a3a39 100644 (file)
--- a/modules/demux/playlist/sgimb.c
+++ b/modules/demux/playlist/sgimb.c
@@ -381,27 +381,27 @@ static int Demux ( demux_t *p_demux )
         return VLC_EGENERIC;
     }
 
-    vlc_input_item_CopyOptions( p_current->p_input, p_child );
+    input_ItemCopyOptions( p_current->p_input, p_child );
     if( p_sys->i_packet_size && p_sys->psz_mcast_ip )
     {
         char *psz_option;
         p_sys->i_packet_size += 1000;
         asprintf( &psz_option, "mtu=%i", p_sys->i_packet_size );
-        vlc_input_item_AddOption( p_child, psz_option );
+        input_ItemAddOption( p_child, psz_option );
         free( psz_option );
     }
     if( !p_sys->psz_mcast_ip )
     {
         char *psz_option;
         asprintf( &psz_option, "rtsp-caching=5000" );
-        vlc_input_item_AddOption( p_child, psz_option );
+        input_ItemAddOption( p_child, psz_option );
         free( psz_option );
     }
     if( !p_sys->psz_mcast_ip && p_sys->b_rtsp_kasenna )
     {
         char *psz_option;
         asprintf( &psz_option, "rtsp-kasenna" );
-        vlc_input_item_AddOption( p_child, psz_option );
+        input_ItemAddOption( p_child, psz_option );
         free( psz_option );
     }
 

diff --git a/modules/demux/playlist/shoutcast.c b/modules/demux/playlist/shoutcast.c
index ca7caebbf7bf82393bf7beba7be87f441247bb34..2b0048103ac382f510ee6e1ef4163734e86ea139 100644 (file)
--- a/modules/demux/playlist/shoutcast.c
+++ b/modules/demux/playlist/shoutcast.c
@@ -239,7 +239,7 @@ static int DemuxGenre( demux_t *p_demux )
                              psz_name );
                     p_input = input_ItemNewExt( p_sys->p_playlist, psz_mrl,
                                                 psz_name, 0, NULL, -1 );
-                    vlc_input_item_CopyOptions( p_sys->p_current->p_input,
+                    input_ItemCopyOptions( p_sys->p_current->p_input,
                                                 p_input );
                     free( psz_mrl );
                     playlist_AddWhereverNeeded( p_sys->p_playlist, p_input,
@@ -417,10 +417,10 @@ static int DemuxStation( demux_t *p_demux )
                                                 psz_name , 0, NULL, -1 );
                     free( psz_mrl );
 
-                    vlc_input_item_CopyOptions( p_sys->p_current->p_input,
+                    input_ItemCopyOptions( p_sys->p_current->p_input,
                                                 p_input );
 
-#define SADD_INFO( type, field ) if( field ) { vlc_input_item_AddInfo( \
+#define SADD_INFO( type, field ) if( field ) { input_ItemAddInfo( \
                     p_input, _("Shoutcast"), _(type), "%s", field ) ; }
                     SADD_INFO( "Mime type", psz_mt );
                     SADD_INFO( "Bitrate", psz_br );

diff --git a/modules/demux/playlist/xspf.c b/modules/demux/playlist/xspf.c
index 94adbd73099bba01c8a39f212df6cbf7fe3a0d1c..b676cf334059a23a9e132857e8415717ac970a4b 100644 (file)
--- a/modules/demux/playlist/xspf.c
+++ b/modules/demux/playlist/xspf.c
@@ -524,7 +524,7 @@ static vlc_bool_t parse_track_node COMPLEX_INTERFACE
                                                         NULL, 0, NULL, -1 );
                         p_new_input->p_meta = vlc_meta_New();
                         free( psz_uri );
-                        vlc_input_item_CopyOptions( p_item->p_input, p_new_input );
+                        input_ItemCopyOptions( p_item->p_input, p_new_input );
                         psz_uri = NULL;
                         FREE_ATT();
                         p_handler = NULL;

diff --git a/modules/gui/macosx/playlist.m b/modules/gui/macosx/playlist.m
index d1d066af7ca69aee52c0cfe62e7c2cc288b15e69..d9f137089516f811bc0a3a673e69a568d2812319 100644 (file)
--- a/modules/gui/macosx/playlist.m
+++ b/modules/gui/macosx/playlist.m
@@ -971,7 +971,7 @@ NSLog( @"expandable" );
     {
         for( i = 0; i < (int)[o_options count]; i++ )
         {
-            vlc_input_item_AddOption( p_input, strdup( [[o_options objectAtIndex:i] UTF8String] ) );
+            input_ItemAddOption( p_input, strdup( [[o_options objectAtIndex:i] UTF8String] ) );
         }
     }
 
@@ -1089,7 +1089,7 @@ NSLog( @"expandable" );
         vlc_mutex_lock( &p_playlist->object_lock );
         o_current_name = [NSString stringWithUTF8String:
             p_item->pp_children[i_current]->p_input->psz_name];
-        psz_temp = vlc_input_item_GetInfo( p_item->p_input ,
+        psz_temp = input_ItemGetInfo( p_item->p_input ,
                    _("Meta-information"),_("Artist") );
         o_current_author = [NSString stringWithUTF8String: psz_temp];
         free( psz_temp);

diff --git a/modules/gui/macosx/wizard.m b/modules/gui/macosx/wizard.m
index f8caf0eef21c74c94c0003c4a66b2ef1fbec2391..0dadbc206f97c34915a8e256f59d2225c8d7168d 100644 (file)
--- a/modules/gui/macosx/wizard.m
+++ b/modules/gui/macosx/wizard.m
@@ -1291,13 +1291,13 @@ static VLCWizard *_o_sharedInstance = nil;
                 [[[o_userSelections objectForKey:@"pathToStrm"] \
                 objectAtIndex:x] UTF8String], \
                 [tempString UTF8String] );
-            vlc_input_item_AddOption( p_input, [[[o_userSelections \
+            input_ItemAddOption( p_input, [[[o_userSelections \
                 objectForKey:@"opts"] objectAtIndex: x] UTF8String]);
 
             if(! [[o_userSelections objectForKey:@"partExtractFrom"] \
                 isEqualToString:@""] )
             {
-                vlc_input_item_AddOption( p_input, [[NSString \
+                input_ItemAddOption( p_input, [[NSString \
                     stringWithFormat: @"start-time=%@", [o_userSelections \
                     objectForKey: @"partExtractFrom"]] UTF8String] );
             }
@@ -1305,12 +1305,12 @@ static VLCWizard *_o_sharedInstance = nil;
             if(! [[o_userSelections objectForKey:@"partExtractTo"] \
                 isEqualToString:@""] )
             {
-                vlc_input_item_AddOption( p_input, [[NSString \
+                input_ItemAddOption( p_input, [[NSString \
                     stringWithFormat: @"stop-time=%@", [o_userSelections \
                     objectForKey: @"partExtractTo"]] UTF8String] );
             }
 
-            vlc_input_item_AddOption( p_input, [[NSString stringWithFormat: \
+            input_ItemAddOption( p_input, [[NSString stringWithFormat: \
                 @"ttl=%@", [o_userSelections objectForKey:@"ttl"]] \
                 UTF8String] );
 

diff --git a/modules/gui/wince/playlist.cpp b/modules/gui/wince/playlist.cpp
index e2174cd8cb17ef0ded23e1348fd4cd7c86b9f012..4ed2cd993372b5eecc3d9ab9c9c67236be975510 100644 (file)
--- a/modules/gui/wince/playlist.cpp
+++ b/modules/gui/wince/playlist.cpp
@@ -670,7 +670,7 @@ void Playlist::UpdateItem( int i )
 
     ListView_SetItemText( hListView, i, 0, _FROMMB(p_item->input.psz_name) );
     ListView_SetItemText( hListView, i, 1,
-                          _FROMMB( vlc_input_item_GetInfo( &p_item->input,
+                          _FROMMB( input_ItemGetInfo( &p_item->input,
                                    _("General") , _("Author") ) ) );
 
     char psz_duration[MSTRTIME_MAX_SIZE];

diff --git a/modules/gui/wxwidgets/dialogs/open.cpp b/modules/gui/wxwidgets/dialogs/open.cpp
index e5d1fb248a35f85720f1c294c1fbb7a046f0ab2b..375c8d52eea9e10e90ee4ab2b27ae7276f3727ad 100644 (file)
--- a/modules/gui/wxwidgets/dialogs/open.cpp
+++ b/modules/gui/wxwidgets/dialogs/open.cpp
@@ -1177,7 +1177,7 @@ void OpenDialog::OnOk( wxCommandEvent& WXUNUSED(event) )
                ((const char *)mrl[i + 1].mb_str())[0] == ':' )
         {
             psz_utf8 = wxFromLocale( mrl[i + 1] );
-            vlc_input_item_AddOption( p_input, psz_utf8 );
+            input_ItemAddOption( p_input, psz_utf8 );
             wxLocaleFree( psz_utf8 );
             i++;
         }
@@ -1188,7 +1188,7 @@ void OpenDialog::OnOk( wxCommandEvent& WXUNUSED(event) )
             for( int j = 0; j < (int)subsfile_mrl.GetCount(); j++ )
             {
                 psz_utf8 = wxFromLocale( subsfile_mrl[j] );
-                vlc_input_item_AddOption( p_input, psz_utf8 );
+                input_ItemAddOption( p_input, psz_utf8 );
                 wxLocaleFree( psz_utf8 );
             }
         }
@@ -1199,7 +1199,7 @@ void OpenDialog::OnOk( wxCommandEvent& WXUNUSED(event) )
             for( int j = 0; j < (int)sout_mrl.GetCount(); j++ )
             {
                 psz_utf8 = wxFromLocale( sout_mrl[j] );
-                vlc_input_item_AddOption( p_input, psz_utf8 );
+                input_ItemAddOption( p_input, psz_utf8 );
                 wxLocaleFree( psz_utf8 );
             }
         }

diff --git a/modules/gui/wxwidgets/dialogs/wizard.cpp b/modules/gui/wxwidgets/dialogs/wizard.cpp
index 800915a583cb46678b43b72b76d58a91f7a47f21..4181b4d690ddf652ab9cccc1907ba7ffb3efa23d 100644 (file)
--- a/modules/gui/wxwidgets/dialogs/wizard.cpp
+++ b/modules/gui/wxwidgets/dialogs/wizard.cpp
@@ -1635,23 +1635,23 @@ void WizardDialog::Run()
         {
             input_item_t *p_input = input_ItemNew( p_playlist, mrl,
                                                    ITEM_NAME );
-            vlc_input_item_AddOption( p_input, psz_opt );
+            input_ItemAddOption( p_input, psz_opt );
             if( i_from != 0)
             {
                 char psz_from[20];
                 snprintf( psz_from, 20, "start-time=%i", i_from);
-                vlc_input_item_AddOption( p_input, psz_from );
+                input_ItemAddOption( p_input, psz_from );
             }
             if( i_to != 0)
             {
                 char psz_to[20];
                 snprintf( psz_to, 20, "stop-time=%i", i_to);
-                vlc_input_item_AddOption( p_input, psz_to );
+                input_ItemAddOption( p_input, psz_to );
             }
 
             char psz_ttl[20];
             snprintf( psz_ttl, 20, "ttl=%i",i_ttl );
-            vlc_input_item_AddOption( p_input, psz_ttl );
+            input_ItemAddOption( p_input, psz_ttl );
 
             playlist_PlaylistAddInput( p_playlist, p_input,
                                        PLAYLIST_GO, PLAYLIST_END );

diff --git a/modules/services_discovery/daap.c b/modules/services_discovery/daap.c
index b81277873868026aa5f13936c5eb3463dcca347a..fbb2a85a4b9e6220eb14226d9ff247079085f445 100644 (file)
--- a/modules/services_discovery/daap.c
+++ b/modules/services_discovery/daap.c
@@ -611,9 +611,9 @@ static void ProcessHost( services_discovery_t *p_sd, dhost_t *p_host )
                                                    p_host->p_songs[i].id );
         p_item = playlist_ItemNew( p_sd, psz_buff,
                                          p_host->p_songs[i].itemname );
-        vlc_input_item_AddInfo( &p_item->input, _(VLC_META_INFO_CAT),
+        input_ItemAddInfo( &p_item->input, _(VLC_META_INFO_CAT),
                                 _(VLC_META_ARTIST), p_host->p_songs[i].songartist );
-        vlc_input_item_AddInfo( &p_item->input, _(VLC_META_INFO_CAT),
+        input_ItemAddInfo( &p_item->input, _(VLC_META_INFO_CAT),
                                 _(VLC_META_COLLECTION), p_host->p_songs[i].songalbum );
 
         playlist_NodeAddItem( p_playlist, p_item, VIEW_CATEGORY,

diff --git a/modules/services_discovery/podcast.c b/modules/services_discovery/podcast.c
index a51d68c93b4abd993c0d5d85d71b8ec1869fb324..bdb76a31b661c0b900e5b2c5f4b53f10a4e08d3d 100644 (file)
--- a/modules/services_discovery/podcast.c
+++ b/modules/services_discovery/podcast.c
@@ -167,7 +167,7 @@ static int Open( vlc_object_t *p_this )
         asprintf( &psz_buf, "%s", p_sys->ppsz_urls[i] );
         p_input = input_ItemNewExt( p_playlist, psz_buf,
                                     p_sys->ppsz_urls[i], 0, NULL, -1 );
-        vlc_input_item_AddOption( p_input, "demux=podcast" );
+        input_ItemAddOption( p_input, "demux=podcast" );
         p_item = playlist_NodeAddInput( p_playlist, p_input, p_sys->p_node_cat,
                                         PLAYLIST_APPEND, PLAYLIST_END );
         p_item = playlist_NodeAddInput( p_playlist, p_input, p_sys->p_node_one,

diff --git a/modules/services_discovery/sap.c b/modules/services_discovery/sap.c
index a24d9a2e63dfa897d8556e72dd27eb1ba9eb4d01..7d9f90f51a0f4c0aa5bde749d79557e97a9a2410 100644 (file)
--- a/modules/services_discovery/sap.c
+++ b/modules/services_discovery/sap.c
@@ -817,16 +817,16 @@ sap_announce_t *CreateAnnounce( services_discovery_t *p_sd, uint16_t i_hash,
     }
 
     if( p_sys->b_timeshift )
-        vlc_input_item_AddOption( p_input, ":access-filter=timeshift" );
+        input_ItemAddOption( p_input, ":access-filter=timeshift" );
 
     psz_value = GetAttribute( p_sap->p_sdp, "tool" );
     if( psz_value != NULL )
     {
-        vlc_input_item_AddInfo( p_input, _("Session"),_("Tool"), psz_value );
+        input_ItemAddInfo( p_input, _("Session"),_("Tool"), psz_value );
     }
     if( strcmp( p_sdp->psz_username, "-" ) )
     {
-        vlc_input_item_AddInfo( p_input, _("Session"),
+        input_ItemAddInfo( p_input, _("Session"),
                                 _("User"), p_sdp->psz_username );
     }
 

diff --git a/modules/services_discovery/shout.c b/modules/services_discovery/shout.c
index d2befbe24749da1355a78564e14d593631f5ae4c..129b7fc643023a47ed54a1058b372915771fae59 100644 (file)
--- a/modules/services_discovery/shout.c
+++ b/modules/services_discovery/shout.c
@@ -141,7 +141,7 @@ static int Open( vlc_object_t *p_this, int i_type )
                                 0, NULL, -1 );
             break;
     }
-    vlc_input_item_AddOption( p_sys->p_input, "no-playlist-autostart" );
+    input_ItemAddOption( p_sys->p_input, "no-playlist-autostart" );
     p_sys->p_input->b_prefers_tree = VLC_TRUE;
     p_sys->p_node_cat = playlist_NodeAddInput( p_playlist, p_sys->p_input,
                            p_playlist->p_root_category,

diff --git a/src/control/mediacontrol_core.c b/src/control/mediacontrol_core.c
index bb3e9a750702add06008424466bb282330842eb5..a265d3a2fa9aba13af581a2f76f2d72e1d014bc4 100644 (file)
--- a/src/control/mediacontrol_core.c
+++ b/src/control/mediacontrol_core.c
@@ -249,7 +249,7 @@ mediacontrol_start( mediacontrol_Instance *self,
 
             /* Set start time */
             snprintf( psz_from, 20, "start-time=%i", i_from );
-            vlc_input_item_AddOption( p_playlist->status.p_item->p_input, psz_from );
+            input_ItemAddOption( p_playlist->status.p_item->p_input, psz_from );
             free( psz_from );
         }
 

diff --git a/src/input/control.c b/src/input/control.c
index 87b96f8cec03f478577a472285a03bdbc0204046..072d71262f843a37f539514e23fc4b2dd44a84d5 100644 (file)
--- a/src/input/control.c
+++ b/src/input/control.c
@@ -131,7 +131,7 @@ int input_vaControl( input_thread_t *p_input, int i_query, va_list args )
 
         case INPUT_ADD_INFO:
         {
-            /* FIXME : Impossible to use vlc_input_item_AddInfo because of
+            /* FIXME : Impossible to use input_ItemAddInfo because of
              * the ... problem ? */
             char *psz_cat = (char *)va_arg( args, char * );
             char *psz_name = (char *)va_arg( args, char * );
@@ -253,7 +253,7 @@ int input_vaControl( input_thread_t *p_input, int i_query, va_list args )
             int i_ret = VLC_EGENERIC;
             *ppsz_value = NULL;
 
-            *ppsz_value = vlc_input_item_GetInfo( p_input->input.p_item,
+            *ppsz_value = input_ItemGetInfo( p_input->input.p_item,
                                                   psz_cat, psz_name );
             return i_ret;
         }

diff --git a/src/input/item.c b/src/input/item.c
index 4b20b7d93427d084bdf3e846540174139a4c70e5..c47aba83c6a91843fe462a29b5c11db3aa1b8a8b 100644 (file)
--- a/src/input/item.c
+++ b/src/input/item.c
@@ -38,7 +38,7 @@ static void GuessType( input_item_t *p_item );
  *         empty string otherwise. The caller should free the returned
  *         pointer.
  */
-char *vlc_input_item_GetInfo( input_item_t *p_i,
+char *input_ItemGetInfo( input_item_t *p_i,
                               const char *psz_cat,
                               const char *psz_name )
 {
@@ -67,14 +67,14 @@ char *vlc_input_item_GetInfo( input_item_t *p_i,
     return strdup( "" );
 }
 
-static void vlc_input_item_Destroy ( gc_object_t *p_this )
+static void input_ItemDestroy ( gc_object_t *p_this )
 {
     vlc_object_t *p_obj = (vlc_object_t *)p_this->p_destructor_arg;
     input_item_t *p_input = (input_item_t *) p_this;
     int i;
 
     playlist_t *p_playlist = pl_Yield( p_obj );
-    vlc_input_item_Clean( p_input );
+    input_ItemClean( p_input );
 
     for( i = 0 ; i< p_playlist->i_input_items ; i++ )
     {
@@ -89,7 +89,35 @@ static void vlc_input_item_Destroy ( gc_object_t *p_this )
     free( p_input );
 }
 
-int vlc_input_item_AddInfo( input_item_t *p_i,
+void input_ItemAddOption( input_item_t *p_input,
+                          const char *psz_option )
+{
+    if( !psz_option ) return;
+    vlc_mutex_lock( &p_input->lock );
+    INSERT_ELEM( p_input->ppsz_options, p_input->i_options,
+                 p_input->i_options, strdup( psz_option ) );
+    vlc_mutex_unlock( &p_input->lock );
+}
+
+void input_ItemAddOptionNoDup( input_item_t *p_input,
+                               const char *psz_option )
+{
+    int i;
+    if( !psz_option ) return ;
+    vlc_mutex_lock( &p_input->lock );
+    for( i = 0 ; i< p_input->i_options; i++ )
+    {
+        if( !strcmp( p_input->ppsz_options[i], psz_option ) )
+        {
+            vlc_mutex_unlock(& p_input->lock );
+            return;
+        }
+    }
+    TAB_APPEND( p_input->i_options, p_input->ppsz_options, strdup( psz_option));    vlc_mutex_unlock( &p_input->lock );
+}
+
+
+int input_ItemAddInfo( input_item_t *p_i,
                             const char *psz_cat,
                             const char *psz_name,
                             const char *psz_format, ... )
@@ -156,17 +184,6 @@ int vlc_input_item_AddInfo( input_item_t *p_i,
     return VLC_SUCCESS;
 }
 
-void vlc_input_item_AddOption( input_item_t *p_input,
-                              const char *psz_option )
-{
-    if( !psz_option ) return;
-    vlc_mutex_lock( &p_input->lock );
-    INSERT_ELEM( p_input->ppsz_options, p_input->i_options,
-                 p_input->i_options, strdup( psz_option ) );
-    vlc_mutex_unlock( &p_input->lock );
-};
-
-
 input_item_t *input_ItemGetById( playlist_t *p_playlist, int i_id )
 {
     int i, i_top, i_bottom;
@@ -206,8 +223,8 @@ input_item_t *input_ItemNewWithType( vlc_object_t *p_obj, const char *psz_uri,
     playlist_t *p_playlist = pl_Yield( p_obj );
     DECMALLOC_NULL( p_input, input_item_t );
 
-    vlc_input_item_Init( p_obj, p_input );
-    vlc_gc_init( p_input, vlc_input_item_Destroy, (void *)p_obj );
+    input_ItemInit( p_obj, p_input );
+    vlc_gc_init( p_input, input_ItemDestroy, (void *)p_obj );
 
     PL_LOCK;
     p_input->i_id = ++p_playlist->i_last_input_id;

diff --git a/src/misc/vlm.c b/src/misc/vlm.c
index b8c5b262b5c8a99d74d62bd056ece8ad2340b7bd..7d4579c127cd190ce7108354dd56f4d1df7f6b99 100644 (file)
--- a/src/misc/vlm.c
+++ b/src/misc/vlm.c
@@ -932,7 +932,7 @@ vlm_media_t *vlm_MediaNew( vlm_t *vlm, const char *psz_name, int i_type )
     media->i_instance = 0;
     media->instance = NULL;
 
-    vlc_input_item_Init( VLC_OBJECT(vlm), &media->item );
+    input_ItemInit( VLC_OBJECT(vlm), &media->item );
 
     TAB_APPEND( vlm->i_media, vlm->media, media );
 
@@ -980,7 +980,7 @@ void vlm_MediaDelete( vlm_t *vlm, vlm_media_t *media, const char *psz_name )
     while( media->i_option-- ) free( media->option[media->i_option] );
     if( media->option ) free( media->option );
 
-    vlc_input_item_Clean( &media->item );
+    input_ItemClean( &media->item );
 
     free( media );
 }
@@ -1113,8 +1113,8 @@ int vlm_MediaSetup( vlm_t *vlm, vlm_media_t *media, const char *psz_cmd,
             char *psz_header;
             int i;
 
-            vlc_input_item_Clean( &media->item );
-            vlc_input_item_Init( VLC_OBJECT(vlm), &media->item );
+            input_ItemClean( &media->item );
+            input_ItemInit( VLC_OBJECT(vlm), &media->item );
 
             if( media->psz_output )
                 asprintf( &psz_output, "%s:description", media->psz_output );
@@ -1197,7 +1197,7 @@ int vlm_MediaControl( vlm_t *vlm, vlm_media_t *media, const char *psz_id,
             p_instance = malloc( sizeof(vlm_media_instance_t) );
             if( !p_instance ) return VLC_EGENERIC;
             memset( p_instance, 0, sizeof(vlm_media_instance_t) );
-            vlc_input_item_Init( VLC_OBJECT(vlm), &p_instance->item );
+            input_ItemInit( VLC_OBJECT(vlm), &p_instance->item );
             p_instance->p_input = NULL;
 
             if( ( media->psz_output != NULL ) || ( media->psz_vod_output != NULL ) )
@@ -1248,7 +1248,7 @@ int vlm_MediaControl( vlm_t *vlm, vlm_media_t *media, const char *psz_id,
         if( !p_instance->p_input )
         {
             TAB_REMOVE( media->i_instance, media->instance, p_instance );
-            vlc_input_item_Clean( &p_instance->item );
+            input_ItemClean( &p_instance->item );
             if( p_instance->psz_name ) free( p_instance->psz_name );
         }
         free( psz_header );
@@ -1320,7 +1320,7 @@ int vlm_MediaControl( vlm_t *vlm, vlm_media_t *media, const char *psz_id,
             vlc_object_destroy( p_instance->p_input );
         }
 
-        vlc_input_item_Clean( &p_instance->item );
+        input_ItemClean( &p_instance->item );
         if( p_instance->psz_name ) free( p_instance->psz_name );
         free( p_instance );
 

diff --git a/src/playlist/loadsave.c b/src/playlist/loadsave.c
index ce6ea10d36f0cc607ef8917741d1f4902d1694fb..038b16dbf70581913c6e09614136ee4fa876ba18 100644 (file)
--- a/src/playlist/loadsave.c
+++ b/src/playlist/loadsave.c
@@ -50,7 +50,7 @@ int playlist_Import( playlist_t * p_playlist, const char *psz_filename,
     if( b_only_there )
     {
         asprintf( &psz_opt, "parent-item=%i", p_root->i_id );
-        vlc_input_item_AddOption( p_input, psz_opt );
+        input_ItemAddOption( p_input, psz_opt );
         free( psz_opt );
     }
     playlist_PlaylistAddInput( p_playlist, p_input, PLAYLIST_APPEND,

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index ca06a32d7410364ad1d95f945351d150ff7efbf6..20493384a6b3662e321c2a43e63667927550ad3d 100644 (file)
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -117,7 +117,7 @@ vout_thread_t *__vout_Request( vlc_object_t *p_this, vout_thread_t *p_vout,
         /* Reattach video output to playlist before bailing out */
         if( p_vout )
         {
-            vlc_object_t *p_playlist = pl_Yield( p_this );
+            playlist_t  *p_playlist = pl_Yield( p_this );
             spu_Attach( p_vout->p_spu, p_this, VLC_FALSE );
             vlc_object_detach( p_vout );
             vlc_object_attach( p_vout, p_playlist );
@@ -479,7 +479,7 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt )
 void vout_Destroy( vout_thread_t *p_vout )
 {
     vout_thread_t *p_another_vout;
-    vlc_object_t *p_playlist = pl_Yield( p_vout );
+    playlist_t *p_playlist = pl_Yield( p_vout );
 
     /* Request thread destruction */
     p_vout->b_die = VLC_TRUE;