#include <vlc_url.h>
#include "vlc_playlist.h"
#include "vlc_interface.h"
+#include <vlc_charset.h>
#include "item.h"
#include "info.h"
vlc_mutex_unlock( &p_parent->lock );
}
-static void notify_subitem_added(input_item_t *p_parent, input_item_t *p_child)
+static void post_subitems( input_item_node_t *p_node )
{
- /* Notify interested third parties */
- vlc_event_t event;
- event.type = vlc_InputItemSubItemAdded;
- event.u.input_item_subitem_added.p_new_child = p_child;
- vlc_event_send( &p_parent->event_manager, &event );
+ for( int i = 0; i < p_node->i_children; i++ )
+ {
+ vlc_event_t event;
+ event.type = vlc_InputItemSubItemAdded;
+ event.u.input_item_subitem_added.p_new_child = p_node->pp_children[i]->p_item;
+ vlc_event_send( &p_node->p_item->event_manager, &event );
+
+ post_subitems( p_node->pp_children[i] );
+ }
}
/* This won't hold the item, but can tell to interested third parties
* the input item children. */
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 );
-
input_item_node_t *p_node = input_item_node_Create( p_parent );
input_item_node_AppendItem( p_node, p_child );
input_item_node_PostAndDelete( p_node );
vlc_mutex_unlock( &p_i->lock );
return psz_s;
}
+
void input_item_SetURI( input_item_t *p_i, const char *psz_uri )
{
- vlc_mutex_lock( &p_i->lock );
+ assert( psz_uri );
#ifndef NDEBUG
- if( !strstr( psz_uri, "://" ) || strstr( psz_uri, " " ) || strstr( psz_uri, "\"" ) )
- fprintf( stderr, "input_item_SetURI() was likely called with a path. FIXME\n" );
+ if( !strstr( psz_uri, "://" )
+ || strchr( psz_uri, ' ' ) || strchr( psz_uri, '"' ) )
+ fprintf( stderr, "Warning: %s(\"%s\"): file path instead of URL.\n",
+ __func__, psz_uri );
#endif
-
+ vlc_mutex_lock( &p_i->lock );
free( p_i->psz_uri );
p_i->psz_uri = strdup( psz_uri );
/* Make the name more readable */
if( p_i->psz_name )
+ {
decode_URI( p_i->psz_name );
+ EnsureUTF8( p_i->psz_name );
+ }
}
else
{ /* Strip login and password from title */
void input_item_node_AppendNode( input_item_node_t *p_parent, input_item_node_t *p_child )
{
- notify_subitem_added(p_parent->p_item, p_child->p_item);
-
assert( p_parent && p_child && p_child->p_parent == NULL );
INSERT_ELEM( p_parent->pp_children,
p_parent->i_children,
void input_item_node_PostAndDelete( input_item_node_t *p_root )
{
+ post_subitems( p_root );
+
vlc_event_t event;
event.type = vlc_InputItemSubItemTreeAdded;
event.u.input_item_subitem_tree_added.p_root = p_root;