videolan
/
vlc
mirror of https://gitea.goldendeliverer.com/videolan/vlc.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

input_item: compress two functions into one and rename "Add" into "Post" for clarity and consistency

pull/2/head
Jakob Leben 17 years ago
parent
85297c0a11
commit
2d5d004768
24 changed files with 54 additions and 77 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 32
      include/vlc_input_item.h
  2. 3
      modules/access/cdda.c
  3. 2
      modules/access/mms/mmsh.c
  4. 4
      modules/demux/mp4/mp4.c
  5. 3
      modules/demux/playlist/asx.c
  6. 5
      modules/demux/playlist/b4s.c
  7. 3
      modules/demux/playlist/dvb.c
  8. 3
      modules/demux/playlist/gvp.c
  9. 4
      modules/demux/playlist/ifo.c
  10. 3
      modules/demux/playlist/itml.c
  11. 3
      modules/demux/playlist/m3u.c
  12. 3
      modules/demux/playlist/pls.c
  13. 5
      modules/demux/playlist/podcast.c
  14. 3
      modules/demux/playlist/qtl.c
  15. 3
      modules/demux/playlist/ram.c
  16. 2
      modules/demux/playlist/sgimb.c
  17. 5
      modules/demux/playlist/shoutcast.c
  18. 3
      modules/demux/playlist/wpl.c
  19. 3
      modules/demux/playlist/xspf.c
  20. 4
      modules/demux/playlist/zpl.c
  21. 2
      modules/misc/lua/vlc.c
  22. 4
      modules/services_discovery/upnp_intel.cpp
  23. 25
      src/input/item.c
  24. 4
      src/libvlccore.sym

32
include/vlc_input_item.h
View File

@ -125,46 +125,46 @@ VLC_EXPORT( void, input_item_SetName, ( input_item_t *p_item, const char *psz_na
* 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. */
VLC_EXPORT( void, input_item_AddSubItem, ( input_item_t *p_parent, input_item_t *p_child ) );
VLC_EXPORT( void, input_item_PostSubItem, ( input_item_t *p_parent, input_item_t *p_child ) );
/**
* Start adding multiple subitems at once.
* Start adding multiple subitems.
*
* This is a hint for the client that he should probably wait for
* input_item_AddSubItemTree()'s input_item_subitemtree_added event before
* processing any added subitem.
* Create a root node to hold a tree of subitems for given item
*/
VLC_EXPORT( input_item_node_t *, input_item_node_Create, ( input_item_t *p_input ) );
/**
* Notify that we are done adding subitems to this tree.
*
* This send a input_item_subitemtree_added event.
*/
VLC_EXPORT( void, input_item_AddSubItemTree, ( input_item_node_t *p_root ) );
/**
* Add a subitem to this input_item and to this input_item_node.
*
* An input_item_subitem_added event will be sent right away.
* A vlc_InputItemSubItemAdded event will be sent right away.
*/
VLC_EXPORT( input_item_node_t *, input_item_node_AppendItem, ( input_item_node_t *p_node, input_item_t *p_item ) );
/**
* Add a subitem to this input_item and to this input_item_node.
*
* An input_item_subitem_added event will be sent right away for the subitem
* A vlc_InputItemSubItemAdded event will be sent right away for the subitem
* pointed by input_item_node_t.
*/
VLC_EXPORT( void, input_item_node_AppendNode, ( input_item_node_t *p_node, input_item_node_t *p_item ) );
/**
* Delete the result of input_item_node_Create().
* Delete a node created with input_item_node_Create() and all its children.
*/
VLC_EXPORT( void, input_item_node_Delete, ( input_item_node_t *p_node ) );
/**
* End adding multiple subitems.
*
* Send a notification that the item pointed to by the given root node
* has created new subitems that are pointed to by all the children of the node.
* Then delete the node and all its children.
*
* A vlc_InputItemSubItemTreeAdded event will be sent.
*/
VLC_EXPORT( void, input_item_node_PostAndDelete, ( input_item_node_t *p_node ) );
/**

3
modules/access/cdda.c
View File

@ -585,8 +585,7 @@ static int GetTracks( access_t *p_access, input_item_t *p_current )
#undef ON_EMPTY
#undef NONEMPTY
input_item_AddSubItemTree( p_root );
input_item_node_Delete( p_root );
input_item_node_PostAndDelete( p_root );
/* */
for( int i = 0; i < i_cd_text; i++ )

2
modules/access/mms/mmsh.c
View File

@ -166,7 +166,7 @@ int MMSHOpen( access_t *p_access )
/** \bug we do not autodelete here */
p_new_loc = input_item_New( p_access, psz_location, psz_location );
input_item_t *p_item = input_GetItem( p_input );
input_item_AddSubItem( p_item, p_new_loc );
input_item_PostSubItem( p_item, p_new_loc );
vlc_gc_decref( p_new_loc );
vlc_object_release( p_input );

4
modules/demux/mp4/mp4.c
View File

@ -423,7 +423,6 @@ static int Open( vlc_object_t * p_this )
msg_Dbg( p_demux, "adding ref = `%s'", psz_ref );
input_item_t *p_input = input_item_New( p_demux, psz_ref, NULL );
input_item_CopyOptions( p_current, p_input );
input_item_AddSubItem( p_current, p_input );
input_item_node_AppendItem( p_subitems, p_input );
vlc_gc_decref( p_input );
}
@ -434,8 +433,7 @@ static int Open( vlc_object_t * p_this )
}
free( psz_ref );
}
input_item_AddSubItemTree( p_subitems );
input_item_node_Delete( p_subitems );
input_item_node_PostAndDelete( p_subitems );
vlc_object_release( p_input );
}

