X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finput%2Fitem.c;h=1dab190711b18c0831cebbd87933a529f699b187;hb=f2b2e37c04b2921e29daa3260dc696646ad4f10c;hp=c35c4b1e7ac20385ffb9794936fff8f8de3edc6d;hpb=f895d9b7b5f67f713047744df57f28fa4d6e01a2;p=vlc diff --git a/src/input/item.c b/src/input/item.c index c35c4b1e7a..1dab190711 100644 --- a/src/input/item.c +++ b/src/input/item.c @@ -21,7 +21,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif +#include + +#include #include "vlc_playlist.h" #include "vlc_interface.h" @@ -29,6 +34,119 @@ 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 ) +{ + 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 ); + + 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_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_ItemClean( 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_categories; i++ ) + { + info_category_t *p_category = p_i->pp_categories[i]; + int j; + + for( j = 0; j < p_category->i_infos; j++ ) + { + struct info_t *p_info = p_category->pp_infos[j]; + + free( p_info->psz_name); + free( p_info->psz_value ); + free( p_info ); + } + TAB_CLEAN( p_category->i_infos, p_category->pp_infos ); + + free( p_category->psz_name ); + free( p_category ); + } + TAB_CLEAN( p_i->i_categories, p_i->pp_categories ); + + vlc_mutex_destroy( &p_i->lock ); +} + +void input_item_SetHasErrorWhenReading( input_item_t *p_i, bool error ) +{ + vlc_event_t event; + + if( p_i->b_error_when_reading == error ) + return; + + p_i->b_error_when_reading = error; + + /* 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 ); +} + +void input_item_SetMeta( input_item_t *p_i, vlc_meta_type_t meta_type, const char *psz_val ) +{ + vlc_event_t event; + + vlc_mutex_lock( &p_i->lock ); + if( !p_i->p_meta ) + p_i->p_meta = vlc_meta_New(); + vlc_meta_Set( p_i->p_meta, meta_type, psz_val ); + vlc_mutex_unlock( &p_i->lock ); + + /* Notify interested third parties */ + event.type = vlc_InputItemMetaChanged; + event.u.input_item_meta_changed.meta_type = meta_type; + vlc_event_send( &p_i->event_manager, &event ); +} + /** * Get the item from an input thread */ @@ -80,47 +198,54 @@ char *input_ItemGetInfo( input_item_t *p_i, static void input_ItemDestroy ( 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; - playlist_t *p_playlist = pl_Yield( p_obj ); input_ItemClean( p_input ); - ARRAY_BSEARCH( p_playlist->input_items,->i_id, int, p_input->i_id, i); + vlc_object_lock( p_obj->p_libvlc ); + + ARRAY_BSEARCH( priv->input_items,->i_id, int, p_input->i_id, i); if( i != -1 ) - ARRAY_REMOVE( p_playlist->input_items, i); + ARRAY_REMOVE( priv->input_items, i); + + vlc_object_unlock( p_obj->p_libvlc ); - pl_Release( p_obj ); free( p_input ); } -void input_ItemAddOption( input_item_t *p_input, - const char *psz_option ) +int input_ItemAddOpt( input_item_t *p_input, const char *psz_option, + unsigned flags ) { - if( !psz_option ) return; - vlc_mutex_lock( &p_input->lock ); - INSERT_ELEM( p_input->ppsz_options, p_input->i_options, - p_input->i_options, strdup( psz_option ) ); - vlc_mutex_unlock( &p_input->lock ); -} + int err = VLC_SUCCESS; + + if( psz_option == NULL ) + return VLC_EGENERIC; -void input_ItemAddOptionNoDup( input_item_t *p_input, - const char *psz_option ) -{ - int i; - if( !psz_option ) return ; vlc_mutex_lock( &p_input->lock ); - for( i = 0 ; i< p_input->i_options; i++ ) + if (flags & VLC_INPUT_OPTION_UNIQUE) { - if( !strcmp( p_input->ppsz_options[i], psz_option ) ) - { - vlc_mutex_unlock(& p_input->lock ); - return; - } + for (int i = 0 ; i < p_input->i_options; i++) + if( !strcmp( p_input->ppsz_options[i], psz_option ) ) + goto out; } - TAB_APPEND( p_input->i_options, p_input->ppsz_options, strdup( psz_option)); vlc_mutex_unlock( &p_input->lock ); -} + uint8_t *flagv = realloc (p_input->optflagv, p_input->optflagc + 1); + if (flagv == NULL) + { + err = VLC_ENOMEM; + goto out; + } + p_input->optflagv = flagv; + flagv[p_input->optflagc++] = flags; + + INSERT_ELEM( p_input->ppsz_options, p_input->i_options, + p_input->i_options, strdup( psz_option ) ); +out: + vlc_mutex_unlock( &p_input->lock ); + return err; +} int input_ItemAddInfo( input_item_t *p_i, const char *psz_cat, @@ -181,7 +306,7 @@ int input_ItemAddInfo( input_item_t *p_i, } va_start( args, psz_format ); - if( vasprintf( &p_info->psz_value, psz_format, args) ) + if( vasprintf( &p_info->psz_value, psz_format, args) == -1 ) p_info->psz_value = NULL; va_end( args ); @@ -190,13 +315,21 @@ int input_ItemAddInfo( input_item_t *p_i, return p_info->psz_value ? VLC_SUCCESS : VLC_ENOMEM; } -input_item_t *input_ItemGetById( playlist_t *p_playlist, int i_id ) +input_item_t *__input_ItemGetById( vlc_object_t *p_obj, int i_id ) { + libvlc_priv_t *priv = libvlc_priv (p_obj->p_libvlc); + input_item_t * p_ret = NULL; int i; - ARRAY_BSEARCH( p_playlist->input_items, ->i_id, int, i_id, i); + + vlc_object_lock( p_obj->p_libvlc ); + + ARRAY_BSEARCH( priv->input_items, ->i_id, int, i_id, i); if( i != -1 ) - return ARRAY_VAL( p_playlist->input_items, i); - return NULL; + p_ret = ARRAY_VAL( priv->input_items, i); + + vlc_object_unlock( p_obj->p_libvlc ); + + return p_ret; } input_item_t *__input_ItemNewExt( vlc_object_t *p_obj, const char *psz_uri, @@ -218,19 +351,19 @@ input_item_t *input_ItemNewWithType( vlc_object_t *p_obj, const char *psz_uri, mtime_t i_duration, int i_type ) { - playlist_t *p_playlist = pl_Yield( p_obj ); + libvlc_priv_t *priv = libvlc_priv (p_obj->p_libvlc); + DECMALLOC_NULL( p_input, input_item_t ); input_ItemInit( p_obj, p_input ); - vlc_gc_init( p_input, input_ItemDestroy, (void *)p_obj ); + vlc_gc_init( p_input, input_ItemDestroy, (void *)p_obj->p_libvlc ); - PL_LOCK; - p_input->i_id = ++p_playlist->i_last_input_id; - ARRAY_APPEND( p_playlist->input_items, p_input ); - PL_UNLOCK; - pl_Release( p_obj ); + 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->b_fixed_name = VLC_FALSE; + p_input->b_fixed_name = false; if( psz_uri ) p_input->psz_uri = strdup( psz_uri ); @@ -238,14 +371,13 @@ input_item_t *input_ItemNewWithType( vlc_object_t *p_obj, const char *psz_uri, p_input->psz_uri = NULL; p_input->i_type = i_type; - p_input->b_prefers_tree = VLC_FALSE; if( p_input->i_type == ITEM_TYPE_UNKNOWN ) GuessType( p_input ); if( psz_name != NULL ) p_input->psz_name = strdup( psz_name ); - else if( p_input->i_type == ITEM_TYPE_FILE ) + else if( p_input->i_type == ITEM_TYPE_FILE && p_input->psz_uri ) { const char *psz_filename = strrchr( p_input->psz_uri, DIR_SEP_CHAR ); if( psz_filename && *psz_filename == DIR_SEP_CHAR ) @@ -254,11 +386,9 @@ input_item_t *input_ItemNewWithType( vlc_object_t *p_obj, const char *psz_uri, ? psz_filename : p_input->psz_uri ); } else - p_input->psz_name = strdup( p_input->psz_uri ); + p_input->psz_name = p_input->psz_uri ? strdup( p_input->psz_uri ) : NULL; p_input->i_duration = i_duration; - p_input->ppsz_options = NULL; - p_input->i_options = 0; for( int i = 0; i < i_options; i++ ) input_ItemAddOption( p_input, ppsz_options[i] ); @@ -288,6 +418,12 @@ static void GuessType( input_item_t *p_item) { NULL, 0 } }; + if( !p_item->psz_uri ) + { + p_item->i_type = ITEM_TYPE_FILE; + return; + } + for( i = 0; types_array[i].psz_search != NULL; i++ ) { if( !strncmp( p_item->psz_uri, types_array[i].psz_search,