From d11fd0d1e5433a5299fbf0f0150178178ebd3f83 Mon Sep 17 00:00:00 2001 From: Pierre d'Herbemont Date: Fri, 15 Aug 2008 00:09:58 +0200 Subject: [PATCH 1/1] codecleanup: Replace input_Item by input_item. --- include/vlc_input.h | 32 +++++++++++----------- include/vlc_playlist.h | 2 +- modules/access/cdda.c | 8 +++--- modules/access/directory.c | 4 +-- modules/access/mms/mmsh.c | 4 +-- modules/control/http/util.c | 4 +-- modules/control/rc.c | 4 +-- modules/demux/mp4/mp4.c | 6 ++-- modules/demux/playlist/asx.c | 12 ++++---- modules/demux/playlist/b4s.c | 4 +-- modules/demux/playlist/dvb.c | 6 ++-- modules/demux/playlist/gvp.c | 6 ++-- modules/demux/playlist/ifo.c | 4 +-- modules/demux/playlist/itml.c | 4 +-- modules/demux/playlist/m3u.c | 6 ++-- modules/demux/playlist/pls.c | 12 ++++---- modules/demux/playlist/podcast.c | 12 ++++---- modules/demux/playlist/qtl.c | 10 +++---- modules/demux/playlist/sgimb.c | 12 ++++---- modules/demux/playlist/shoutcast.c | 14 +++++----- modules/demux/playlist/xspf.c | 14 +++++----- modules/gui/macosx/applescript.m | 2 +- modules/gui/macosx/playlist.m | 8 +++--- modules/gui/macosx/wizard.m | 10 +++---- modules/gui/qt4/dialogs/open.cpp | 4 +-- modules/gui/qt4/dialogs_provider.cpp | 2 +- modules/gui/wince/playlist.cpp | 2 +- modules/gui/wxwidgets/dialogs/open.cpp | 8 +++--- modules/gui/wxwidgets/dialogs/playlist.cpp | 2 +- modules/gui/wxwidgets/dialogs/wizard.cpp | 10 +++---- modules/misc/lua/vlc.c | 6 ++-- modules/services_discovery/bonjour.c | 2 +- modules/services_discovery/hal.c | 4 +-- modules/services_discovery/podcast.c | 4 +-- modules/services_discovery/sap.c | 8 +++--- modules/services_discovery/shout.c | 6 ++-- modules/services_discovery/upnp_cc.cpp | 2 +- modules/services_discovery/upnp_intel.cpp | 2 +- src/control/media.c | 6 ++-- src/control/media_list.c | 2 +- src/input/control.c | 6 ++-- src/input/item.c | 28 +++++++++---------- src/input/vlm.c | 14 +++++----- src/libvlccore.sym | 12 ++++---- src/playlist/item.c | 4 +-- src/playlist/loadsave.c | 2 +- src/playlist/tree.c | 2 +- 47 files changed, 169 insertions(+), 169 deletions(-) diff --git a/include/vlc_input.h b/include/vlc_input.h index 09603e35f9..ffbdcb8183 100644 --- a/include/vlc_input.h +++ b/include/vlc_input.h @@ -103,7 +103,7 @@ struct input_item_t #define ITEM_TYPE_NODE 8 #define ITEM_TYPE_NUMBER 9 -static inline void input_ItemCopyOptions( input_item_t *p_parent, +static inline void input_item_CopyOptions( input_item_t *p_parent, input_item_t *p_child ) { int i; @@ -137,7 +137,7 @@ static inline void input_item_SetName( input_item_t *p_item, const char *psz_nam * Like the playlist, that there is a new sub item. With this design * It is not the input item's responsability to keep all the ref of * the input item children. */ -static inline void input_ItemAddSubItem( input_item_t *p_parent, +static inline void input_item_AddSubItem( input_item_t *p_parent, input_item_t *p_child ) { vlc_event_t event; @@ -150,22 +150,22 @@ static inline void input_ItemAddSubItem( input_item_t *p_parent, vlc_event_send( &p_parent->event_manager, &event ); } -/* Flags handled past input_ItemAddOpt() */ +/* Flags handled past input_item_AddOpt() */ #define VLC_INPUT_OPTION_TRUSTED 0x2 -/* Flags handled within input_ItemAddOpt() */ +/* Flags handled within input_item_AddOpt() */ #define VLC_INPUT_OPTION_UNIQUE 0x100 -VLC_EXPORT( int, input_ItemAddOpt, ( input_item_t *, const char *str, unsigned flags ) ); +VLC_EXPORT( int, input_item_AddOpt, ( input_item_t *, const char *str, unsigned flags ) ); static inline -int input_ItemAddOption (input_item_t *item, const char *str) +int input_item_AddOption (input_item_t *item, const char *str) { - return input_ItemAddOpt (item, str, VLC_INPUT_OPTION_TRUSTED); + return input_item_AddOpt (item, str, VLC_INPUT_OPTION_TRUSTED); } static inline -int input_ItemHasErrorWhenReading (input_item_t *item) +int input_item_HasErrorWhenReading (input_item_t *item) { return item->b_error_when_reading; } @@ -325,16 +325,16 @@ static inline void input_item_MetaMerge( input_item_t *p_i, const vlc_meta_t * p #define input_item_GetTrackID( item ) input_item_GetMeta( item, vlc_meta_TrackID ) #define input_item_GetSetting( item ) input_item_GetMeta( item, vlc_meta_Setting ) -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, ... ) LIBVLC_FORMAT( 4, 5 ) ); +VLC_EXPORT( char *, input_item_GetInfo, ( input_item_t *p_i, const char *psz_cat,const char *psz_name ) ); +VLC_EXPORT(int, input_item_AddInfo, ( input_item_t *p_i, const char *psz_cat, const char *psz_name, const char *psz_format, ... ) LIBVLC_FORMAT( 4, 5 ) ); -#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) -VLC_EXPORT( input_item_t *, __input_ItemNewExt, (vlc_object_t *, const char *, const char*, int, const char *const *, mtime_t i_duration ) ); -VLC_EXPORT( input_item_t *, input_ItemNewWithType, ( vlc_object_t *, const char *, const char *e, int, const char *const *, mtime_t i_duration, int ) ); +#define input_item_New( a,b,c ) input_item_NewExt( a, b, c, 0, NULL, -1 ) +#define input_item_NewExt(a,b,c,d,e,f) __input_item_NewExt( VLC_OBJECT(a),b,c,d,e,f) +VLC_EXPORT( input_item_t *, __input_item_NewExt, (vlc_object_t *, const char *, const char*, int, const char *const *, mtime_t i_duration ) ); +VLC_EXPORT( input_item_t *, input_item_NewWithType, ( vlc_object_t *, const char *, const char *e, int, const char *const *, mtime_t i_duration, int ) ); -#define input_ItemGetById(a,b) __input_ItemGetById( VLC_OBJECT(a),b ) -VLC_EXPORT( input_item_t *, __input_ItemGetById, (vlc_object_t *, int ) ); +#define input_item_GetById(a,b) __input_item_GetById( VLC_OBJECT(a),b ) +VLC_EXPORT( input_item_t *, __input_item_GetById, (vlc_object_t *, int ) ); /***************************************************************************** * Meta data helpers diff --git a/include/vlc_playlist.h b/include/vlc_playlist.h index e2737e681a..54e457c403 100644 --- a/include/vlc_playlist.h +++ b/include/vlc_playlist.h @@ -409,7 +409,7 @@ static inline int playlist_Import( playlist_t *p_playlist, const char *psz_file) input_item_t *p_input; snprintf( psz_uri, 256+9, "file/://%s", psz_file ); const char *const psz_option = "meta-file"; - p_input = input_ItemNewExt( p_playlist, psz_uri, psz_file, + p_input = input_item_NewExt( p_playlist, psz_uri, psz_file, 1, &psz_option, -1 ); playlist_AddInput( p_playlist, p_input, PLAYLIST_APPEND, PLAYLIST_END, true, false ); diff --git a/modules/access/cdda.c b/modules/access/cdda.c index 18464c9b0b..a5d93adb9e 100644 --- a/modules/access/cdda.c +++ b/modules/access/cdda.c @@ -467,12 +467,12 @@ static int GetTracks( access_t *p_access, psz_name = NULL; /* Create playlist items */ - p_input_item = input_ItemNewWithType( VLC_OBJECT( p_playlist ), + p_input_item = input_item_NewWithType( VLC_OBJECT( p_playlist ), psz_uri, psz_name, 0, NULL, -1, ITEM_TYPE_DISC ); - input_ItemAddOption( p_input_item, psz_first ); - input_ItemAddOption( p_input_item, psz_last ); - input_ItemAddOption( p_input_item, psz_opt ); + input_item_AddOption( p_input_item, psz_first ); + input_item_AddOption( p_input_item, psz_last ); + input_item_AddOption( p_input_item, psz_opt ); #ifdef HAVE_LIBCDDB /* If we have CDDB info, change the name */ diff --git a/modules/access/directory.c b/modules/access/directory.c index 51ea50b3c1..6ceae94aaf 100644 --- a/modules/access/directory.c +++ b/modules/access/directory.c @@ -530,13 +530,13 @@ static int ReadDir( access_t *p_access, playlist_t *p_playlist, memmove (psz_uri + 7, psz_uri, sizeof (psz_uri) - 7); memcpy (psz_uri, "file://", 7); - p_input = input_ItemNewWithType( p_playlist, + p_input = input_item_NewWithType( p_playlist, psz_uri, entry, 0, NULL, -1, ITEM_TYPE_FILE ); if (p_input != NULL) { if( p_current_input ) - input_ItemCopyOptions( p_current_input, p_input ); + input_item_CopyOptions( p_current_input, p_input ); assert( p_parent_category ); int i_ret = playlist_BothAddInput( p_playlist, p_input, p_parent_category, diff --git a/modules/access/mms/mmsh.c b/modules/access/mms/mmsh.c index 6c1b4cc107..10f2037130 100644 --- a/modules/access/mms/mmsh.c +++ b/modules/access/mms/mmsh.c @@ -188,8 +188,8 @@ int MMSHOpen( access_t *p_access ) input_thread_t * p_input = vlc_object_find( p_access, VLC_OBJECT_INPUT, FIND_PARENT ); input_item_t * p_new_loc; /** \bug we do not autodelete here */ - p_new_loc = input_ItemNew( p_access, psz_location, psz_location ); - input_ItemAddSubItem( input_GetItem( p_input ), p_new_loc ); + p_new_loc = input_item_New( p_access, psz_location, psz_location ); + input_item_AddSubItem( input_GetItem( p_input ), p_new_loc ); vlc_object_release( p_input ); free( psz_location ); diff --git a/modules/control/http/util.c b/modules/control/http/util.c index cd84f68586..54ba5c44b8 100644 --- a/modules/control/http/util.c +++ b/modules/control/http/util.c @@ -848,7 +848,7 @@ input_item_t *MRLParse( intf_thread_t *p_intf, char *_psz, s_temp = s_mrl + strlen( s_mrl ); } - p_input = input_ItemNew( p_intf, s_mrl, psz_name ); + p_input = input_item_New( p_intf, s_mrl, psz_name ); s_mrl = s_temp; /* now we can take care of the options */ @@ -861,7 +861,7 @@ input_item_t *MRLParse( intf_thread_t *p_intf, char *_psz, { s_temp = s_mrl + strlen( s_mrl ); } - input_ItemAddOption( p_input, s_mrl ); + input_item_AddOption( p_input, s_mrl ); s_mrl = s_temp; } diff --git a/modules/control/rc.c b/modules/control/rc.c index 2caddd2ecd..5e45c61a62 100644 --- a/modules/control/rc.c +++ b/modules/control/rc.c @@ -2222,10 +2222,10 @@ static input_item_t *parse_MRL( intf_thread_t *p_intf, char *psz_mrl ) /* Now create a playlist item */ if( psz_item_mrl ) { - p_item = input_ItemNew( p_intf, psz_item_mrl, NULL ); + p_item = input_item_New( p_intf, psz_item_mrl, NULL ); for( i = 0; i < i_options; i++ ) { - input_ItemAddOption( p_item, ppsz_options[i] ); + input_item_AddOption( p_item, ppsz_options[i] ); } } diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c index 952480e26f..ffd20f6ebc 100644 --- a/modules/demux/mp4/mp4.c +++ b/modules/demux/mp4/mp4.c @@ -417,10 +417,10 @@ static int Open( vlc_object_t * p_this ) } input_item_t *p_input; msg_Dbg( p_demux, "adding ref = `%s'", psz_ref ); - p_input = input_ItemNewExt( p_demux, psz_ref, NULL, + p_input = input_item_NewExt( p_demux, psz_ref, NULL, 0, NULL, -1 ); - input_ItemCopyOptions( p_current, p_input ); - input_ItemAddSubItem( p_current, p_input ); + input_item_CopyOptions( p_current, p_input ); + input_item_AddSubItem( p_current, p_input ); vlc_gc_decref( p_input ); } else diff --git a/modules/demux/playlist/asx.c b/modules/demux/playlist/asx.c index 0af2d4c0ed..8aad20a7bd 100644 --- a/modules/demux/playlist/asx.c +++ b/modules/demux/playlist/asx.c @@ -459,9 +459,9 @@ static int Demux( demux_t *p_demux ) psz_string = malloc( i_strlen*sizeof( char ) +1); memcpy( psz_string, psz_backup, i_strlen ); psz_string[i_strlen] = '\0'; - p_input = input_ItemNew( p_demux, psz_string, psz_title_asx ); - input_ItemCopyOptions( p_current_input, p_input ); - input_ItemAddSubItem( p_current_input, p_input ); + p_input = input_item_New( p_demux, psz_string, psz_title_asx ); + input_item_CopyOptions( p_current_input, p_input ); + input_item_AddSubItem( p_current_input, p_input ); free( psz_string ); } else continue; @@ -516,9 +516,9 @@ static int Demux( demux_t *p_demux ) /* create the new entry */ asprintf( &psz_name, "%d %s", i_entry_count, ( psz_title_entry ? psz_title_entry : p_current_input->psz_name ) ); - p_entry = input_ItemNewExt( p_demux, psz_href, psz_name, i_options, (const char * const *)ppsz_options, -1 ); + p_entry = input_item_NewExt( p_demux, psz_href, psz_name, i_options, (const char * const *)ppsz_options, -1 ); FREENULL( psz_name ); - input_ItemCopyOptions( p_current_input, p_entry ); + input_item_CopyOptions( p_current_input, p_entry ); while( i_options ) { psz_name = ppsz_options[--i_options]; @@ -530,7 +530,7 @@ static int Demux( demux_t *p_demux ) if( psz_copyright_entry ) input_item_SetCopyright( p_entry, psz_copyright_entry ); if( psz_moreinfo_entry ) input_item_SetURL( p_entry, psz_moreinfo_entry ); if( psz_abstract_entry ) input_item_SetDescription( p_entry, psz_abstract_entry ); - input_ItemAddSubItem( p_current_input, p_entry ); + input_item_AddSubItem( p_current_input, p_entry ); vlc_gc_decref( p_entry ); } diff --git a/modules/demux/playlist/b4s.c b/modules/demux/playlist/b4s.c index bd001894cb..8431a06fd2 100644 --- a/modules/demux/playlist/b4s.c +++ b/modules/demux/playlist/b4s.c @@ -256,7 +256,7 @@ static int Demux( demux_t *p_demux ) if( !psz_elname ) return -1; if( !strcmp( psz_elname, "entry" ) ) { - p_input = input_ItemNewExt( p_demux, psz_mrl, psz_name, + p_input = input_item_NewExt( p_demux, psz_mrl, psz_name, 0, NULL, -1 ); if( psz_now ) input_item_SetNowPlaying( p_input, psz_now ); @@ -267,7 +267,7 @@ static int Demux( demux_t *p_demux ) if( psz_bitrate ) msg_Err( p_demux, "Unsupported meta bitrate" ); - input_ItemAddSubItem( p_current_input, p_input ); + input_item_AddSubItem( p_current_input, p_input ); vlc_gc_decref( p_input ); FREENULL( psz_name ); FREENULL( psz_mrl ); diff --git a/modules/demux/playlist/dvb.c b/modules/demux/playlist/dvb.c index 5bb50cfab9..904be67cd4 100644 --- a/modules/demux/playlist/dvb.c +++ b/modules/demux/playlist/dvb.c @@ -117,13 +117,13 @@ static int Demux( demux_t *p_demux ) EnsureUTF8( psz_name ); - p_input = input_ItemNewExt( p_demux, "dvb://", psz_name, 0, NULL, -1 ); + p_input = input_item_NewExt( p_demux, "dvb://", psz_name, 0, NULL, -1 ); for( i = 0; i< i_options; i++ ) { EnsureUTF8( ppsz_options[i] ); - input_ItemAddOption( p_input, ppsz_options[i] ); + input_item_AddOption( p_input, ppsz_options[i] ); } - input_ItemAddSubItem( p_current_input, p_input ); + input_item_AddSubItem( p_current_input, p_input ); vlc_gc_decref( p_input ); while( i_options-- ) free( ppsz_options[i_options] ); free( ppsz_options ); diff --git a/modules/demux/playlist/gvp.c b/modules/demux/playlist/gvp.c index fdec2fbd86..089284d409 100644 --- a/modules/demux/playlist/gvp.c +++ b/modules/demux/playlist/gvp.c @@ -201,14 +201,14 @@ static int Demux( demux_t *p_demux ) } else { - p_input = input_ItemNewExt( p_demux, + p_input = input_item_NewExt( p_demux, psz_url, psz_title, 0, NULL, -1 ); -#define SADD_INFO( type, field ) if( field ) { input_ItemAddInfo( \ +#define SADD_INFO( type, field ) if( field ) { input_item_AddInfo( \ p_input, _("Google Video"), _(type), "%s", field ) ; } SADD_INFO( "gvp_version", psz_version ); SADD_INFO( "docid", psz_docid ); SADD_INFO( "description", psz_description ); - input_ItemAddSubItem( p_current_input, p_input ); + input_item_AddSubItem( p_current_input, p_input ); vlc_gc_decref( p_input ); } diff --git a/modules/demux/playlist/ifo.c b/modules/demux/playlist/ifo.c index bf02d74355..058da35778 100644 --- a/modules/demux/playlist/ifo.c +++ b/modules/demux/playlist/ifo.c @@ -95,8 +95,8 @@ static int Demux( demux_t *p_demux ) psz_url = (char *)malloc( len+1 ); snprintf( psz_url, len+1, "dvd://%s", p_demux->psz_path ); - p_input = input_ItemNewExt( p_demux, psz_url, psz_url, 0, NULL, -1 ); - input_ItemAddSubItem( p_current_input, p_input ); + p_input = input_item_NewExt( p_demux, psz_url, psz_url, 0, NULL, -1 ); + input_item_AddSubItem( p_current_input, p_input ); vlc_gc_decref( p_input ); HANDLE_PLAY_AND_RELEASE; diff --git a/modules/demux/playlist/itml.c b/modules/demux/playlist/itml.c index 9f756a7111..44e8dd5276 100644 --- a/modules/demux/playlist/itml.c +++ b/modules/demux/playlist/itml.c @@ -380,9 +380,9 @@ static bool parse_track_dict COMPLEX_INTERFACE memmove( psz_uri + 7, psz_uri + 17, strlen( psz_uri ) - 9 ); msg_Info( p_demux, "Adding '%s'", psz_uri ); - p_new_input = input_ItemNewExt( p_demux, psz_uri, + p_new_input = input_item_NewExt( p_demux, psz_uri, NULL, 0, NULL, -1 ); - input_ItemAddSubItem( p_input_item, p_new_input ); + input_item_AddSubItem( p_input_item, p_new_input ); /* add meta info */ add_meta( p_new_input, p_track ); diff --git a/modules/demux/playlist/m3u.c b/modules/demux/playlist/m3u.c index f2de477b73..b5369ef712 100644 --- a/modules/demux/playlist/m3u.c +++ b/modules/demux/playlist/m3u.c @@ -217,15 +217,15 @@ static int Demux( demux_t *p_demux ) b_cleanup = true; if( !psz_mrl ) goto error; - p_input = input_ItemNewExt( p_demux, psz_mrl, psz_name, + p_input = input_item_NewExt( p_demux, psz_mrl, psz_name, 0, NULL, i_duration ); if ( psz_artist && *psz_artist ) input_item_SetArtist( p_input, psz_artist ); - input_ItemAddSubItem( p_current_input, p_input ); + input_item_AddSubItem( p_current_input, p_input ); for( int i = 0; i < i_options; i++ ) - input_ItemAddOpt( p_input, ppsz_options[i], 0 ); + input_item_AddOpt( p_input, ppsz_options[i], 0 ); vlc_gc_decref( p_input ); free( psz_mrl ); } diff --git a/modules/demux/playlist/pls.c b/modules/demux/playlist/pls.c index 3a8d6f2231..099f5c3748 100644 --- a/modules/demux/playlist/pls.c +++ b/modules/demux/playlist/pls.c @@ -159,10 +159,10 @@ static int Demux( demux_t *p_demux ) { if( psz_mrl ) { - p_input = input_ItemNewExt( p_demux, psz_mrl, psz_name, + p_input = input_item_NewExt( p_demux, psz_mrl, psz_name, 0, NULL, -1 ); - input_ItemCopyOptions( p_current_input, p_input ); - input_ItemAddSubItem( p_current_input, p_input ); + input_item_CopyOptions( p_current_input, p_input ); + input_item_AddSubItem( p_current_input, p_input ); vlc_gc_decref( p_input ); } else @@ -215,9 +215,9 @@ static int Demux( demux_t *p_demux ) /* Add last object */ if( psz_mrl ) { - p_input = input_ItemNewExt( p_demux, psz_mrl, psz_name,0, NULL, -1 ); - input_ItemCopyOptions( p_current_input, p_input ); - input_ItemAddSubItem( p_current_input, p_input ); + p_input = input_item_NewExt( p_demux, psz_mrl, psz_name,0, NULL, -1 ); + input_item_CopyOptions( p_current_input, p_input ); + input_item_AddSubItem( p_current_input, p_input ); vlc_gc_decref( p_input ); free( psz_mrl_orig ); psz_mrl = NULL; diff --git a/modules/demux/playlist/podcast.c b/modules/demux/playlist/podcast.c index 31306f4f94..20f8754fec 100644 --- a/modules/demux/playlist/podcast.c +++ b/modules/demux/playlist/podcast.c @@ -233,7 +233,7 @@ static int Demux( demux_t *p_demux ) #define ADD_GINFO( info, name ) \ else if( !b_item && !b_image && !strcmp( psz_elname, name ) ) \ { \ - input_ItemAddInfo( p_current_input, _("Podcast Info"), \ + input_item_AddInfo( p_current_input, _("Podcast Info"), \ _( info ), "%s", psz_text ); \ } ADD_GINFO( "Podcast Link", "link" ) @@ -246,7 +246,7 @@ static int Demux( demux_t *p_demux ) && ( !strcmp( psz_elname, "itunes:summary" ) ||!strcmp( psz_elname, "description" ) ) ) { /* isn't standard iTunes podcast stuff */ - input_ItemAddInfo( p_current_input, + input_item_AddInfo( p_current_input, _( "Podcast Info" ), _( "Podcast Summary" ), "%s", psz_text ); } @@ -272,11 +272,11 @@ static int Demux( demux_t *p_demux ) msg_Err( p_demux, "invalid XML (no enclosure markup)" ); return -1; } - p_input = input_ItemNewExt( p_demux, psz_item_mrl, + p_input = input_item_NewExt( p_demux, psz_item_mrl, psz_item_name, 0, NULL, -1 ); if( p_input == NULL ) break; #define ADD_INFO( info, field ) \ - if( field ) { input_ItemAddInfo( p_input, \ + if( field ) { input_item_AddInfo( p_input, \ _( "Podcast Info" ), _( info ), "%s", field ); } ADD_INFO( "Podcast Publication Date", psz_item_date ); ADD_INFO( "Podcast Author", psz_item_author ); @@ -288,13 +288,13 @@ static int Demux( demux_t *p_demux ) ADD_INFO( "Podcast Type", psz_item_type ); if( psz_item_size ) { - input_ItemAddInfo( p_input, + input_item_AddInfo( p_input, _( "Podcast Info" ), _( "Podcast Size" ), "%s bytes", psz_item_size ); } - input_ItemAddSubItem( p_current_input, p_input ); + input_item_AddSubItem( p_current_input, p_input ); vlc_gc_decref( p_input ); FREENULL( psz_item_name ); FREENULL( psz_item_mrl ); diff --git a/modules/demux/playlist/qtl.c b/modules/demux/playlist/qtl.c index e1585c6dc1..778608765b 100644 --- a/modules/demux/playlist/qtl.c +++ b/modules/demux/playlist/qtl.c @@ -349,19 +349,19 @@ static int Demux( demux_t *p_demux ) } else { - p_input = input_ItemNewExt( p_demux, + p_input = input_item_NewExt( p_demux, psz_src, psz_moviename, 0, NULL, -1 ); -#define SADD_INFO( type, field ) if( field ) { input_ItemAddInfo( \ +#define SADD_INFO( type, field ) if( field ) { input_item_AddInfo( \ p_input, "QuickTime Media Link", _(type), "%s", field ) ; } SADD_INFO( "href", psz_href ); SADD_INFO( "mime type", psz_mimetype ); - input_ItemAddSubItem( p_current_input, p_input ); + input_item_AddSubItem( p_current_input, p_input ); vlc_gc_decref( p_input ); if( psz_qtnext ) { - p_input = input_ItemNewExt( p_demux, + p_input = input_item_NewExt( p_demux, psz_qtnext, NULL, 0, NULL, -1 ); - input_ItemAddSubItem( p_current_input, p_input ); + input_item_AddSubItem( p_current_input, p_input ); vlc_gc_decref( p_input ); } } diff --git a/modules/demux/playlist/sgimb.c b/modules/demux/playlist/sgimb.c index 2f5ec22982..612e5e763a 100644 --- a/modules/demux/playlist/sgimb.c +++ b/modules/demux/playlist/sgimb.c @@ -353,7 +353,7 @@ static int Demux ( demux_t *p_demux ) p_sys->psz_uri, p_sys->i_sid ); } - p_child = input_ItemNewWithType( VLC_OBJECT(p_demux), p_sys->psz_uri, + p_child = input_item_NewWithType( VLC_OBJECT(p_demux), p_sys->psz_uri, p_sys->psz_name ? p_sys->psz_name : p_sys->psz_uri, 0, NULL, p_sys->i_duration, ITEM_TYPE_NET ); @@ -363,31 +363,31 @@ static int Demux ( demux_t *p_demux ) return -1; } - input_ItemCopyOptions( p_current_input, p_child ); + input_item_CopyOptions( p_current_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 ); - input_ItemAddOption( p_child, psz_option ); + input_item_AddOption( p_child, psz_option ); free( psz_option ); } if( !p_sys->psz_mcast_ip ) { char *psz_option; asprintf( &psz_option, "rtsp-caching=5000" ); - input_ItemAddOption( p_child, psz_option ); + input_item_AddOption( 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" ); - input_ItemAddOption( p_child, psz_option ); + input_item_AddOption( p_child, psz_option ); free( psz_option ); } - input_ItemAddSubItem( p_current_input, p_child ); + input_item_AddSubItem( p_current_input, p_child ); vlc_gc_decref( p_child ); HANDLE_PLAY_AND_RELEASE return 0; /* Needed for correct operation of go back */ diff --git a/modules/demux/playlist/shoutcast.c b/modules/demux/playlist/shoutcast.c index 40a79b3a9b..e967fd347b 100644 --- a/modules/demux/playlist/shoutcast.c +++ b/modules/demux/playlist/shoutcast.c @@ -228,12 +228,12 @@ static int DemuxGenre( demux_t *p_demux ) + strlen( "?genre=" ) + strlen( psz_name ) + 1 ); sprintf( psz_mrl, SHOUTCAST_BASE_URL "?genre=%s", psz_name ); - p_input = input_ItemNewExt( p_demux, psz_mrl, + p_input = input_item_NewExt( p_demux, psz_mrl, psz_name, 0, NULL, -1 ); - input_ItemCopyOptions( p_sys->p_current_input, + input_item_CopyOptions( p_sys->p_current_input, p_input ); free( psz_mrl ); - input_ItemAddSubItem( p_sys->p_current_input, p_input ); + input_item_AddSubItem( p_sys->p_current_input, p_input ); vlc_gc_decref( p_input ); FREENULL( psz_name ); } @@ -402,14 +402,14 @@ static int DemuxStation( demux_t *p_demux ) sprintf( psz_mrl, SHOUTCAST_TUNEIN_BASE_URL "%s?id=%s", psz_base, psz_id ); } - p_input = input_ItemNewExt( p_demux, psz_mrl, + p_input = input_item_NewExt( p_demux, psz_mrl, psz_name , 0, NULL, -1 ); free( psz_mrl ); - input_ItemCopyOptions( p_sys->p_current_input, + input_item_CopyOptions( p_sys->p_current_input, p_input ); -#define SADD_INFO( type, field ) if( field ) { input_ItemAddInfo( \ +#define SADD_INFO( type, field ) if( field ) { input_item_AddInfo( \ p_input, _("Shoutcast"), _(type), "%s", field ) ; } SADD_INFO( "Mime type", psz_mt ); SADD_INFO( "Bitrate", psz_br ); @@ -421,7 +421,7 @@ static int DemuxStation( demux_t *p_demux ) input_item_SetNowPlaying( p_input, psz_ct ); if( psz_rt ) input_item_SetRating( p_input, psz_rt ); - input_ItemAddSubItem( p_sys->p_current_input, p_input ); + input_item_AddSubItem( p_sys->p_current_input, p_input ); vlc_gc_decref( p_input ); FREENULL( psz_name ); FREENULL( psz_mt ); diff --git a/modules/demux/playlist/xspf.c b/modules/demux/playlist/xspf.c index a0d308cd83..260c42144c 100644 --- a/modules/demux/playlist/xspf.c +++ b/modules/demux/playlist/xspf.c @@ -136,7 +136,7 @@ int Demux( demux_t *p_demux ) input_item_t *p_new_input = p_demux->p_sys->pp_tracklist[i]; if( p_new_input ) { - input_ItemAddSubItem( p_current_input, p_new_input ); + input_item_AddSubItem( p_current_input, p_new_input ); } } @@ -558,10 +558,10 @@ static bool parse_track_node COMPLEX_INTERFACE free( psz_uri ); psz_uri = psz_tmp; } - p_new_input = input_ItemNewExt( p_demux, psz_uri, + p_new_input = input_item_NewExt( p_demux, psz_uri, NULL, 0, NULL, -1 ); free( psz_uri ); - input_ItemCopyOptions( p_input_item, p_new_input ); + input_item_CopyOptions( p_input_item, p_new_input ); psz_uri = NULL; FREE_ATT(); p_handler = NULL; @@ -672,7 +672,7 @@ static bool set_option SIMPLE_INTERFACE /* re-convert xml special characters inside psz_value */ resolve_xml_special_chars( psz_value ); - input_ItemAddOpt( p_input, psz_value, 0 ); + input_item_AddOpt( p_input, psz_value, 0 ); return true; } @@ -734,11 +734,11 @@ static bool parse_extension_node COMPLEX_INTERFACE msg_Warn( p_demux, " requires \"title\" attribute" ); return false; } - p_new_input = input_ItemNewWithType( VLC_OBJECT( p_demux ), "vlc://nop", + p_new_input = input_item_NewWithType( VLC_OBJECT( p_demux ), "vlc://nop", psz_title, 0, NULL, -1, ITEM_TYPE_DIRECTORY ); if( p_new_input ) { - input_ItemAddSubItem( p_input_item, p_new_input ); + input_item_AddSubItem( p_input_item, p_new_input ); p_input_item = p_new_input; vlc_gc_decref( p_new_input ); } @@ -914,7 +914,7 @@ static bool parse_extitem_node COMPLEX_INTERFACE p_new_input = p_demux->p_sys->pp_tracklist[ i_href ]; if( p_new_input ) { - input_ItemAddSubItem( p_input_item, p_new_input ); + input_item_AddSubItem( p_input_item, p_new_input ); vlc_gc_decref( p_new_input ); p_demux->p_sys->pp_tracklist[i_href] = NULL; } diff --git a/modules/gui/macosx/applescript.m b/modules/gui/macosx/applescript.m index cfba3bb341..b7032344e9 100644 --- a/modules/gui/macosx/applescript.m +++ b/modules/gui/macosx/applescript.m @@ -52,7 +52,7 @@ NSURL * o_url; input_item_t *p_input; - p_input = input_ItemNew( p_playlist, + p_input = input_item_New( p_playlist, [o_urlString fileSystemRepresentation], [[[NSFileManager defaultManager] displayNameAtPath: o_urlString] UTF8String] ); diff --git a/modules/gui/macosx/playlist.m b/modules/gui/macosx/playlist.m index 5e01eda7cb..a4d3f4f75b 100644 --- a/modules/gui/macosx/playlist.m +++ b/modules/gui/macosx/playlist.m @@ -296,7 +296,7 @@ } else if( [[o_tc identifier] isEqualToString:@"status"] ) { - if( input_ItemHasErrorWhenReading( p_item->p_input ) ) + if( input_item_HasErrorWhenReading( p_item->p_input ) ) { o_value = [NSImage imageWithWarningIcon]; } @@ -978,7 +978,7 @@ o_uri = o_temp; } - p_input = input_ItemNew( p_playlist, [o_uri fileSystemRepresentation], [o_name UTF8String] ); + p_input = input_item_New( p_playlist, [o_uri fileSystemRepresentation], [o_name UTF8String] ); if( !p_input ) return NULL; @@ -986,7 +986,7 @@ { for( i = 0; i < (int)[o_options count]; i++ ) { - input_ItemAddOption( p_input, strdup( [[o_options objectAtIndex:i] UTF8String] ) ); + input_item_AddOption( p_input, strdup( [[o_options objectAtIndex:i] UTF8String] ) ); } } @@ -1102,7 +1102,7 @@ PL_LOCK; o_current_name = [NSString stringWithUTF8String: p_item->pp_children[i_current]->p_input->psz_name]; - psz_temp = input_ItemGetInfo( p_item->p_input , + psz_temp = input_item_GetInfo( 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 efc3fef4ff..ec94012776 100644 --- a/modules/gui/macosx/wizard.m +++ b/modules/gui/macosx/wizard.m @@ -1265,17 +1265,17 @@ static VLCWizard *_o_sharedInstance = nil; NSString *tempString = [NSString stringWithFormat: @"%@ (%i/%i)", _NS("Streaming/Transcoding Wizard"), ( x + 1 ), y]; - input_item_t *p_input = input_ItemNew( p_playlist, + input_item_t *p_input = input_item_New( p_playlist, [[[o_userSelections objectForKey:@"pathToStrm"] objectAtIndex:x] UTF8String], [tempString UTF8String] ); - input_ItemAddOption( p_input, [[[o_userSelections + input_item_AddOption( p_input, [[[o_userSelections objectForKey:@"opts"] objectAtIndex: x] UTF8String]); if(! [[o_userSelections objectForKey:@"partExtractFrom"] isEqualToString:@""] ) { - input_ItemAddOption( p_input, [[NSString + input_item_AddOption( p_input, [[NSString stringWithFormat: @"start-time=%@", [o_userSelections objectForKey: @"partExtractFrom"]] UTF8String] ); } @@ -1283,12 +1283,12 @@ static VLCWizard *_o_sharedInstance = nil; if(! [[o_userSelections objectForKey:@"partExtractTo"] isEqualToString:@""] ) { - input_ItemAddOption( p_input, [[NSString + input_item_AddOption( p_input, [[NSString stringWithFormat: @"stop-time=%@", [o_userSelections objectForKey: @"partExtractTo"]] UTF8String] ); } - input_ItemAddOption( p_input, [[NSString stringWithFormat: + input_item_AddOption( p_input, [[NSString stringWithFormat: @"ttl=%@", [o_userSelections objectForKey:@"ttl"]] UTF8String] ); diff --git a/modules/gui/qt4/dialogs/open.cpp b/modules/gui/qt4/dialogs/open.cpp index b3dbafcf7a..88df3e1a5d 100644 --- a/modules/gui/qt4/dialogs/open.cpp +++ b/modules/gui/qt4/dialogs/open.cpp @@ -308,13 +308,13 @@ void OpenDialog::finish( bool b_enqueue = false ) bool b_start = !i && !b_enqueue; input_item_t *p_input; - p_input = input_ItemNew( p_intf, qtu( tempMRL[i] ), NULL ); + p_input = input_item_New( p_intf, qtu( tempMRL[i] ), NULL ); /* Insert options */ while( i + 1 < tempMRL.size() && tempMRL[i + 1].startsWith( ":" ) ) { i++; - input_ItemAddOption( p_input, qtu( tempMRL[i] ) ); + input_item_AddOption( p_input, qtu( tempMRL[i] ) ); } /* Switch between enqueuing and starting the item */ diff --git a/modules/gui/qt4/dialogs_provider.cpp b/modules/gui/qt4/dialogs_provider.cpp index dca23626d9..2bb90cb899 100644 --- a/modules/gui/qt4/dialogs_provider.cpp +++ b/modules/gui/qt4/dialogs_provider.cpp @@ -414,7 +414,7 @@ static void openDirectory( intf_thread_t *p_intf, bool pl, bool go ) { QString dir = QFileDialog::getExistingDirectory( 0, qtr("Open Directory") ); if (!dir.isEmpty()) { - input_item_t *p_input = input_ItemNewExt( THEPL, + input_item_t *p_input = input_item_NewExt( THEPL, qtu( "directory://" + dir ), NULL, 0, NULL, -1 ); diff --git a/modules/gui/wince/playlist.cpp b/modules/gui/wince/playlist.cpp index 44ffe54943..5d4f0dca0c 100644 --- a/modules/gui/wince/playlist.cpp +++ b/modules/gui/wince/playlist.cpp @@ -667,7 +667,7 @@ void Playlist::UpdateItem( int i ) ListView_SetItemText( hListView, i, 0, _FROMMB(p_item->input.psz_name) ); ListView_SetItemText( hListView, i, 1, - _FROMMB( input_ItemGetInfo( &p_item->input, + _FROMMB( input_item_GetInfo( &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 7430c62290..4815671f16 100644 --- a/modules/gui/wxwidgets/dialogs/open.cpp +++ b/modules/gui/wxwidgets/dialogs/open.cpp @@ -1168,7 +1168,7 @@ void OpenDialog::OnOk( wxCommandEvent& WXUNUSED(event) ) char *psz_utf8; psz_utf8 = wxFromLocale( mrl[i] ); - p_input = input_ItemNew( p_intf, psz_utf8, NULL ); + p_input = input_item_New( p_intf, psz_utf8, NULL ); wxLocaleFree( psz_utf8 ); /* Insert options */ @@ -1176,7 +1176,7 @@ void OpenDialog::OnOk( wxCommandEvent& WXUNUSED(event) ) ((const char *)mrl[i + 1].mb_str(wxConvUTF8))[0] == ':' ) { psz_utf8 = wxFromLocale( mrl[i + 1] ); - input_ItemAddOption( p_input, psz_utf8 ); + input_item_AddOption( p_input, psz_utf8 ); wxLocaleFree( psz_utf8 ); i++; } @@ -1187,7 +1187,7 @@ void OpenDialog::OnOk( wxCommandEvent& WXUNUSED(event) ) for( int j = 0; j < (int)subsfile_mrl.GetCount(); j++ ) { psz_utf8 = wxFromLocale( subsfile_mrl[j] ); - input_ItemAddOption( p_input, psz_utf8 ); + input_item_AddOption( p_input, psz_utf8 ); wxLocaleFree( psz_utf8 ); } } @@ -1198,7 +1198,7 @@ void OpenDialog::OnOk( wxCommandEvent& WXUNUSED(event) ) for( int j = 0; j < (int)sout_mrl.GetCount(); j++ ) { psz_utf8 = wxFromLocale( sout_mrl[j] ); - input_ItemAddOption( p_input, psz_utf8 ); + input_item_AddOption( p_input, psz_utf8 ); wxLocaleFree( psz_utf8 ); } } diff --git a/modules/gui/wxwidgets/dialogs/playlist.cpp b/modules/gui/wxwidgets/dialogs/playlist.cpp index 9ca6fc98ff..9f0a12ebe6 100644 --- a/modules/gui/wxwidgets/dialogs/playlist.cpp +++ b/modules/gui/wxwidgets/dialogs/playlist.cpp @@ -1285,7 +1285,7 @@ bool PlaylistFileDropTarget::OnDropFiles( wxCoord x, wxCoord y, for( size_t i = 0; i < filenames.GetCount(); i++ ) { char *psz_utf8 = wxDnDFromLocale( filenames[i] ); - input_item_t *p_input = input_ItemNew( p->p_playlist, + input_item_t *p_input = input_item_New( p->p_playlist, psz_utf8, psz_utf8 ); int i_ret = ( playlist_BothAddInput( p->p_playlist, p_input, p_dest, PLAYLIST_PREPARSE, i_pos, NULL, NULL, pl_Unlocked ) != VLC_SUCCESS ); diff --git a/modules/gui/wxwidgets/dialogs/wizard.cpp b/modules/gui/wxwidgets/dialogs/wizard.cpp index 8d0c6f5deb..ce38db132d 100644 --- a/modules/gui/wxwidgets/dialogs/wizard.cpp +++ b/modules/gui/wxwidgets/dialogs/wizard.cpp @@ -1609,25 +1609,25 @@ void WizardDialog::Run() playlist_t *p_playlist = pl_Yield( p_intf ); if( p_playlist ) { - input_item_t *p_input = input_ItemNew( p_playlist, mrl, + input_item_t *p_input = input_item_New( p_playlist, mrl, ITEM_NAME ); - input_ItemAddOption( p_input, psz_opt ); + input_item_AddOption( p_input, psz_opt ); if( i_from != 0) { char psz_from[20]; snprintf( psz_from, 20, "start-time=%i", i_from); - input_ItemAddOption( p_input, psz_from ); + input_item_AddOption( p_input, psz_from ); } if( i_to != 0) { char psz_to[20]; snprintf( psz_to, 20, "stop-time=%i", i_to); - input_ItemAddOption( p_input, psz_to ); + input_item_AddOption( p_input, psz_to ); } char psz_ttl[20]; snprintf( psz_ttl, 20, "ttl=%i",i_ttl ); - input_ItemAddOption( p_input, psz_ttl ); + input_item_AddOption( p_input, psz_ttl ); /* FIXME: playlist_AddInput() can fail */ playlist_AddInput( p_playlist, p_input, diff --git a/modules/misc/lua/vlc.c b/modules/misc/lua/vlc.c index 36fee88a06..dcf87b12f5 100644 --- a/modules/misc/lua/vlc.c +++ b/modules/misc/lua/vlc.c @@ -316,7 +316,7 @@ void __vlclua_read_custom_meta_data( vlc_object_t *p_this, lua_State *L, msg_Dbg( p_this, "Custom meta %s, %s: %s", psz_meta_category, psz_meta_name, psz_meta_value ); - input_ItemAddInfo( p_input, psz_meta_category, + input_item_AddInfo( p_input, psz_meta_category, psz_meta_name, psz_meta_value ); } lua_pop( L, 1 ); /* pop item */ @@ -433,7 +433,7 @@ int __vlclua_playlist_add_internal( vlc_object_t *p_this, lua_State *L, vlclua_read_options( p_this, L, &i_options, &ppsz_options ); /* Create input item */ - p_input = input_ItemNewExt( p_playlist, psz_path, + p_input = input_item_NewExt( p_playlist, psz_path, psz_name, i_options, (const char **)ppsz_options, i_duration ); @@ -448,7 +448,7 @@ int __vlclua_playlist_add_internal( vlc_object_t *p_this, lua_State *L, /* Append item to playlist */ if( p_parent ) /* Add to node */ - input_ItemAddSubItem( p_parent, p_input ); + input_item_AddSubItem( p_parent, p_input ); else /* Play or Enqueue (preparse) */ /* FIXME: playlist_AddInput() can fail */ playlist_AddInput( p_playlist, p_input, diff --git a/modules/services_discovery/bonjour.c b/modules/services_discovery/bonjour.c index f30c0e2f25..fa9d408191 100644 --- a/modules/services_discovery/bonjour.c +++ b/modules/services_discovery/bonjour.c @@ -191,7 +191,7 @@ static void resolve_callback( if( psz_uri != NULL ) { - p_input = input_ItemNewExt( p_sd, psz_uri, name, 0, NULL, -1 ); + p_input = input_item_NewExt( p_sd, psz_uri, name, 0, NULL, -1 ); free( (void *)psz_uri ); } if( p_input != NULL ) diff --git a/modules/services_discovery/hal.c b/modules/services_discovery/hal.c index fbc3ea65ec..b45b5fdee0 100644 --- a/modules/services_discovery/hal.c +++ b/modules/services_discovery/hal.c @@ -213,7 +213,7 @@ static void AddDvd( services_discovery_t *p_sd, const char *psz_device ) if( asprintf( &psz_uri, "dvd://%s", psz_blockdevice ) == -1 ) return; /* Create the playlist item here */ - p_input = input_ItemNew( p_sd, psz_uri, psz_name ); + p_input = input_item_New( p_sd, psz_uri, psz_name ); free( psz_uri ); if( !p_input ) { @@ -255,7 +255,7 @@ static void AddCdda( services_discovery_t *p_sd, const char *psz_device ) if( asprintf( &psz_uri, "cdda://%s", psz_blockdevice ) == -1 ) return; /* Create the item here */ - p_input = input_ItemNew( p_sd, psz_uri, "Audio CD" ); + p_input = input_item_New( p_sd, psz_uri, "Audio CD" ); free( psz_uri ); if( !p_input ) return; diff --git a/modules/services_discovery/podcast.c b/modules/services_discovery/podcast.c index 690d0e39d1..2c4e8f2ef7 100644 --- a/modules/services_discovery/podcast.c +++ b/modules/services_discovery/podcast.c @@ -219,9 +219,9 @@ static void ParseUrls( services_discovery_t *p_sd, char *psz_urls ) input_item_t *p_input; INSERT_ELEM( p_sys->ppsz_urls, p_sys->i_urls, p_sys->i_urls, strdup( psz_urls ) ); - p_input = input_ItemNewExt( p_sd, psz_urls, + p_input = input_item_NewExt( p_sd, psz_urls, psz_urls, 0, NULL, -1 ); - input_ItemAddOption( p_input, "demux=podcast" ); + input_item_AddOption( p_input, "demux=podcast" ); services_discovery_AddItem( p_sd, p_input, NULL /* no cat */ ); vlc_gc_decref( p_input ); INSERT_ELEM( p_sys->pp_input, p_sys->i_input, p_sys->i_input, diff --git a/modules/services_discovery/sap.c b/modules/services_discovery/sap.c index ff4b739b72..7db0acda43 100644 --- a/modules/services_discovery/sap.c +++ b/modules/services_discovery/sap.c @@ -854,7 +854,7 @@ sap_announce_t *CreateAnnounce( services_discovery_t *p_sd, uint16_t i_hash, p_sap->p_sdp = p_sdp; /* Released in RemoveAnnounce */ - p_input = input_ItemNewWithType( VLC_OBJECT(p_sd), + p_input = input_item_NewWithType( VLC_OBJECT(p_sd), p_sap->p_sdp->psz_uri, p_sdp->psz_sessionname, 0, NULL, -1, ITEM_TYPE_NET ); @@ -866,16 +866,16 @@ sap_announce_t *CreateAnnounce( services_discovery_t *p_sd, uint16_t i_hash, } if( p_sys->b_timeshift ) - input_ItemAddOption( p_input, ":access-filter=timeshift" ); + input_item_AddOption( p_input, ":access-filter=timeshift" ); psz_value = GetAttribute( p_sap->p_sdp->pp_attributes, p_sap->p_sdp->i_attributes, "tool" ); if( psz_value != NULL ) { - input_ItemAddInfo( p_input, _("Session"), _("Tool"), "%s", psz_value ); + input_item_AddInfo( p_input, _("Session"), _("Tool"), "%s", psz_value ); } if( strcmp( p_sdp->username, "-" ) ) { - input_ItemAddInfo( p_input, _("Session"), _("User"), "%s", + input_item_AddInfo( p_input, _("Session"), _("User"), "%s", p_sdp->username ); } diff --git a/modules/services_discovery/shout.c b/modules/services_discovery/shout.c index afffb57dd7..bab1f0204b 100644 --- a/modules/services_discovery/shout.c +++ b/modules/services_discovery/shout.c @@ -174,14 +174,14 @@ static input_item_t * CreateInputItemFromShoutItem( services_discovery_t *p_sd, { int i; /* Create the item */ - input_item_t *p_input = input_ItemNewExt( p_sd, + input_item_t *p_input = input_item_NewExt( p_sd, p_item->psz_url, _(p_item->psz_name), 0, NULL, -1 ); /* Copy options */ for( i = 0; p_item->ppsz_options[i] != NULL; i++ ) - input_ItemAddOption( p_input, p_item->ppsz_options[i] ); - input_ItemAddOption( p_input, "no-playlist-autostart" ); + input_item_AddOption( p_input, p_item->ppsz_options[i] ); + input_item_AddOption( p_input, "no-playlist-autostart" ); return p_input; } diff --git a/modules/services_discovery/upnp_cc.cpp b/modules/services_discovery/upnp_cc.cpp index 91bec309b2..7dfe82d0eb 100644 --- a/modules/services_discovery/upnp_cc.cpp +++ b/modules/services_discovery/upnp_cc.cpp @@ -217,7 +217,7 @@ void UPnPHandler::AddContent( playlist_item_t *p_parent, ContentNode *node ) if ( node->isItemNode() ) { ItemNode *iNode = (ItemNode *)node; - input_item_t *p_input = input_ItemNew( p_sd, iNode->getResource(), title ); + input_item_t *p_input = input_item_New( p_sd, iNode->getResource(), title ); /* FIXME: playlist_AddInput() can fail */ playlist_BothAddInput( p_playlist, p_input, p_parent, PLAYLIST_APPEND, PLAYLIST_END, NULL, NULL, diff --git a/modules/services_discovery/upnp_intel.cpp b/modules/services_discovery/upnp_intel.cpp index 0f0cbbd776..0c3f3a59a7 100644 --- a/modules/services_discovery/upnp_intel.cpp +++ b/modules/services_discovery/upnp_intel.cpp @@ -880,7 +880,7 @@ void MediaServer::_buildPlaylist( Container* parent ) Item* item = parent->getItem( i ); playlist_item_t* parentNode = parent->getPlaylistNode(); - input_item_t* p_input = input_ItemNew( _cookie->serviceDiscovery, + input_item_t* p_input = input_item_New( _cookie->serviceDiscovery, item->getResource(), item->getTitle() ); int i_cat; diff --git a/src/control/media.c b/src/control/media.c index c7e64d4db4..0192227e88 100644 --- a/src/control/media.c +++ b/src/control/media.c @@ -288,7 +288,7 @@ libvlc_media_t * libvlc_media_new( input_item_t * p_input_item; libvlc_media_t * p_md; - p_input_item = input_ItemNew( p_instance->p_libvlc_int, psz_mrl, NULL ); + p_input_item = input_item_New( p_instance->p_libvlc_int, psz_mrl, NULL ); if (!p_input_item) { @@ -316,7 +316,7 @@ libvlc_media_t * libvlc_media_new_as_node( input_item_t * p_input_item; libvlc_media_t * p_md; - p_input_item = input_ItemNew( p_instance->p_libvlc_int, "vlc://nop", psz_name ); + p_input_item = input_item_New( p_instance->p_libvlc_int, "vlc://nop", psz_name ); if (!p_input_item) { @@ -346,7 +346,7 @@ void libvlc_media_add_option( libvlc_exception_t *p_e ) { VLC_UNUSED(p_e); - input_ItemAddOpt( p_md->p_input_item, ppsz_option, + input_item_AddOpt( p_md->p_input_item, ppsz_option, VLC_INPUT_OPTION_UNIQUE|VLC_INPUT_OPTION_TRUSTED ); } diff --git a/src/control/media_list.c b/src/control/media_list.c index 8f841448b8..2eae4971ab 100644 --- a/src/control/media_list.c +++ b/src/control/media_list.c @@ -222,7 +222,7 @@ libvlc_media_list_add_file_content( libvlc_media_list_t * p_mlist, input_item_t * p_input_item; libvlc_media_t * p_md; - p_input_item = input_ItemNewExt( p_mlist->p_libvlc_instance->p_libvlc_int, psz_uri, + p_input_item = input_item_NewExt( p_mlist->p_libvlc_instance->p_libvlc_int, psz_uri, _("Media Library"), 0, NULL, -1 ); if( !p_input_item ) diff --git a/src/input/control.c b/src/input/control.c index 061d8ccf88..123c9f908f 100644 --- a/src/input/control.c +++ b/src/input/control.c @@ -132,7 +132,7 @@ int input_vaControl( input_thread_t *p_input, int i_query, va_list args ) case INPUT_ADD_INFO: { - /* FIXME : Impossible to use input_ItemAddInfo because of + /* FIXME : Impossible to use input_item_AddInfo because of * the ... problem ? */ char *psz_cat = (char *)va_arg( args, char * ); char *psz_name = (char *)va_arg( args, char * ); @@ -286,7 +286,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 = input_ItemGetInfo( p_input->p->input.p_item, + *ppsz_value = input_item_GetInfo( p_input->p->input.p_item, psz_cat, psz_name ); return i_ret; } @@ -515,7 +515,7 @@ int input_vaControl( input_thread_t *p_input, int i_query, va_list args ) if( asprintf( &str, "%s=%s", psz_option, psz_value ) == -1 ) return VLC_ENOMEM; - i = input_ItemAddOpt( p_input->p->input.p_item, str, + i = input_item_AddOpt( p_input->p->input.p_item, str, VLC_INPUT_OPTION_UNIQUE ); free( str ); return i; diff --git a/src/input/item.c b/src/input/item.c index 1dab190711..09e14e8e24 100644 --- a/src/input/item.c +++ b/src/input/item.c @@ -36,7 +36,7 @@ static void GuessType( input_item_t *p_item ); /** Stuff moved out of vlc_input.h -- FIXME: should probably not be inline * anyway. */ -static inline void input_ItemInit( vlc_object_t *p_o, input_item_t *p_i ) +static inline void input_item_Init( vlc_object_t *p_o, input_item_t *p_i ) { memset( p_i, 0, sizeof(input_item_t) ); p_i->psz_name = NULL; @@ -64,7 +64,7 @@ static inline void input_ItemInit( vlc_object_t *p_o, input_item_t *p_i ) vlc_event_manager_register_event_type( p_em, vlc_InputItemErrorWhenReadingChanged ); } -static inline void input_ItemClean( input_item_t *p_i ) +static inline void input_item_Clean( input_item_t *p_i ) { int i; @@ -166,7 +166,7 @@ input_item_t *input_GetItem( input_thread_t *p_input ) * empty string otherwise. The caller should free the returned * pointer. */ -char *input_ItemGetInfo( input_item_t *p_i, +char *input_item_GetInfo( input_item_t *p_i, const char *psz_cat, const char *psz_name ) { @@ -195,14 +195,14 @@ char *input_ItemGetInfo( input_item_t *p_i, return strdup( "" ); } -static void input_ItemDestroy ( gc_object_t *p_this ) +static void input_item_Destroy ( gc_object_t *p_this ) { vlc_object_t *p_obj = (vlc_object_t *)p_this->p_destructor_arg; libvlc_priv_t *priv = libvlc_priv (p_obj->p_libvlc); input_item_t *p_input = (input_item_t *) p_this; int i; - input_ItemClean( p_input ); + input_item_Clean( p_input ); vlc_object_lock( p_obj->p_libvlc ); @@ -215,7 +215,7 @@ static void input_ItemDestroy ( gc_object_t *p_this ) free( p_input ); } -int input_ItemAddOpt( input_item_t *p_input, const char *psz_option, +int input_item_AddOpt( input_item_t *p_input, const char *psz_option, unsigned flags ) { int err = VLC_SUCCESS; @@ -247,7 +247,7 @@ out: return err; } -int input_ItemAddInfo( input_item_t *p_i, +int input_item_AddInfo( input_item_t *p_i, const char *psz_cat, const char *psz_name, const char *psz_format, ... ) @@ -315,7 +315,7 @@ int input_ItemAddInfo( input_item_t *p_i, return p_info->psz_value ? VLC_SUCCESS : VLC_ENOMEM; } -input_item_t *__input_ItemGetById( vlc_object_t *p_obj, int i_id ) +input_item_t *__input_item_GetById( vlc_object_t *p_obj, int i_id ) { libvlc_priv_t *priv = libvlc_priv (p_obj->p_libvlc); input_item_t * p_ret = NULL; @@ -332,19 +332,19 @@ input_item_t *__input_ItemGetById( vlc_object_t *p_obj, int i_id ) return p_ret; } -input_item_t *__input_ItemNewExt( vlc_object_t *p_obj, const char *psz_uri, +input_item_t *__input_item_NewExt( vlc_object_t *p_obj, const char *psz_uri, const char *psz_name, int i_options, const char *const *ppsz_options, mtime_t i_duration ) { - return input_ItemNewWithType( p_obj, psz_uri, psz_name, + return input_item_NewWithType( p_obj, psz_uri, psz_name, i_options, ppsz_options, i_duration, ITEM_TYPE_UNKNOWN ); } -input_item_t *input_ItemNewWithType( vlc_object_t *p_obj, const char *psz_uri, +input_item_t *input_item_NewWithType( vlc_object_t *p_obj, const char *psz_uri, const char *psz_name, int i_options, const char *const *ppsz_options, @@ -355,8 +355,8 @@ input_item_t *input_ItemNewWithType( vlc_object_t *p_obj, const char *psz_uri, DECMALLOC_NULL( p_input, input_item_t ); - input_ItemInit( p_obj, p_input ); - vlc_gc_init( p_input, input_ItemDestroy, (void *)p_obj->p_libvlc ); + input_item_Init( p_obj, p_input ); + vlc_gc_init( p_input, input_item_Destroy, (void *)p_obj->p_libvlc ); vlc_object_lock( p_obj->p_libvlc ); p_input->i_id = ++priv->i_last_input_id; @@ -391,7 +391,7 @@ input_item_t *input_ItemNewWithType( vlc_object_t *p_obj, const char *psz_uri, p_input->i_duration = i_duration; for( int i = 0; i < i_options; i++ ) - input_ItemAddOption( p_input, ppsz_options[i] ); + input_item_AddOption( p_input, ppsz_options[i] ); return p_input; } diff --git a/src/input/vlm.c b/src/input/vlm.c index ee1db93450..db53c3881c 100644 --- a/src/input/vlm.c +++ b/src/input/vlm.c @@ -497,7 +497,7 @@ static int vlm_OnMediaUpdate( vlm_t *p_vlm, vlm_media_sys_t *p_media ) int i; vlc_gc_decref( p_media->vod.p_item ); - p_media->vod.p_item = input_ItemNew( p_vlm, p_cfg->ppsz_input[0], + p_media->vod.p_item = input_item_New( p_vlm, p_cfg->ppsz_input[0], p_cfg->psz_name ); if( p_cfg->psz_output ) @@ -510,13 +510,13 @@ static int vlm_OnMediaUpdate( vlm_t *p_vlm, vlm_media_sys_t *p_media ) if( psz_output && asprintf( &psz_dup, "sout=%s", psz_output ) != -1 ) { - input_ItemAddOption( p_media->vod.p_item, psz_dup ); + input_item_AddOption( p_media->vod.p_item, psz_dup ); free( psz_dup ); } free( psz_output ); for( i = 0; i < p_cfg->i_option; i++ ) - input_ItemAddOption( p_media->vod.p_item, + input_item_AddOption( p_media->vod.p_item, p_cfg->ppsz_option[i] ); if( asprintf( &psz_header, _("Media: %s"), p_cfg->psz_name ) == -1 ) @@ -629,7 +629,7 @@ static int vlm_ControlMediaAdd( vlm_t *p_vlm, vlm_media_t *p_cfg, int64_t *p_id p_media->cfg.id = p_vlm->i_id++; /* FIXME do we do something here if enabled is true ? */ - p_media->vod.p_item = input_ItemNew( p_vlm, NULL, NULL ); + p_media->vod.p_item = input_item_New( p_vlm, NULL, NULL ); p_media->vod.p_media = NULL; TAB_INIT( p_media->i_instance, p_media->instance ); @@ -748,7 +748,7 @@ static vlm_media_instance_sys_t *vlm_MediaInstanceNew( vlm_t *p_vlm, const char if( psz_name ) p_instance->psz_name = strdup( psz_name ); - p_instance->p_item = input_ItemNew( p_vlm, NULL, NULL ); + p_instance->p_item = input_item_New( p_vlm, NULL, NULL ); p_instance->i_index = 0; p_instance->b_sout_keep = false; @@ -809,7 +809,7 @@ static int vlm_ControlMediaInstanceStart( vlm_t *p_vlm, int64_t id, const char * (p_cfg->psz_output && psz_vod_output) ? ":" : psz_vod_output ? "#" : "", psz_vod_output ? psz_vod_output : "" ) != -1 ) { - input_ItemAddOption( p_instance->p_item, psz_buffer ); + input_item_AddOption( p_instance->p_item, psz_buffer ); free( psz_buffer ); } } @@ -821,7 +821,7 @@ static int vlm_ControlMediaInstanceStart( vlm_t *p_vlm, int64_t id, const char * else if( !strcmp( p_cfg->ppsz_option[i], "nosout-keep" ) || !strcmp( p_cfg->ppsz_option[i], "no-sout-keep" ) ) p_instance->b_sout_keep = false; else - input_ItemAddOption( p_instance->p_item, p_cfg->ppsz_option[i] ); + input_item_AddOption( p_instance->p_item, p_cfg->ppsz_option[i] ); } TAB_APPEND( p_media->i_instance, p_media->instance, p_instance ); } diff --git a/src/libvlccore.sym b/src/libvlccore.sym index c2937f523a..eabf355da9 100644 --- a/src/libvlccore.sym +++ b/src/libvlccore.sym @@ -148,12 +148,12 @@ input_DecoderDelete input_DecoderNew input_get_event_manager input_GetItem -input_ItemAddInfo -input_ItemAddOpt -__input_ItemGetById -input_ItemGetInfo -__input_ItemNewExt -input_ItemNewWithType +input_item_AddInfo +input_item_AddOpt +__input_item_GetById +input_item_GetInfo +__input_item_NewExt +input_item_NewWithType input_item_SetMeta input_MetaTypeToLocalizedString __input_Preparse diff --git a/src/playlist/item.c b/src/playlist/item.c index 723e1557c3..d1c152d0f9 100644 --- a/src/playlist/item.c +++ b/src/playlist/item.c @@ -188,7 +188,7 @@ playlist_item_t * playlist_ItemNewWithType( playlist_t *p_playlist, { input_item_t *p_input; if( psz_uri == NULL ) return NULL; - p_input = input_ItemNewWithType( VLC_OBJECT(p_playlist), psz_uri, + p_input = input_item_NewWithType( VLC_OBJECT(p_playlist), psz_uri, psz_name, i_options, ppsz_options, i_duration, i_type ); return playlist_ItemNewFromInput( p_playlist, p_input ); @@ -377,7 +377,7 @@ int playlist_AddExt( playlist_t *p_playlist, const char * psz_uri, int i_options, bool b_playlist, bool b_locked ) { int i_ret; - input_item_t *p_input = input_ItemNewExt( p_playlist, psz_uri, psz_name, + input_item_t *p_input = input_item_NewExt( p_playlist, psz_uri, psz_name, i_options, ppsz_options, i_duration ); diff --git a/src/playlist/loadsave.c b/src/playlist/loadsave.c index 10660f80ca..4015c1e93b 100644 --- a/src/playlist/loadsave.c +++ b/src/playlist/loadsave.c @@ -140,7 +140,7 @@ int playlist_MLLoad( playlist_t *p_playlist ) const char *const psz_option = "meta-file"; /* that option has to be cleaned in input_item_subitem_added() */ /* vlc_gc_decref() in the same function */ - p_input = input_ItemNewExt( p_playlist, psz_uri, + p_input = input_item_NewExt( p_playlist, psz_uri, _("Media Library"), 1, &psz_option, -1 ); if( p_input == NULL ) goto error; diff --git a/src/playlist/tree.c b/src/playlist/tree.c index c4553cc8e7..1a8d0cc924 100644 --- a/src/playlist/tree.c +++ b/src/playlist/tree.c @@ -66,7 +66,7 @@ playlist_item_t * playlist_NodeCreate( playlist_t *p_playlist, if( !psz_name ) psz_name = _("Undefined"); if( !p_input ) - p_new_input = input_ItemNewWithType( VLC_OBJECT(p_playlist), NULL, + p_new_input = input_item_NewWithType( VLC_OBJECT(p_playlist), NULL, psz_name, 0, NULL, -1, ITEM_TYPE_NODE ); p_item = playlist_ItemNewFromInput( p_playlist, p_input ? p_input : p_new_input ); -- 2.39.2