3
modules/demux/playlist/asx.c
View File

@ -764,8 +764,7 @@ static int Demux( demux_t *p_demux )
#endif
}
input_item_AddSubItemTree( p_subitems );
input_item_node_Delete( p_subitems );
input_item_node_PostAndDelete( p_subitems );
vlc_gc_decref(p_current_input);
return 0; /* Needed for correct operation of go back */

5
modules/demux/playlist/b4s.c
View File

@ -294,10 +294,7 @@ end:
free( psz_elname );
if( p_subitems )
{
input_item_AddSubItemTree( p_subitems );
input_item_node_Delete( p_subitems );
}
input_item_node_PostAndDelete( p_subitems );
vlc_gc_decref( p_current_input );
if( p_xml_reader )

3
modules/demux/playlist/dvb.c
View File

@ -132,8 +132,7 @@ static int Demux( demux_t *p_demux )
free( psz_line );
}
input_item_AddSubItemTree( p_subitems );
input_item_node_Delete( p_subitems );
input_item_node_PostAndDelete( p_subitems );
vlc_gc_decref(p_current_input);
return 0; /* Needed for correct operation of go back */

3
modules/demux/playlist/gvp.c
View File

@ -214,8 +214,7 @@ static int Demux( demux_t *p_demux )
vlc_gc_decref( p_input );
}
input_item_AddSubItemTree( p_subitems );
input_item_node_Delete( p_subitems );
input_item_node_PostAndDelete( p_subitems );
vlc_gc_decref(p_current_input);

4
modules/demux/playlist/ifo.c
View File

@ -110,7 +110,7 @@ static int Demux( demux_t *p_demux )
input_item_t *p_current_input = GetCurrentItem(p_demux);
input_item_t *p_input = input_item_New( p_demux, psz_url, psz_url );
input_item_AddSubItem( p_current_input, p_input );
input_item_PostSubItem( p_current_input, p_input );
vlc_gc_decref( p_input );
vlc_gc_decref(p_current_input);
@ -132,7 +132,7 @@ static int DemuxDVD_VR( demux_t *p_demux )
input_item_t *p_current_input = GetCurrentItem(p_demux);
input_item_t *p_input = input_item_New( p_demux, psz_url, psz_url );
input_item_AddSubItem( p_current_input, p_input );
input_item_PostSubItem( p_current_input, p_input );
vlc_gc_decref( p_input );

3
modules/demux/playlist/itml.c
View File

@ -106,8 +106,7 @@ int Demux( demux_t *p_demux )
{ {"dict", COMPLEX_CONTENT, {.cmplx = parse_plist_dict} } };
parse_plist_node( p_demux, p_subitems, NULL, p_xml_reader, "plist",
pl_elements );
input_item_AddSubItemTree( p_subitems );
input_item_node_Delete( p_subitems );
input_item_node_PostAndDelete( p_subitems );
vlc_gc_decref(p_current_input);

