X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finput%2Fitem.c;h=ff53f671cd731d7e7791f95e7b00c01652a27b32;hb=dee576eb6fa3415ab2a3d0acab6f278d3274f0d5;hp=416ec1970a0f10f77eb45d28217cb07ee7152e61;hpb=abc84401cd082ccd70a8bb07f9d96c3cff12b122;p=vlc diff --git a/src/input/item.c b/src/input/item.c index 416ec1970a..ff53f671cd 100644 --- a/src/input/item.c +++ b/src/input/item.c @@ -1,114 +1,42 @@ /***************************************************************************** * 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 * - * 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 +#include #include #include -#include "vlc_playlist.h" -#include "vlc_interface.h" +#include #include #include "item.h" #include "info.h" -static int GuessType( const input_item_t *p_item ); +static int GuessType( const input_item_t *p_item, bool *p_net ); -/** 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 ) -{ - 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 ); - TAB_INIT( p_i->i_epg, p_i->pp_epg ); - - p_i->i_type = ITEM_TYPE_UNKNOWN; - p_i->b_fixed_name = true; - - p_i->p_stats = NULL; - p_i->p_meta = NULL; - - 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_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 ); -} - -static inline void input_item_Clean( input_item_t *p_i ) -{ - int i; - - vlc_event_manager_fini( &p_i->event_manager ); - - free( p_i->psz_name ); - free( p_i->psz_uri ); - if( p_i->p_stats ) - { - vlc_mutex_destroy( &p_i->p_stats->lock ); - free( p_i->p_stats ); - } - - 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); - - for( i = 0; i < p_i->i_es; i++ ) - { - es_format_Clean( p_i->es[i] ); - free( p_i->es[i] ); - } - TAB_CLEAN( p_i->i_es, p_i->es ); - - for( i = 0; i < p_i->i_epg; i++ ) - vlc_epg_Delete( p_i->pp_epg[i] ); - TAB_CLEAN( p_i->i_epg, p_i->pp_epg ); - - for( i = 0; i < p_i->i_categories; i++ ) - info_category_Delete( p_i->pp_categories[i] ); - TAB_CLEAN( p_i->i_categories, p_i->pp_categories ); - - vlc_mutex_destroy( &p_i->lock ); -} void input_item_SetErrorWhenReading( input_item_t *p_i, bool b_error ) { bool b_changed; @@ -129,6 +57,13 @@ void input_item_SetErrorWhenReading( input_item_t *p_i, bool 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 ); +} + void input_item_SetPreparsed( input_item_t *p_i, bool b_preparsed ) { bool b_send_event = false; @@ -216,7 +151,7 @@ void input_item_SetMeta( input_item_t *p_i, vlc_meta_type_t meta_type, const cha } /* FIXME GRRRRRRRRRR args should be in the reverse order to be - * consistant with (nearly?) all or copy funcs */ + * consistent with (nearly?) all or copy funcs */ void input_item_CopyOptions( input_item_t *p_parent, input_item_t *p_child ) { @@ -357,8 +292,10 @@ char *input_item_GetURI( input_item_t *p_i ) vlc_mutex_unlock( &p_i->lock ); return psz_s; } + 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, '"' ) ) @@ -369,7 +306,7 @@ void input_item_SetURI( input_item_t *p_i, const char *psz_uri ) free( p_i->psz_uri ); p_i->psz_uri = strdup( psz_uri ); - p_i->i_type = GuessType( p_i ); + p_i->i_type = GuessType( p_i, &p_i->b_net ); if( p_i->psz_name ) ; @@ -456,6 +393,17 @@ void input_item_SetDuration( input_item_t *p_i, mtime_t i_duration ) } } +char *input_item_GetNowPlayingFb( input_item_t *p_item ) +{ + 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_IsPreparsed( input_item_t *p_item ) { @@ -475,12 +423,67 @@ bool input_item_IsArtFetched( input_item_t *p_item ) return b_fetched; } -static void input_item_Destroy ( gc_object_t *p_gc ) +bool input_item_ShouldPreparseSubItems( input_item_t *p_item ) +{ + bool b_ret; + + vlc_mutex_lock( &p_item->lock ); + b_ret = p_item->i_preparse_depth == -1 ? true : p_item->i_preparse_depth > 0; + vlc_mutex_unlock( &p_item->lock ); + + return b_ret; +} + +input_item_t *input_item_Hold( input_item_t *p_item ) { - input_item_t *p_item = vlc_priv( p_gc, input_item_t ); + input_item_owner_t *owner = item_owner(p_item); - input_item_Clean( p_item ); - free( p_item ); + atomic_fetch_add( &owner->refs, 1 ); + return p_item; +} + +void input_item_Release( input_item_t *p_item ) +{ + input_item_owner_t *owner = item_owner(p_item); + + if( atomic_fetch_sub(&owner->refs, 1) != 1 ) + return; + + vlc_event_manager_fini( &p_item->event_manager ); + + 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 ); + } + + 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 ); + + 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 ); + + 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 ); + + 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_mutex_destroy( &p_item->lock ); + free( owner ); } int input_item_AddOption( input_item_t *p_input, const char *psz_option, @@ -742,6 +745,9 @@ void input_item_SetEpg( input_item_t *p_item, const vlc_epg_t *p_update ) 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 ) @@ -795,89 +801,156 @@ void input_item_SetEpgOffline( input_item_t *p_item ) #ifdef EPG_DEBUG vlc_mutex_lock( &p_item->lock ); const int i_epg_info = p_item->i_epg; - char *ppsz_epg_info[i_epg_info]; - for( int i = 0; i < p_item->i_epg; i++ ) + if( i_epg_info > 0 ) { - 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 ); + 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] ); + 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 ); } -#undef input_item_NewExt -input_item_t *input_item_NewExt( vlc_object_t *p_obj, const char *psz_uri, +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( p_obj, psz_uri, psz_name, + 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, - unsigned i_option_flags, - mtime_t i_duration, - int i_type ) +input_item_t * +input_item_NewWithTypeExt( const char *psz_uri, const char *psz_name, + int i_options, const char *const *ppsz_options, + unsigned flags, mtime_t duration, int type, + int i_net ) { - libvlc_priv_t *priv = libvlc_priv (p_obj->p_libvlc); - static vlc_mutex_t input_id_lock = VLC_STATIC_MUTEX; + static atomic_uint last_input_id = ATOMIC_VAR_INIT(0); - input_item_t* p_input = malloc( sizeof(input_item_t ) ); - if( !p_input ) + input_item_owner_t *owner = calloc( 1, sizeof( *owner ) ); + if( unlikely(owner == NULL) ) return NULL; - input_item_Init( p_obj, p_input ); - vlc_gc_init( p_input, input_item_Destroy ); + atomic_init( &owner->refs, 1 ); - vlc_mutex_lock( &input_id_lock ); - p_input->i_id = ++priv->i_last_input_id; - vlc_mutex_unlock( &input_id_lock ); + input_item_t *p_input = &owner->item; + vlc_event_manager_t * p_em = &p_input->event_manager; - p_input->b_fixed_name = false; + p_input->i_id = atomic_fetch_add(&last_input_id, 1); + vlc_mutex_init( &p_input->lock ); - p_input->i_type = i_type; - p_input->b_prefers_tree = false; + p_input->psz_name = NULL; + if( psz_name ) + input_item_SetName( p_input, psz_name ); + p_input->psz_uri = NULL; if( psz_uri ) input_item_SetURI( p_input, psz_uri ); + else + p_input->i_type = ITEM_TYPE_UNKNOWN; - if( i_type != ITEM_TYPE_UNKNOWN ) - p_input->i_type = i_type; + 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 ); - if( psz_name ) - input_item_SetName( p_input, psz_name ); + 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 ); - p_input->i_duration = i_duration; + 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 ); - for( int i = 0; i < i_options; i++ ) - input_item_AddOption( p_input, ppsz_options[i], i_option_flags ); + if( type != ITEM_TYPE_UNKNOWN ) + p_input->i_type = type; + p_input->b_error_when_reading = false; + + if( i_net != -1 ) + p_input->b_net = !!i_net; + else if( p_input->i_type == ITEM_TYPE_STREAM ) + p_input->b_net = true; return p_input; } +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 ) +{ + return input_item_NewWithTypeExt( psz_uri, psz_name, i_options, + ppsz_options, flags, duration, type, + -1 ); +} + +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 ) + { + 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 ); + } + } + + vlc_mutex_unlock( &p_input->lock ); + + return p_new_input; +} + struct item_type_entry { const char psz_scheme[7]; uint8_t i_type; + bool b_net; }; static int typecmp( const void *key, const void *entry ) @@ -889,53 +962,62 @@ static int typecmp( const void *key, const void *entry ) } /* Guess the type of the item using the beginning of the mrl */ -static int GuessType( const input_item_t *p_item ) +static int GuessType( const input_item_t *p_item, bool *p_net ) { 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 }, - { "dc1394", ITEM_TYPE_CARD }, - { "dccp", ITEM_TYPE_NET }, - { "dir", ITEM_TYPE_DIRECTORY }, - { "dshow", ITEM_TYPE_CARD }, - { "dv", ITEM_TYPE_CARD }, - { "dvb", ITEM_TYPE_CARD }, - { "dvd", ITEM_TYPE_DISC }, - { "ftp", ITEM_TYPE_NET }, - { "http", ITEM_TYPE_NET }, - { "icyx", ITEM_TYPE_NET }, - { "itpc", ITEM_TYPE_NET }, - { "jack", ITEM_TYPE_CARD }, - { "live", ITEM_TYPE_NET }, /* livedotcom */ - { "mms", ITEM_TYPE_NET }, - { "mtp", ITEM_TYPE_DISC }, - { "ofdm", ITEM_TYPE_CARD }, - { "oss", ITEM_TYPE_CARD }, - { "pnm", ITEM_TYPE_NET }, - { "pvr", ITEM_TYPE_CARD }, - { "qam", ITEM_TYPE_CARD }, - { "qpsk", ITEM_TYPE_CARD }, - { "qtcapt", ITEM_TYPE_CARD }, /* qtcapture */ - { "raw139", ITEM_TYPE_CARD }, /* raw1394 */ - { "rt", ITEM_TYPE_NET }, /* rtp, rtsp, rtmp */ - { "satell", ITEM_TYPE_CARD }, /* sattelite */ - { "screen", ITEM_TYPE_CARD }, - { "sdp", ITEM_TYPE_NET }, - { "smb", ITEM_TYPE_NET }, - { "svcd", ITEM_TYPE_DISC }, - { "tcp", ITEM_TYPE_NET }, - { "terres", ITEM_TYPE_CARD }, /* terrestrial */ - { "udp", ITEM_TYPE_NET }, /* udplite too */ - { "unsv", ITEM_TYPE_NET }, - { "usdigi", ITEM_TYPE_CARD }, /* usdigital */ - { "v4l", ITEM_TYPE_CARD }, - { "vcd", ITEM_TYPE_DISC }, - { "window", ITEM_TYPE_CARD }, + { "alsa", ITEM_TYPE_CARD, false }, + { "atsc", ITEM_TYPE_CARD, false }, + { "bluray", ITEM_TYPE_DISC, false }, + { "bd", ITEM_TYPE_DISC, false }, + { "cable", ITEM_TYPE_CARD, false }, + { "cdda", ITEM_TYPE_DISC, false }, + { "cqam", ITEM_TYPE_CARD, false }, + { "dc1394", ITEM_TYPE_CARD, false }, + { "dccp", ITEM_TYPE_STREAM, true }, + { "deckli", ITEM_TYPE_CARD, false }, /* decklink */ + { "dir", ITEM_TYPE_DIRECTORY, false }, + { "dshow", ITEM_TYPE_CARD, false }, + { "dv", ITEM_TYPE_CARD, false }, + { "dvb", ITEM_TYPE_CARD, false }, + { "dvd", ITEM_TYPE_DISC, false }, + { "dtv", ITEM_TYPE_CARD, false }, + { "eyetv", ITEM_TYPE_CARD, false }, + { "fd", ITEM_TYPE_UNKNOWN, false }, + { "ftp", ITEM_TYPE_FILE, true }, + { "http", ITEM_TYPE_FILE, true }, + { "icyx", ITEM_TYPE_STREAM, true }, + { "imem", ITEM_TYPE_UNKNOWN, false }, + { "itpc", ITEM_TYPE_PLAYLIST, true }, + { "jack", ITEM_TYPE_CARD, false }, + { "linsys", ITEM_TYPE_CARD, false }, + { "live", ITEM_TYPE_STREAM, true }, /* livedotcom */ + { "mms", ITEM_TYPE_STREAM, true }, + { "mtp", ITEM_TYPE_DISC, false }, + { "ofdm", ITEM_TYPE_CARD, false }, + { "oss", ITEM_TYPE_CARD, false }, + { "pnm", ITEM_TYPE_STREAM, true }, + { "qam", ITEM_TYPE_CARD, false }, + { "qpsk", ITEM_TYPE_CARD, false }, + { "qtcapt", ITEM_TYPE_CARD, false }, /* qtcapture */ + { "raw139", ITEM_TYPE_CARD, false }, /* raw1394 */ + { "rt", ITEM_TYPE_STREAM, true }, /* rtp, rtsp, rtmp */ + { "satell", ITEM_TYPE_CARD, false }, /* sattelite */ + { "screen", ITEM_TYPE_CARD, false }, + { "sdp", ITEM_TYPE_STREAM, true }, + { "sftp", ITEM_TYPE_FILE, true }, + { "shm", ITEM_TYPE_CARD, false }, + { "smb", ITEM_TYPE_FILE, true }, + { "svcd", ITEM_TYPE_DISC, false }, + { "tcp", ITEM_TYPE_STREAM, true }, + { "terres", ITEM_TYPE_CARD, false }, /* terrestrial */ + { "udp", ITEM_TYPE_STREAM, true }, /* udplite too */ + { "unsv", ITEM_TYPE_STREAM, true }, + { "usdigi", ITEM_TYPE_CARD, false }, /* usdigital */ + { "v4l", ITEM_TYPE_CARD, false }, + { "vcd", ITEM_TYPE_DISC, false }, + { "window", ITEM_TYPE_CARD, false }, }; const struct item_type_entry *e; @@ -944,7 +1026,15 @@ static int GuessType( const input_item_t *p_item ) e = bsearch( p_item->psz_uri, tab, sizeof( tab ) / sizeof( tab[0] ), sizeof( tab[0] ), typecmp ); - return e ? e->i_type : ITEM_TYPE_FILE; + if( e ) + { + *p_net = e->b_net; + return e->i_type; + } else + { + *p_net = false; + return ITEM_TYPE_FILE; + } } input_item_node_t *input_item_node_Create( input_item_t *p_input ) @@ -967,35 +1057,44 @@ input_item_node_t *input_item_node_Create( input_item_t *p_input ) 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] ); + 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 ); + 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 ); + 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 ) { + int i_preparse_depth; input_item_node_t *p_new_child = input_item_node_Create( p_item ); if( !p_new_child ) return NULL; + + vlc_mutex_lock( &p_node->p_item->lock ); + vlc_mutex_lock( &p_item->lock ); + i_preparse_depth = p_node->p_item->i_preparse_depth; + p_item->i_preparse_depth = i_preparse_depth > 0 ? + i_preparse_depth -1 : + i_preparse_depth; + vlc_mutex_unlock( &p_item->lock ); + vlc_mutex_unlock( &p_node->p_item->lock ); + input_item_node_AppendNode( p_node, p_new_child ); return p_new_child; } @@ -1012,12 +1111,44 @@ void input_item_node_AppendNode( input_item_node_t *p_parent, input_item_node_t void input_item_node_PostAndDelete( input_item_node_t *p_root ) { - post_subitems( 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 ); + 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; + + 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 (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; + } - input_item_node_Delete( p_root ); + /* ES not found, insert it */ + TAB_APPEND(item->i_es, item->es, fmt_copy); + vlc_mutex_unlock( &item->lock ); }