/*****************************************************************************
* item.c: input_item management
*****************************************************************************
- * Copyright (C) 1998-2004 the VideoLAN team
+ * Copyright (C) 1998-2004 VLC authors and VideoLAN
* $Id$
*
* Authors: Clément Stenac <zorglub@videolan.org>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <assert.h>
+#include <time.h>
#include <vlc_common.h>
-#include "vlc_playlist.h"
-#include "vlc_interface.h"
+#include <vlc_url.h>
+#include <vlc_interface.h>
+#include <vlc_charset.h>
-#include "input_internal.h"
+#include "item.h"
+#include "info.h"
-static void GuessType( input_item_t *p_item );
+static int GuessType( const input_item_t *p_item );
-/** Stuff moved out of vlc_input.h -- FIXME: should probably not be inline
- * anyway. */
-static inline void input_item_Init( vlc_object_t *p_o, input_item_t *p_i )
+void input_item_SetErrorWhenReading( input_item_t *p_i, bool b_error )
{
- memset( p_i, 0, sizeof(input_item_t) );
- p_i->psz_name = NULL;
- p_i->psz_uri = NULL;
- TAB_INIT( p_i->i_es, p_i->es );
- TAB_INIT( p_i->i_options, p_i->ppsz_options );
- p_i->optflagv = NULL, p_i->optflagc = 0;
- TAB_INIT( p_i->i_categories, p_i->pp_categories );
+ bool b_changed;
- p_i->i_type = ITEM_TYPE_UNKNOWN;
- p_i->b_fixed_name = true;
+ vlc_mutex_lock( &p_i->lock );
- p_i->p_stats = NULL;
- p_i->p_meta = NULL;
+ b_changed = p_i->b_error_when_reading != b_error;
+ p_i->b_error_when_reading = b_error;
- vlc_mutex_init( &p_i->lock );
- vlc_event_manager_t * p_em = &p_i->event_manager;
- vlc_event_manager_init( p_em, p_i, p_o );
- vlc_event_manager_register_event_type( p_em, vlc_InputItemMetaChanged );
- vlc_event_manager_register_event_type( p_em, vlc_InputItemSubItemAdded );
- vlc_event_manager_register_event_type( p_em, vlc_InputItemDurationChanged );
- vlc_event_manager_register_event_type( p_em, vlc_InputItemPreparsedChanged );
- vlc_event_manager_register_event_type( p_em, vlc_InputItemNameChanged );
- vlc_event_manager_register_event_type( p_em, vlc_InputItemInfoChanged );
- vlc_event_manager_register_event_type( p_em, vlc_InputItemErrorWhenReadingChanged );
+ vlc_mutex_unlock( &p_i->lock );
+
+ if( b_changed )
+ {
+ vlc_event_t event;
+
+ event.type = vlc_InputItemErrorWhenReadingChanged;
+ event.u.input_item_error_when_reading_changed.new_value = b_error;
+ vlc_event_send( &p_i->event_manager, &event );
+ }
+}
+void input_item_SignalPreparseEnded( input_item_t *p_i )
+{
+ vlc_event_t event;
+ event.type = vlc_InputItemPreparseEnded;
+ vlc_event_send( &p_i->event_manager, &event );
}
-static inline void input_item_Clean( input_item_t *p_i )
+void input_item_SetPreparsed( input_item_t *p_i, bool b_preparsed )
{
- int i;
+ bool b_send_event = false;
- vlc_event_manager_fini( &p_i->event_manager );
+ vlc_mutex_lock( &p_i->lock );
- free( p_i->psz_name );
- free( p_i->psz_uri );
- if( p_i->p_stats )
+ if( !p_i->p_meta )
+ p_i->p_meta = vlc_meta_New();
+
+ int status = vlc_meta_GetStatus(p_i->p_meta);
+ int new_status;
+ if( b_preparsed )
+ new_status = status | ITEM_PREPARSED;
+ else
+ new_status = status & ~ITEM_PREPARSED;
+ if( status != new_status )
{
- vlc_mutex_destroy( &p_i->p_stats->lock );
- free( p_i->p_stats );
+ vlc_meta_SetStatus(p_i->p_meta, new_status);
+ b_send_event = true;
}
- if( p_i->p_meta )
- vlc_meta_Delete( p_i->p_meta );
-
- for( i = 0; i < p_i->i_options; i++ )
- free( p_i->ppsz_options[i] );
- TAB_CLEAN( p_i->i_options, p_i->ppsz_options );
- free( p_i->optflagv);
+ vlc_mutex_unlock( &p_i->lock );
- for( i = 0; i < p_i->i_es; i++ )
+ if( b_send_event )
{
- es_format_Clean( p_i->es[i] );
- free( p_i->es[i] );
+ vlc_event_t event;
+ event.type = vlc_InputItemPreparsedChanged;
+ event.u.input_item_preparsed_changed.new_status = new_status;
+ vlc_event_send( &p_i->event_manager, &event );
}
- TAB_CLEAN( p_i->i_es, p_i->es );
+}
- for( i = 0; i < p_i->i_categories; i++ )
- {
- info_category_t *p_category = p_i->pp_categories[i];
- int j;
+void input_item_SetArtNotFound( input_item_t *p_i, bool b_not_found )
+{
+ vlc_mutex_lock( &p_i->lock );
- for( j = 0; j < p_category->i_infos; j++ )
- {
- struct info_t *p_info = p_category->pp_infos[j];
+ if( !p_i->p_meta )
+ p_i->p_meta = vlc_meta_New();
- free( p_info->psz_name);
- free( p_info->psz_value );
- free( p_info );
- }
- TAB_CLEAN( p_category->i_infos, p_category->pp_infos );
+ int status = vlc_meta_GetStatus(p_i->p_meta);
- free( p_category->psz_name );
- free( p_category );
- }
- TAB_CLEAN( p_i->i_categories, p_i->pp_categories );
+ if( b_not_found )
+ status |= ITEM_ART_NOTFOUND;
+ else
+ status &= ~ITEM_ART_NOTFOUND;
+
+ vlc_meta_SetStatus(p_i->p_meta, status);
- vlc_mutex_destroy( &p_i->lock );
+ vlc_mutex_unlock( &p_i->lock );
}
-void input_item_SetHasErrorWhenReading( input_item_t *p_i, bool error )
+void input_item_SetArtFetched( input_item_t *p_i, bool b_art_fetched )
{
- vlc_event_t event;
+ vlc_mutex_lock( &p_i->lock );
- if( p_i->b_error_when_reading == error )
- return;
+ if( !p_i->p_meta )
+ p_i->p_meta = vlc_meta_New();
- p_i->b_error_when_reading = error;
+ int status = vlc_meta_GetStatus(p_i->p_meta);
- /* Notify interested third parties */
- event.type = vlc_InputItemErrorWhenReadingChanged;
- event.u.input_item_error_when_reading_changed.new_value = error;
- vlc_event_send( &p_i->event_manager, &event );
+ if( b_art_fetched )
+ status |= ITEM_ART_FETCHED;
+ else
+ status &= ~ITEM_ART_FETCHED;
+
+ vlc_meta_SetStatus(p_i->p_meta, status);
+
+ vlc_mutex_unlock( &p_i->lock );
}
void input_item_SetMeta( input_item_t *p_i, vlc_meta_type_t meta_type, const char *psz_val )
vlc_event_send( &p_i->event_manager, &event );
}
-/**
- * Get the item from an input thread
- */
-input_item_t *input_GetItem( input_thread_t *p_input )
-{
- assert( p_input && p_input->p );
- return p_input->p->input.p_item;
-}
-
+/* FIXME GRRRRRRRRRR args should be in the reverse order to be
+ * consistent with (nearly?) all or copy funcs */
void input_item_CopyOptions( input_item_t *p_parent,
- input_item_t *p_child )
+ input_item_t *p_child )
{
- int i;
- for( i = 0 ; i< p_parent->i_options; i++ )
+ vlc_mutex_lock( &p_parent->lock );
+
+ for( int i = 0 ; i< p_parent->i_options; i++ )
{
- char *psz_option= strdup( p_parent->ppsz_options[i] );
- if( !strcmp( psz_option, "meta-file" ) )
- {
- free( psz_option );
+ if( !strcmp( p_parent->ppsz_options[i], "meta-file" ) )
continue;
- }
- p_child->i_options++;
- p_child->ppsz_options = (char **)realloc( p_child->ppsz_options,
- p_child->i_options *
- sizeof( char * ) );
- p_child->ppsz_options[p_child->i_options-1] = psz_option;
- p_child->optflagc++;
- p_child->optflagv = (uint8_t *)realloc( p_child->optflagv,
- p_child->optflagc );
- p_child->optflagv[p_child->optflagc - 1] = p_parent->optflagv[i];
+
+ input_item_AddOption( p_child,
+ p_parent->ppsz_options[i],
+ p_parent->optflagv[i] );
}
+
+ vlc_mutex_unlock( &p_parent->lock );
}
-void input_item_SetName( input_item_t *p_item, const char *psz_name )
+static void post_subitems( input_item_node_t *p_node )
{
- free( p_item->psz_name );
- p_item->psz_name = strdup( psz_name );
+ 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
* 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_event_t event;
-
- p_parent->i_type = ITEM_TYPE_PLAYLIST;
-
- /* Notify interested third parties */
- event.type = vlc_InputItemSubItemAdded;
- event.u.input_item_subitem_added.p_new_child = p_child;
- vlc_event_send( &p_parent->event_manager, &event );
+ 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 );
}
-int input_item_AddOption (input_item_t *item, const char *str)
+bool input_item_HasErrorWhenReading( input_item_t *p_item )
{
- return input_item_AddOpt (item, str, VLC_INPUT_OPTION_TRUSTED);
-}
+ vlc_mutex_lock( &p_item->lock );
-bool input_item_HasErrorWhenReading (input_item_t *item)
-{
- return item->b_error_when_reading;
+ bool b_error = p_item->b_error_when_reading;
+
+ vlc_mutex_unlock( &p_item->lock );
+
+ return b_error;
}
-bool input_item_MetaMatch( input_item_t *p_i, vlc_meta_type_t meta_type, const char *psz )
+bool input_item_MetaMatch( input_item_t *p_i,
+ vlc_meta_type_t meta_type, const char *psz )
{
vlc_mutex_lock( &p_i->lock );
+
if( !p_i->p_meta )
{
vlc_mutex_unlock( &p_i->lock );
return false;
}
- const char * meta = vlc_meta_Get( p_i->p_meta, meta_type );
- bool ret = meta && strcasestr( meta, psz );
+ const char *psz_meta = vlc_meta_Get( p_i->p_meta, meta_type );
+ bool b_ret = psz_meta && strcasestr( psz_meta, psz );
+
vlc_mutex_unlock( &p_i->lock );
- return ret;
+ return b_ret;
}
-char * input_item_GetMeta( input_item_t *p_i, vlc_meta_type_t meta_type )
+char *input_item_GetMeta( input_item_t *p_i, vlc_meta_type_t meta_type )
{
- char * psz = NULL;
vlc_mutex_lock( &p_i->lock );
if( !p_i->p_meta )
return NULL;
}
+ char *psz = NULL;
if( vlc_meta_Get( p_i->p_meta, meta_type ) )
psz = strdup( vlc_meta_Get( p_i->p_meta, meta_type ) );
return psz;
}
-char * input_item_GetName( input_item_t * p_i )
+/* Get the title of a given item or fallback to the name if the title is empty */
+char *input_item_GetTitleFbName( input_item_t *p_item )
{
- vlc_mutex_lock( &p_i->lock );
- char *psz_s = p_i->psz_name ? strdup( p_i->psz_name ) : NULL;
- vlc_mutex_unlock( &p_i->lock );
- return psz_s;
+ char *psz_ret;
+ vlc_mutex_lock( &p_item->lock );
+
+ if( !p_item->p_meta )
+ {
+ psz_ret = p_item->psz_name ? strdup( p_item->psz_name ) : NULL;
+ vlc_mutex_unlock( &p_item->lock );
+ return psz_ret;
+ }
+
+ const char *psz_title = vlc_meta_Get( p_item->p_meta, vlc_meta_Title );
+ if( !EMPTY_STR( psz_title ) )
+ psz_ret = strdup( psz_title );
+ else
+ psz_ret = p_item->psz_name ? strdup( p_item->psz_name ) : NULL;
+
+ vlc_mutex_unlock( &p_item->lock );
+ return psz_ret;
}
-char * input_item_GetURI( input_item_t * p_i )
+char *input_item_GetName( input_item_t *p_item )
+{
+ vlc_mutex_lock( &p_item->lock );
+
+ char *psz_name = p_item->psz_name ? strdup( p_item->psz_name ) : NULL;
+
+ vlc_mutex_unlock( &p_item->lock );
+ return psz_name;
+}
+void input_item_SetName( input_item_t *p_item, const char *psz_name )
+{
+ vlc_mutex_lock( &p_item->lock );
+
+ free( p_item->psz_name );
+ p_item->psz_name = strdup( psz_name );
+
+ vlc_mutex_unlock( &p_item->lock );
+}
+
+char *input_item_GetURI( input_item_t *p_i )
{
vlc_mutex_lock( &p_i->lock );
+
char *psz_s = p_i->psz_uri ? strdup( p_i->psz_uri ) : NULL;
+
vlc_mutex_unlock( &p_i->lock );
return psz_s;
}
-void input_item_SetURI( input_item_t * p_i, char * psz_uri )
+void input_item_SetURI( input_item_t *p_i, const char *psz_uri )
{
+ assert( psz_uri );
+#ifndef NDEBUG
+ 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 );
+
+ p_i->i_type = GuessType( p_i );
+
+ if( p_i->psz_name )
+ ;
+ else
+ if( p_i->i_type == ITEM_TYPE_FILE || p_i->i_type == ITEM_TYPE_DIRECTORY )
+ {
+ const char *psz_filename = strrchr( p_i->psz_uri, '/' );
+
+ if( psz_filename && *psz_filename == '/' )
+ psz_filename++;
+ if( psz_filename && *psz_filename )
+ p_i->psz_name = strdup( psz_filename );
+
+ /* 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 */
+ int r;
+ vlc_url_t url;
+
+ vlc_UrlParse( &url, psz_uri, 0 );
+ if( url.psz_protocol )
+ {
+ if( url.i_port > 0 )
+ r=asprintf( &p_i->psz_name, "%s://%s:%d%s", url.psz_protocol,
+ url.psz_host, url.i_port,
+ url.psz_path ? url.psz_path : "" );
+ else
+ r=asprintf( &p_i->psz_name, "%s://%s%s", url.psz_protocol,
+ url.psz_host ? url.psz_host : "",
+ url.psz_path ? url.psz_path : "" );
+ }
+ else
+ {
+ if( url.i_port > 0 )
+ r=asprintf( &p_i->psz_name, "%s:%d%s", url.psz_host, url.i_port,
+ url.psz_path ? url.psz_path : "" );
+ else
+ r=asprintf( &p_i->psz_name, "%s%s", url.psz_host,
+ url.psz_path ? url.psz_path : "" );
+ }
+ vlc_UrlClean( &url );
+ if( -1==r )
+ p_i->psz_name=NULL; /* recover from undefined value */
+ }
+
vlc_mutex_unlock( &p_i->lock );
}
-mtime_t input_item_GetDuration( input_item_t * p_i )
+mtime_t input_item_GetDuration( input_item_t *p_i )
{
vlc_mutex_lock( &p_i->lock );
+
mtime_t i_duration = p_i->i_duration;
+
vlc_mutex_unlock( &p_i->lock );
return i_duration;
}
-void input_item_SetDuration( input_item_t * p_i, mtime_t i_duration )
+void input_item_SetDuration( input_item_t *p_i, mtime_t i_duration )
{
- bool send_event = false;
+ bool b_send_event = false;
vlc_mutex_lock( &p_i->lock );
if( p_i->i_duration != i_duration )
{
p_i->i_duration = i_duration;
- send_event = true;
+ b_send_event = true;
}
vlc_mutex_unlock( &p_i->lock );
- if ( send_event == true )
+ if( b_send_event )
{
vlc_event_t event;
+
event.type = vlc_InputItemDurationChanged;
event.u.input_item_duration_changed.new_duration = i_duration;
vlc_event_send( &p_i->event_manager, &event );
}
-
- return;
}
-
-bool input_item_IsPreparsed( input_item_t *p_i )
+char *input_item_GetNowPlayingFb( input_item_t *p_item )
{
- return p_i->p_meta ? p_i->p_meta->i_status & ITEM_PREPARSED : false ;
+ char *psz_meta = input_item_GetMeta( p_item, vlc_meta_NowPlaying );
+ if( !psz_meta || strlen( psz_meta ) == 0 )
+ {
+ free( psz_meta );
+ return input_item_GetMeta( p_item, vlc_meta_ESNowPlaying );
+ }
+
+ return psz_meta;
}
-bool input_item_IsArtFetched( input_item_t *p_i )
+bool input_item_IsPreparsed( input_item_t *p_item )
{
- return p_i->p_meta ? p_i->p_meta->i_status & ITEM_ART_FETCHED : false ;
+ vlc_mutex_lock( &p_item->lock );
+ bool b_preparsed = p_item->p_meta ? ( vlc_meta_GetStatus(p_item->p_meta) & ITEM_PREPARSED ) != 0 : false;
+ vlc_mutex_unlock( &p_item->lock );
+
+ return b_preparsed;
}
-const vlc_meta_t * input_item_GetMetaObject( input_item_t *p_i )
+bool input_item_IsArtFetched( input_item_t *p_item )
{
- if( !p_i->p_meta )
- p_i->p_meta = vlc_meta_New();
+ vlc_mutex_lock( &p_item->lock );
+ bool b_fetched = p_item->p_meta ? ( vlc_meta_GetStatus(p_item->p_meta) & ITEM_ART_FETCHED ) != 0 : false;
+ vlc_mutex_unlock( &p_item->lock );
- return p_i->p_meta;
+ return b_fetched;
}
-void input_item_MetaMerge( input_item_t *p_i, const vlc_meta_t * p_new_meta )
+input_item_t *input_item_Hold( input_item_t *p_item )
{
- if( !p_i->p_meta )
- p_i->p_meta = vlc_meta_New();
+ input_item_owner_t *owner = item_owner(p_item);
- vlc_meta_Merge( p_i->p_meta, p_new_meta );
+ atomic_fetch_add( &owner->refs, 1 );
+ return p_item;
}
-/**
- * Get a info item from a given category in a given input item.
- *
- * \param p_i The input item to get info from
- * \param psz_cat String representing the category for the info
- * \param psz_name String representing the name of the desired info
- * \return A pointer to the string with the given info if found, or an
- * empty string otherwise. The caller should free the returned
- * pointer.
- */
-char *input_item_GetInfo( input_item_t *p_i,
- const char *psz_cat,
- const char *psz_name )
+void input_item_Release( input_item_t *p_item )
{
- int i,j;
+ input_item_owner_t *owner = item_owner(p_item);
- vlc_mutex_lock( &p_i->lock );
-
- for( i = 0 ; i< p_i->i_categories ; i++ )
- {
- info_category_t *p_cat = p_i->pp_categories[i];
+ if( atomic_fetch_sub(&owner->refs, 1) != 1 )
+ return;
- if( !psz_cat || strcmp( p_cat->psz_name, psz_cat ) )
- continue;
+ vlc_event_manager_fini( &p_item->event_manager );
- for( j = 0; j < p_cat->i_infos ; j++ )
- {
- if( !strcmp( p_cat->pp_infos[j]->psz_name, psz_name ) )
- {
- char *psz_ret = strdup( p_cat->pp_infos[j]->psz_value );
- vlc_mutex_unlock( &p_i->lock );
- return psz_ret;
- }
- }
+ free( p_item->psz_name );
+ free( p_item->psz_uri );
+ if( p_item->p_stats != NULL )
+ {
+ vlc_mutex_destroy( &p_item->p_stats->lock );
+ free( p_item->p_stats );
}
- vlc_mutex_unlock( &p_i->lock );
- return strdup( "" );
-}
-static void input_item_Destroy ( gc_object_t *gc )
-{
- input_item_t *p_input = vlc_priv(gc, input_item_t);
- libvlc_int_t *p_libvlc = p_input->p_libvlc;
- int i;
+ if( p_item->p_meta != NULL )
+ vlc_meta_Delete( p_item->p_meta );
+
+ for( int i = 0; i < p_item->i_options; i++ )
+ free( p_item->ppsz_options[i] );
+ TAB_CLEAN( p_item->i_options, p_item->ppsz_options );
+ free( p_item->optflagv );
- input_item_Clean( p_input );
+ for( int i = 0; i < p_item->i_es; i++ )
+ {
+ es_format_Clean( p_item->es[i] );
+ free( p_item->es[i] );
+ }
+ TAB_CLEAN( p_item->i_es, p_item->es );
- /* This is broken. Items must be removed from any table before their
- * reference count drops to zero (unless the table is not used, but then
- * why have it?). Full point, no buts. -- Courmisch */
- libvlc_priv_t *priv = libvlc_priv (p_libvlc);
- vlc_object_lock( p_libvlc );
+ for( int i = 0; i < p_item->i_epg; i++ )
+ vlc_epg_Delete( p_item->pp_epg[i] );
+ TAB_CLEAN( p_item->i_epg, p_item->pp_epg );
- ARRAY_BSEARCH( priv->input_items,->i_id, int, p_input->i_id, i);
- if( i != -1 )
- ARRAY_REMOVE( priv->input_items, i);
+ for( int i = 0; i < p_item->i_categories; i++ )
+ info_category_Delete( p_item->pp_categories[i] );
+ TAB_CLEAN( p_item->i_categories, p_item->pp_categories );
- vlc_object_unlock( p_libvlc );
- free( p_input );
+ vlc_mutex_destroy( &p_item->lock );
+ free( owner );
}
-int input_item_AddOpt( input_item_t *p_input, const char *psz_option,
- unsigned flags )
+int input_item_AddOption( input_item_t *p_input, const char *psz_option,
+ unsigned flags )
{
int err = VLC_SUCCESS;
return err;
}
-int input_item_AddInfo( input_item_t *p_i,
- const char *psz_cat,
- const char *psz_name,
- const char *psz_format, ... )
+static info_category_t *InputItemFindCat( input_item_t *p_item,
+ int *pi_index, const char *psz_cat )
{
- va_list args;
- int i;
- info_t *p_info = NULL;
- info_category_t *p_cat = NULL ;
+ vlc_assert_locked( &p_item->lock );
+ for( int i = 0; i < p_item->i_categories && psz_cat; i++ )
+ {
+ info_category_t *p_cat = p_item->pp_categories[i];
+ if( !strcmp( p_cat->psz_name, psz_cat ) )
+ {
+ if( pi_index )
+ *pi_index = i;
+ return p_cat;
+ }
+ }
+ return NULL;
+}
+
+/**
+ * Get a info item from a given category in a given input item.
+ *
+ * \param p_i The input item to get info from
+ * \param psz_cat String representing the category for the info
+ * \param psz_name String representing the name of the desired info
+ * \return A pointer to the string with the given info if found, or an
+ * empty string otherwise. The caller should free the returned
+ * pointer.
+ */
+char *input_item_GetInfo( input_item_t *p_i,
+ const char *psz_cat,
+ const char *psz_name )
+{
vlc_mutex_lock( &p_i->lock );
- for( i = 0 ; i < p_i->i_categories ; i ++ )
+ const info_category_t *p_cat = InputItemFindCat( p_i, NULL, psz_cat );
+ if( p_cat )
{
- if( !strcmp( p_i->pp_categories[i]->psz_name, psz_cat ) )
+ info_t *p_info = info_category_FindInfo( p_cat, NULL, psz_name );
+ if( p_info && p_info->psz_value )
{
- p_cat = p_i->pp_categories[i];
- break;
+ char *psz_ret = strdup( p_info->psz_value );
+ vlc_mutex_unlock( &p_i->lock );
+ return psz_ret;
}
}
+ vlc_mutex_unlock( &p_i->lock );
+ return strdup( "" );
+}
+
+static int InputItemVaAddInfo( input_item_t *p_i,
+ const char *psz_cat,
+ const char *psz_name,
+ const char *psz_format, va_list args )
+{
+ vlc_assert_locked( &p_i->lock );
+
+ info_category_t *p_cat = InputItemFindCat( p_i, NULL, psz_cat );
if( !p_cat )
{
- if( !(p_cat = (info_category_t *)malloc( sizeof(info_category_t) )) )
- {
- vlc_mutex_unlock( &p_i->lock );
+ p_cat = info_category_New( psz_cat );
+ if( !p_cat )
return VLC_ENOMEM;
- }
- p_cat->psz_name = strdup( psz_cat );
- p_cat->i_infos = 0;
- p_cat->pp_infos = 0;
INSERT_ELEM( p_i->pp_categories, p_i->i_categories, p_i->i_categories,
p_cat );
}
+ info_t *p_info = info_category_VaAddInfo( p_cat, psz_name, psz_format, args );
+ if( !p_info || !p_info->psz_value )
+ return VLC_EGENERIC;
+ return VLC_SUCCESS;
+}
+
+static int InputItemAddInfo( input_item_t *p_i,
+ const char *psz_cat,
+ const char *psz_name,
+ const char *psz_format, ... )
+{
+ va_list args;
+
+ va_start( args, psz_format );
+ const int i_ret = InputItemVaAddInfo( p_i, psz_cat, psz_name, psz_format, args );
+ va_end( args );
+
+ return i_ret;
+}
+
+int input_item_AddInfo( input_item_t *p_i,
+ const char *psz_cat,
+ const char *psz_name,
+ const char *psz_format, ... )
+{
+ va_list args;
- for( i = 0; i< p_cat->i_infos; i++ )
+ vlc_mutex_lock( &p_i->lock );
+
+ va_start( args, psz_format );
+ const int i_ret = InputItemVaAddInfo( p_i, psz_cat, psz_name, psz_format, args );
+ va_end( args );
+
+ vlc_mutex_unlock( &p_i->lock );
+
+
+ if( !i_ret )
{
- if( !strcmp( p_cat->pp_infos[i]->psz_name, psz_name ) )
- {
- p_info = p_cat->pp_infos[i];
- break;
- }
+ vlc_event_t event;
+
+ event.type = vlc_InputItemInfoChanged;
+ vlc_event_send( &p_i->event_manager, &event );
}
+ return i_ret;
+}
- if( !p_info )
+int input_item_DelInfo( input_item_t *p_i,
+ const char *psz_cat,
+ const char *psz_name )
+{
+ vlc_mutex_lock( &p_i->lock );
+ int i_cat;
+ info_category_t *p_cat = InputItemFindCat( p_i, &i_cat, psz_cat );
+ if( !p_cat )
{
- if( ( p_info = (info_t *)malloc( sizeof( info_t ) ) ) == NULL )
+ vlc_mutex_unlock( &p_i->lock );
+ return VLC_EGENERIC;
+ }
+
+ if( psz_name )
+ {
+ /* Remove a specific info */
+ int i_ret = info_category_DeleteInfo( p_cat, psz_name );
+ if( i_ret )
{
vlc_mutex_unlock( &p_i->lock );
- return VLC_ENOMEM;
+ return VLC_EGENERIC;
}
- INSERT_ELEM( p_cat->pp_infos, p_cat->i_infos, p_cat->i_infos, p_info );
- p_info->psz_name = strdup( psz_name );
}
else
{
- free( p_info->psz_value );
+ /* Remove the complete categorie */
+ info_category_Delete( p_cat );
+ REMOVE_ELEM( p_i->pp_categories, p_i->i_categories, i_cat );
}
+ vlc_mutex_unlock( &p_i->lock );
- va_start( args, psz_format );
- if( vasprintf( &p_info->psz_value, psz_format, args) == -1 )
- p_info->psz_value = NULL;
- va_end( args );
- vlc_mutex_unlock( &p_i->lock );
+ vlc_event_t event;
+ event.type = vlc_InputItemInfoChanged;
+ vlc_event_send( &p_i->event_manager, &event );
- return p_info->psz_value ? VLC_SUCCESS : VLC_ENOMEM;
+ return VLC_SUCCESS;
}
+void input_item_ReplaceInfos( input_item_t *p_item, info_category_t *p_cat )
+{
+ vlc_mutex_lock( &p_item->lock );
+ int i_cat;
+ info_category_t *p_old = InputItemFindCat( p_item, &i_cat, p_cat->psz_name );
+ if( p_old )
+ {
+ info_category_Delete( p_old );
+ p_item->pp_categories[i_cat] = p_cat;
+ }
+ else
+ {
+ INSERT_ELEM( p_item->pp_categories, p_item->i_categories, p_item->i_categories,
+ p_cat );
+ }
+ vlc_mutex_unlock( &p_item->lock );
+
-input_item_t *__input_item_GetById( vlc_object_t *p_obj, int i_id )
+ vlc_event_t event;
+ event.type = vlc_InputItemInfoChanged;
+ vlc_event_send( &p_item->event_manager, &event );
+}
+void input_item_MergeInfos( input_item_t *p_item, info_category_t *p_cat )
{
- libvlc_priv_t *priv = libvlc_priv (p_obj->p_libvlc);
- input_item_t * p_ret = NULL;
- int i;
+ vlc_mutex_lock( &p_item->lock );
+ info_category_t *p_old = InputItemFindCat( p_item, NULL, p_cat->psz_name );
+ if( p_old )
+ {
+ for( int i = 0; i < p_cat->i_infos; i++ )
+ info_category_ReplaceInfo( p_old, p_cat->pp_infos[i] );
+ TAB_CLEAN( p_cat->i_infos, p_cat->pp_infos );
+ info_category_Delete( p_cat );
+ }
+ else
+ {
+ INSERT_ELEM( p_item->pp_categories, p_item->i_categories, p_item->i_categories,
+ p_cat );
+ }
+ vlc_mutex_unlock( &p_item->lock );
- vlc_object_lock( p_obj->p_libvlc );
- ARRAY_BSEARCH( priv->input_items, ->i_id, int, i_id, i);
- if( i != -1 )
- p_ret = ARRAY_VAL( priv->input_items, i);
+ vlc_event_t event;
+ event.type = vlc_InputItemInfoChanged;
+ vlc_event_send( &p_item->event_manager, &event );
+}
+
+#define EPG_DEBUG
+void input_item_SetEpg( input_item_t *p_item, const vlc_epg_t *p_update )
+{
+ vlc_mutex_lock( &p_item->lock );
+
+ /* */
+ vlc_epg_t *p_epg = NULL;
+ for( int i = 0; i < p_item->i_epg; i++ )
+ {
+ vlc_epg_t *p_tmp = p_item->pp_epg[i];
+
+ if( (p_tmp->psz_name == NULL) != (p_update->psz_name == NULL) )
+ continue;
+ if( p_tmp->psz_name && p_update->psz_name && strcmp(p_tmp->psz_name, p_update->psz_name) )
+ continue;
+
+ p_epg = p_tmp;
+ break;
+ }
- vlc_object_unlock( p_obj->p_libvlc );
+ /* */
+ if( !p_epg )
+ {
+ p_epg = vlc_epg_New( p_update->psz_name );
+ if( p_epg )
+ TAB_APPEND( p_item->i_epg, p_item->pp_epg, p_epg );
+ }
+ if( p_epg )
+ vlc_epg_Merge( p_epg, p_update );
- return p_ret;
+ vlc_mutex_unlock( &p_item->lock );
+
+ if( !p_epg )
+ return;
+
+#ifdef EPG_DEBUG
+ char *psz_epg;
+ if( asprintf( &psz_epg, "EPG %s", p_epg->psz_name ? p_epg->psz_name : "unknown" ) < 0 )
+ goto signal;
+
+ input_item_DelInfo( p_item, psz_epg, NULL );
+
+ vlc_mutex_lock( &p_item->lock );
+ for( int i = 0; i < p_epg->i_event; i++ )
+ {
+ const vlc_epg_event_t *p_evt = p_epg->pp_event[i];
+ time_t t_start = (time_t)p_evt->i_start;
+ struct tm tm_start;
+ char psz_start[128];
+
+ localtime_r( &t_start, &tm_start );
+
+ snprintf( psz_start, sizeof(psz_start), "%4.4d-%2.2d-%2.2d %2.2d:%2.2d:%2.2d",
+ 1900 + tm_start.tm_year, 1 + tm_start.tm_mon, tm_start.tm_mday,
+ tm_start.tm_hour, tm_start.tm_min, tm_start.tm_sec );
+ if( p_evt->psz_short_description || p_evt->psz_description )
+ InputItemAddInfo( p_item, psz_epg, psz_start, "%s (%2.2d:%2.2d) - %s %s",
+ p_evt->psz_name,
+ p_evt->i_duration/60/60, (p_evt->i_duration/60)%60,
+ p_evt->psz_short_description ? p_evt->psz_short_description : "" ,
+ p_evt->psz_description ? p_evt->psz_description : "" );
+ else
+ InputItemAddInfo( p_item, psz_epg, psz_start, "%s (%2.2d:%2.2d)",
+ p_evt->psz_name,
+ p_evt->i_duration/60/60, (p_evt->i_duration/60)%60 );
+ }
+ vlc_mutex_unlock( &p_item->lock );
+ free( psz_epg );
+signal:
+#endif
+
+ if( p_epg->i_event > 0 )
+ {
+ vlc_event_t event = { .type = vlc_InputItemInfoChanged, };
+ vlc_event_send( &p_item->event_manager, &event );
+ }
}
-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 )
+void input_item_SetEpgOffline( input_item_t *p_item )
{
- return input_item_NewWithType( p_obj, psz_uri, psz_name,
- i_options, ppsz_options,
+ vlc_mutex_lock( &p_item->lock );
+ for( int i = 0; i < p_item->i_epg; i++ )
+ vlc_epg_SetCurrent( p_item->pp_epg[i], -1 );
+ vlc_mutex_unlock( &p_item->lock );
+
+#ifdef EPG_DEBUG
+ vlc_mutex_lock( &p_item->lock );
+ const int i_epg_info = p_item->i_epg;
+ if( i_epg_info > 0 )
+ {
+ char *ppsz_epg_info[i_epg_info];
+ for( int i = 0; i < p_item->i_epg; i++ )
+ {
+ const vlc_epg_t *p_epg = p_item->pp_epg[i];
+ if( asprintf( &ppsz_epg_info[i], "EPG %s", p_epg->psz_name ? p_epg->psz_name : "unknown" ) < 0 )
+ ppsz_epg_info[i] = NULL;
+ }
+ vlc_mutex_unlock( &p_item->lock );
+
+ for( int i = 0; i < i_epg_info; i++ )
+ {
+ if( !ppsz_epg_info[i] )
+ continue;
+ input_item_DelInfo( p_item, ppsz_epg_info[i], NULL );
+ free( ppsz_epg_info[i] );
+ }
+ }
+ else
+ vlc_mutex_unlock( &p_item->lock );
+#endif
+
+ vlc_event_t event = { .type = vlc_InputItemInfoChanged, };
+ vlc_event_send( &p_item->event_manager, &event );
+}
+
+input_item_t *input_item_NewExt( const char *psz_uri,
+ const char *psz_name,
+ int i_options,
+ const char *const *ppsz_options,
+ unsigned i_option_flags,
+ mtime_t i_duration )
+{
+ return input_item_NewWithType( psz_uri, psz_name,
+ i_options, ppsz_options, i_option_flags,
i_duration, ITEM_TYPE_UNKNOWN );
}
-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,
- mtime_t i_duration,
- int i_type )
+input_item_t *
+input_item_NewWithType( const char *psz_uri, const char *psz_name,
+ int i_options, const char *const *ppsz_options,
+ unsigned flags, mtime_t duration, int type )
{
- libvlc_priv_t *priv = libvlc_priv (p_obj->p_libvlc);
+ static atomic_uint last_input_id = ATOMIC_VAR_INIT(0);
+
+ input_item_owner_t *owner = calloc( 1, sizeof( *owner ) );
+ if( unlikely(owner == NULL) )
+ return NULL;
- DECMALLOC_NULL( p_input, input_item_t );
+ atomic_init( &owner->refs, 1 );
- input_item_Init( p_obj, p_input );
- vlc_gc_init( p_input, input_item_Destroy );
- p_input->p_libvlc = p_obj->p_libvlc;
+ input_item_t *p_input = &owner->item;
+ vlc_event_manager_t * p_em = &p_input->event_manager;
- vlc_object_lock( p_obj->p_libvlc );
- p_input->i_id = ++priv->i_last_input_id;
- ARRAY_APPEND( priv->input_items, p_input );
- vlc_object_unlock( p_obj->p_libvlc );
+ p_input->i_id = atomic_fetch_add(&last_input_id, 1);
+ vlc_mutex_init( &p_input->lock );
- p_input->b_fixed_name = false;
+ p_input->psz_name = NULL;
+ if( psz_name )
+ input_item_SetName( p_input, psz_name );
+ p_input->psz_uri = NULL;
if( psz_uri )
- p_input->psz_uri = strdup( psz_uri );
+ input_item_SetURI( p_input, psz_uri );
else
- p_input->psz_uri = NULL;
+ p_input->i_type = ITEM_TYPE_UNKNOWN;
- p_input->i_type = i_type;
- p_input->b_prefers_tree = false;
+ TAB_INIT( p_input->i_options, p_input->ppsz_options );
+ p_input->optflagc = 0;
+ p_input->optflagv = NULL;
+ for( int i = 0; i < i_options; i++ )
+ input_item_AddOption( p_input, ppsz_options[i], flags );
+
+ p_input->i_duration = duration;
+ TAB_INIT( p_input->i_categories, p_input->pp_categories );
+ TAB_INIT( p_input->i_es, p_input->es );
+ p_input->p_stats = NULL;
+ p_input->p_meta = NULL;
+ TAB_INIT( p_input->i_epg, p_input->pp_epg );
- if( p_input->i_type == ITEM_TYPE_UNKNOWN )
- GuessType( p_input );
+ vlc_event_manager_init( p_em, p_input );
+ vlc_event_manager_register_event_type( p_em, vlc_InputItemMetaChanged );
+ vlc_event_manager_register_event_type( p_em, vlc_InputItemSubItemAdded );
+ vlc_event_manager_register_event_type( p_em, vlc_InputItemSubItemTreeAdded );
+ vlc_event_manager_register_event_type( p_em, vlc_InputItemDurationChanged );
+ vlc_event_manager_register_event_type( p_em, vlc_InputItemPreparsedChanged );
+ vlc_event_manager_register_event_type( p_em, vlc_InputItemNameChanged );
+ vlc_event_manager_register_event_type( p_em, vlc_InputItemInfoChanged );
+ vlc_event_manager_register_event_type( p_em, vlc_InputItemErrorWhenReadingChanged );
+ vlc_event_manager_register_event_type( p_em, vlc_InputItemPreparseEnded );
- if( psz_name != NULL )
- p_input->psz_name = strdup( psz_name );
- else if( p_input->i_type == ITEM_TYPE_FILE && p_input->psz_uri )
+ if( type != ITEM_TYPE_UNKNOWN )
+ p_input->i_type = type;
+ p_input->b_error_when_reading = false;
+ return p_input;
+}
+
+input_item_t *input_item_Copy( input_item_t *p_input )
+{
+ vlc_mutex_lock( &p_input->lock );
+
+ input_item_t *p_new_input =
+ input_item_NewWithType( p_input->psz_uri, p_input->psz_name,
+ 0, NULL, 0, p_input->i_duration,
+ p_input->i_type );
+
+ if( p_new_input )
{
- const char *psz_filename = strrchr( p_input->psz_uri, DIR_SEP_CHAR );
- if( psz_filename && *psz_filename == DIR_SEP_CHAR )
- psz_filename++;
- p_input->psz_name = strdup( psz_filename && *psz_filename
- ? psz_filename : p_input->psz_uri );
+ for( int i = 0 ; i< p_input->i_options; i++ )
+ {
+ input_item_AddOption( p_new_input,
+ p_input->ppsz_options[i],
+ p_input->optflagv[i] );
+ }
+
+ if( p_input->p_meta )
+ {
+ p_new_input->p_meta = vlc_meta_New();
+ vlc_meta_Merge( p_new_input->p_meta, p_input->p_meta );
+ }
}
- else
- p_input->psz_name = p_input->psz_uri ? strdup( p_input->psz_uri ) : NULL;
- p_input->i_duration = i_duration;
+ vlc_mutex_unlock( &p_input->lock );
- for( int i = 0; i < i_options; i++ )
- input_item_AddOption( p_input, ppsz_options[i] );
- return p_input;
+ return p_new_input;
+}
+
+struct item_type_entry
+{
+ const char psz_scheme[7];
+ uint8_t i_type;
+};
+
+static int typecmp( const void *key, const void *entry )
+{
+ const struct item_type_entry *type = entry;
+ const char *uri = key, *scheme = type->psz_scheme;
+
+ return strncmp( uri, scheme, strlen( scheme ) );
}
/* Guess the type of the item using the beginning of the mrl */
-static void GuessType( input_item_t *p_item)
+static int GuessType( const input_item_t *p_item )
{
- int i;
- static struct { const char *psz_search; int i_type; } types_array[] =
- {
- { "http", ITEM_TYPE_NET },
- { "dvd", ITEM_TYPE_DISC },
- { "cdda", ITEM_TYPE_CDDA },
- { "mms", ITEM_TYPE_NET },
- { "rtsp", ITEM_TYPE_NET },
- { "udp", ITEM_TYPE_NET },
- { "rtp", ITEM_TYPE_NET },
- { "vcd", ITEM_TYPE_DISC },
- { "v4l", ITEM_TYPE_CARD },
- { "dshow", ITEM_TYPE_CARD },
- { "pvr", ITEM_TYPE_CARD },
- { "dvb", ITEM_TYPE_CARD },
- { "qpsk", ITEM_TYPE_CARD },
- { "sdp", ITEM_TYPE_NET },
- { NULL, 0 }
+ static const struct item_type_entry tab[] =
+ { /* /!\ Alphabetical order /!\ */
+ /* Short match work, not just exact match */
+ { "alsa", ITEM_TYPE_CARD },
+ { "atsc", ITEM_TYPE_CARD },
+ { "bd", ITEM_TYPE_DISC },
+ { "cable", ITEM_TYPE_CARD },
+ { "cdda", ITEM_TYPE_CDDA },
+ { "cqam", ITEM_TYPE_CARD },
+ { "dc1394", ITEM_TYPE_CARD },
+ { "dccp", ITEM_TYPE_STREAM },
+ { "deckli", ITEM_TYPE_CARD }, /* decklink */
+ { "dir", ITEM_TYPE_DIRECTORY },
+ { "dshow", ITEM_TYPE_CARD },
+ { "dv", ITEM_TYPE_CARD },
+ { "dvb", ITEM_TYPE_CARD },
+ { "dvd", ITEM_TYPE_DISC },
+ { "dtv", ITEM_TYPE_CARD },
+ { "eyetv", ITEM_TYPE_CARD },
+ { "fd", ITEM_TYPE_UNKNOWN },
+ { "ftp", ITEM_TYPE_STREAM },
+ { "http", ITEM_TYPE_STREAM },
+ { "icyx", ITEM_TYPE_STREAM },
+ { "imem", ITEM_TYPE_UNKNOWN },
+ { "itpc", ITEM_TYPE_STREAM },
+ { "jack", ITEM_TYPE_CARD },
+ { "linsys", ITEM_TYPE_CARD },
+ { "live", ITEM_TYPE_STREAM }, /* livedotcom */
+ { "mms", ITEM_TYPE_STREAM },
+ { "mtp", ITEM_TYPE_DISC },
+ { "ofdm", ITEM_TYPE_CARD },
+ { "oss", ITEM_TYPE_CARD },
+ { "pnm", ITEM_TYPE_STREAM },
+ { "qam", ITEM_TYPE_CARD },
+ { "qpsk", ITEM_TYPE_CARD },
+ { "qtcapt", ITEM_TYPE_CARD }, /* qtcapture */
+ { "raw139", ITEM_TYPE_CARD }, /* raw1394 */
+ { "rt", ITEM_TYPE_STREAM }, /* rtp, rtsp, rtmp */
+ { "satell", ITEM_TYPE_CARD }, /* sattelite */
+ { "screen", ITEM_TYPE_CARD },
+ { "sdp", ITEM_TYPE_STREAM },
+ { "sftp", ITEM_TYPE_STREAM },
+ { "shm", ITEM_TYPE_CARD },
+ { "smb", ITEM_TYPE_STREAM },
+ { "svcd", ITEM_TYPE_DISC },
+ { "tcp", ITEM_TYPE_STREAM },
+ { "terres", ITEM_TYPE_CARD }, /* terrestrial */
+ { "udp", ITEM_TYPE_STREAM }, /* udplite too */
+ { "unsv", ITEM_TYPE_STREAM },
+ { "usdigi", ITEM_TYPE_CARD }, /* usdigital */
+ { "v4l", ITEM_TYPE_CARD },
+ { "vcd", ITEM_TYPE_DISC },
+ { "window", ITEM_TYPE_CARD },
};
+ const struct item_type_entry *e;
- if( !p_item->psz_uri )
- {
- p_item->i_type = ITEM_TYPE_FILE;
+ if( !strstr( p_item->psz_uri, "://" ) )
+ return ITEM_TYPE_FILE;
+
+ e = bsearch( p_item->psz_uri, tab, sizeof( tab ) / sizeof( tab[0] ),
+ sizeof( tab[0] ), typecmp );
+ return e ? e->i_type : ITEM_TYPE_FILE;
+}
+
+input_item_node_t *input_item_node_Create( input_item_t *p_input )
+{
+ input_item_node_t* p_node = malloc( sizeof( input_item_node_t ) );
+ if( !p_node )
+ return NULL;
+
+ assert( p_input );
+
+ p_node->p_item = p_input;
+ vlc_gc_incref( p_input );
+
+ p_node->p_parent = NULL;
+ p_node->i_children = 0;
+ p_node->pp_children = NULL;
+
+ return p_node;
+}
+
+static void RecursiveNodeDelete( input_item_node_t *p_node )
+{
+ for( int i = 0; i < p_node->i_children; i++ )
+ RecursiveNodeDelete( p_node->pp_children[i] );
+
+ vlc_gc_decref( p_node->p_item );
+ free( p_node->pp_children );
+ free( p_node );
+}
+
+void input_item_node_Delete( input_item_node_t *p_node )
+{
+ if( p_node->p_parent )
+ for( int i = 0; i < p_node->p_parent->i_children; i++ )
+ if( p_node->p_parent->pp_children[i] == p_node )
+ {
+ REMOVE_ELEM( p_node->p_parent->pp_children,
+ p_node->p_parent->i_children,
+ i );
+ break;
+ }
+
+ RecursiveNodeDelete( p_node );
+}
+
+input_item_node_t *input_item_node_AppendItem( input_item_node_t *p_node, input_item_t *p_item )
+{
+ input_item_node_t *p_new_child = input_item_node_Create( p_item );
+ if( !p_new_child ) return NULL;
+ input_item_node_AppendNode( p_node, p_new_child );
+ return p_new_child;
+}
+
+void input_item_node_AppendNode( input_item_node_t *p_parent, input_item_node_t *p_child )
+{
+ assert( p_parent && p_child && p_child->p_parent == NULL );
+ INSERT_ELEM( p_parent->pp_children,
+ p_parent->i_children,
+ p_parent->i_children,
+ p_child );
+ p_child->p_parent = p_parent;
+}
+
+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;
+ vlc_event_send( &p_root->p_item->event_manager, &event );
+
+ input_item_node_Delete( p_root );
+}
+
+/* Called by es_out when a new Elementary Stream is added or updated. */
+void input_item_UpdateTracksInfo(input_item_t *item, const es_format_t *fmt)
+{
+ int i;
+ es_format_t *fmt_copy = malloc(sizeof *fmt_copy);
+ if (!fmt_copy)
return;
- }
- for( i = 0; types_array[i].psz_search != NULL; i++ )
+ es_format_Copy(fmt_copy, fmt);
+ /* XXX: we could free p_extra to save memory, we will likely not need
+ * the decoder specific data */
+
+ vlc_mutex_lock( &item->lock );
+
+ for( i = 0; i < item->i_es; i++ )
{
- if( !strncmp( p_item->psz_uri, types_array[i].psz_search,
- strlen( types_array[i].psz_search ) ) )
- {
- p_item->i_type = types_array[i].i_type;
- return;
- }
+ if (item->es[i]->i_id != fmt->i_id)
+ continue;
+
+ /* We've found the right ES, replace it */
+ es_format_Clean(item->es[i]);
+ free(item->es[i]);
+ item->es[i] = fmt_copy;
+ vlc_mutex_unlock( &item->lock );
+ return;
}
- p_item->i_type = ITEM_TYPE_FILE;
+
+ /* ES not found, insert it */
+ TAB_APPEND(item->i_es, item->es, fmt_copy);
+ vlc_mutex_unlock( &item->lock );
}