3
modules/demux/playlist/m3u.c
View File

@ -254,8 +254,7 @@ static int Demux( demux_t *p_demux )
b_cleanup = false;
}
}
input_item_AddSubItemTree( p_subitems );
input_item_node_Delete( p_subitems );
input_item_node_PostAndDelete( p_subitems );
vlc_gc_decref(p_current_input);
var_Destroy( p_demux, "m3u-extvlcopt" );
return 0; /* Needed for correct operation of go back */

3
modules/demux/playlist/pls.c
View File

@ -230,8 +230,7 @@ static int Demux( demux_t *p_demux )
free( psz_name );
psz_name = NULL;
input_item_AddSubItemTree( p_subitems );
input_item_node_Delete( p_subitems );
input_item_node_PostAndDelete( p_subitems );
vlc_gc_decref(p_current_input);
return 0; /* Needed for correct operation of go back */

5
modules/demux/playlist/podcast.c
View File

@ -368,8 +368,7 @@ static int Demux( demux_t *p_demux )
xml_ReaderDelete( p_xml, p_xml_reader );
xml_Delete( p_xml );
input_item_AddSubItemTree( p_subitems );
input_item_node_Delete( p_subitems );
input_item_node_PostAndDelete( p_subitems );
vlc_gc_decref(p_current_input);
return 0; /* Needed for correct operation of go back */
@ -393,9 +392,7 @@ error:
if( p_xml )
xml_Delete( p_xml );
if( p_subitems )
{
input_item_node_Delete( p_subitems );
}
vlc_gc_decref(p_current_input);
return -1;

3
modules/demux/playlist/qtl.c
View File

@ -318,8 +318,7 @@ static int Demux( demux_t *p_demux )
input_item_node_AppendItem( p_subitems, p_input );
vlc_gc_decref( p_input );
}
input_item_AddSubItemTree( p_subitems );
input_item_node_Delete( p_subitems );
input_item_node_PostAndDelete( p_subitems );
}
i_ret = 0; /* Needed for correct operation of go back */

3
modules/demux/playlist/ram.c
View File

@ -360,8 +360,7 @@ static int Demux( demux_t *p_demux )
b_cleanup = false;
}
}
input_item_AddSubItemTree( p_subitems );
input_item_node_Delete( p_subitems );
input_item_node_PostAndDelete( p_subitems );
vlc_gc_decref(p_current_input);
var_Destroy( p_demux, "m3u-extvlcopt" );
return 0; /* Needed for correct operation of go back */

2
modules/demux/playlist/sgimb.c
View File

@ -402,7 +402,7 @@ static int Demux ( demux_t *p_demux )
if( !p_sys->psz_mcast_ip && p_sys->b_rtsp_kasenna )
input_item_AddOption( p_child, "rtsp-kasenna", VLC_INPUT_OPTION_TRUSTED );
input_item_AddSubItem( p_current_input, p_child );
input_item_PostSubItem( p_current_input, p_child );
vlc_gc_decref( p_child );
vlc_gc_decref(p_current_input);
return 0; /* Needed for correct operation of go back */

5
modules/demux/playlist/shoutcast.c
View File

@ -126,7 +126,8 @@ static int Demux( demux_t *p_demux )
goto error;
}
input_item_AddSubItemTree( p_input_node );
input_item_node_PostAndDelete( p_input_node );
p_input_node = NULL;
i_ret = 0; /* Needed for correct operation of go back */
@ -136,7 +137,7 @@ error:
if( p_xml )
xml_Delete( p_xml );
free( psz_eltname );
input_item_node_Delete( p_input_node );
if( p_input_node ) input_item_node_Delete( p_input_node );
vlc_gc_decref(p_current_input);
return i_ret;
}

3
modules/demux/playlist/wpl.c
View File

@ -112,8 +112,7 @@ static int Demux( demux_t *p_demux )
}
input_item_AddSubItemTree( p_subitems );
input_item_node_Delete( p_subitems );
input_item_node_PostAndDelete( p_subitems );
vlc_gc_decref(p_current_input);
var_Destroy( p_demux, "wpl-extvlcopt" );

3
modules/demux/playlist/xspf.c
View File

@ -133,8 +133,7 @@ int Demux( demux_t *p_demux )
}
}
input_item_AddSubItemTree( p_subitems );
input_item_node_Delete( p_subitems );
input_item_node_PostAndDelete( p_subitems );
end:
vlc_gc_decref(p_current_input);

4
modules/demux/playlist/zpl.c
View File

@ -168,7 +168,6 @@ static int Demux( demux_t *p_demux )
/* create the input item */
input_item_t *p_input = input_item_NewExt( p_demux, psz_mrl,
psz_title, 0, NULL, 0, i_duration );
input_item_AddSubItem( p_current_input, p_input );
input_item_node_AppendItem( p_subitems, p_input );
FREENULL( psz_mrl );
FREENULL( psz_title );
@ -202,8 +201,7 @@ static int Demux( demux_t *p_demux )
psz_line = stream_ReadLine( p_demux->s );
}
input_item_AddSubItemTree( p_subitems );
input_item_node_Delete( p_subitems );
input_item_node_PostAndDelete( p_subitems );
vlc_gc_decref(p_current_input);
var_Destroy( p_demux, "zpl-extvlcopt" );

2
modules/misc/lua/vlc.c
View File

@ -474,7 +474,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_item_AddSubItem( p_parent, p_input );
input_item_PostSubItem( p_parent, p_input );
}
else /* Play or Enqueue (preparse) */
/* FIXME: playlist_AddInput() can fail */

4
modules/services_discovery/upnp_intel.cpp
View File

@ -811,9 +811,7 @@ void MediaServer::_buildPlaylist( Container* parent, input_item_node_t *p_input_
}
if( send )
{
input_item_node_Delete( p_input_node );
}
input_item_node_PostAndDelete( p_input_node );
}
void MediaServer::setInputItem( input_item_t* p_input_item )

25
src/input/item.c
View File

@ -262,26 +262,15 @@ static void notify_subitem_added(input_item_t *p_parent, input_item_t *p_child)
* 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. */
void input_item_AddSubItem( input_item_t *p_parent, input_item_t *p_child )
void input_item_PostSubItem( input_item_t *p_parent, input_item_t *p_child )
{
vlc_mutex_lock( &p_parent->lock );
p_parent->i_type = ITEM_TYPE_PLAYLIST;
vlc_mutex_unlock( &p_parent->lock );
notify_subitem_added(p_parent, p_child);
input_item_node_t *p_node = input_item_node_Create( p_parent );
input_item_node_AppendItem( p_node, p_child );
input_item_AddSubItemTree( p_node );
input_item_node_Delete( p_node );
}
void input_item_AddSubItemTree ( input_item_node_t *p_root )
{
vlc_event_t event;
event.type = vlc_InputItemSubItemTreeAdded;
event.u.input_item_subitem_tree_added.p_root = p_root;
vlc_event_send( &p_root->p_item->event_manager, &event );
input_item_node_PostAndDelete( p_node );
}
bool input_item_HasErrorWhenReading( input_item_t *p_item )
@ -1043,3 +1032,13 @@ void input_item_node_AppendNode( input_item_node_t *p_parent, input_item_node_t
p_child );
p_child->p_parent = p_parent;
}
void input_item_node_PostAndDelete( input_item_node_t *p_root )
{
vlc_event_t event;
event.type = vlc_InputItemSubItemTreeAdded;
event.u.input_item_subitem_tree_added.p_root = p_root;
vlc_event_send( &p_root->p_item->event_manager, &event );
input_item_node_Delete( p_root );
}

4
src/libvlccore.sym
View File

@ -188,8 +188,6 @@ input_DetachResource
input_GetItem
input_item_AddInfo
input_item_AddOption
input_item_AddSubItem
input_item_AddSubItemTree
input_item_CopyOptions
input_item_DelInfo
input_item_GetDuration
@ -208,6 +206,8 @@ input_item_node_AppendItem
input_item_node_AppendNode
input_item_node_Create
input_item_node_Delete
input_item_node_PostAndDelete
input_item_PostSubItem
input_item_SetDuration
input_item_SetMeta
input_item_SetName

Write Preview
Loading…
Cancel
Save