#endif
#include <assert.h>
-#include <vlc/vlc.h>
+#include <vlc_common.h>
#include "vlc_playlist.h"
#include "vlc_interface.h"
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_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 );
+
+ 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_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_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;
return p_input->p->input.p_item;
}
+void input_item_CopyOptions( input_item_t *p_parent,
+ input_item_t *p_child )
+{
+ int i;
+ for( 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 );
+ 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];
+ }
+}
+
+void input_item_SetName( input_item_t *p_item, const char *psz_name )
+{
+ free( p_item->psz_name );
+ p_item->psz_name = strdup( psz_name );
+}
+
+/* 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 )
+{
+ 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 );
+}
+
+int input_item_AddOption (input_item_t *item, const char *str)
+{
+ return input_item_AddOpt (item, str, VLC_INPUT_OPTION_TRUSTED);
+}
+
+bool input_item_HasErrorWhenReading (input_item_t *item)
+{
+ return item->b_error_when_reading;
+}
+
+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 );
+ vlc_mutex_unlock( &p_i->lock );
+
+ return ret;
+}
+
+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 )
+ {
+ vlc_mutex_unlock( &p_i->lock );
+ return NULL;
+ }
+
+ if( vlc_meta_Get( p_i->p_meta, meta_type ) )
+ psz = strdup( vlc_meta_Get( p_i->p_meta, meta_type ) );
+
+ vlc_mutex_unlock( &p_i->lock );
+ return psz;
+}
+
+char * input_item_GetName( input_item_t * p_i )
+{
+ 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 * 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 )
+{
+ vlc_mutex_lock( &p_i->lock );
+ free( p_i->psz_uri );
+ p_i->psz_uri = strdup( psz_uri );
+ vlc_mutex_unlock( &p_i->lock );
+}
+
+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 )
+{
+ bool 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;
+ }
+ vlc_mutex_unlock( &p_i->lock );
+
+ if ( send_event == true )
+ {
+ 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 )
+{
+ return p_i->p_meta ? p_i->p_meta->i_status & ITEM_PREPARSED : false ;
+}
+
+bool input_item_IsArtFetched( input_item_t *p_i )
+{
+ return p_i->p_meta ? p_i->p_meta->i_status & ITEM_ART_FETCHED : false ;
+}
+
+const vlc_meta_t * input_item_GetMetaObject( input_item_t *p_i )
+{
+ if( !p_i->p_meta )
+ p_i->p_meta = vlc_meta_New();
+
+ return p_i->p_meta;
+}
+
+void input_item_MetaMerge( input_item_t *p_i, const vlc_meta_t * p_new_meta )
+{
+ if( !p_i->p_meta )
+ p_i->p_meta = vlc_meta_New();
+
+ vlc_meta_Merge( p_i->p_meta, p_new_meta );
+}
+
/**
* Get a info item from a given category in a given input item.
*
* empty string otherwise. The caller should free the returned
* pointer.
*/
-char *input_ItemGetInfo( input_item_t *p_i,
+char *input_item_GetInfo( input_item_t *p_i,
const char *psz_cat,
const char *psz_name )
{
return strdup( "" );
}
-static void input_ItemDestroy ( gc_object_t *p_this )
+static void input_item_Destroy ( gc_object_t *gc )
{
- vlc_object_t *p_obj = (vlc_object_t *)p_this->p_destructor_arg;
- input_item_t *p_input = (input_item_t *) p_this;
- int i;
-
- playlist_t *p_playlist = pl_Yield( p_obj );
- input_ItemClean( p_input );
+ input_item_t *p_input = vlc_priv(gc, input_item_t);
- ARRAY_BSEARCH( p_playlist->input_items,->i_id, int, p_input->i_id, i);
- if( i != -1 )
- ARRAY_REMOVE( p_playlist->input_items, i);
-
- pl_Release( p_obj );
+ input_item_Clean( p_input );
free( p_input );
}
-void input_ItemAddOpt( input_item_t *p_input, const char *psz_option,
- unsigned flags )
+int input_item_AddOpt( input_item_t *p_input, const char *psz_option,
+ unsigned flags )
{
+ int err = VLC_SUCCESS;
+
if( psz_option == NULL )
- return;
+ return VLC_EGENERIC;
vlc_mutex_lock( &p_input->lock );
if (flags & VLC_INPUT_OPTION_UNIQUE)
goto out;
}
+ 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,
+int input_item_AddInfo( input_item_t *p_i,
const char *psz_cat,
const char *psz_name,
const char *psz_format, ... )
}
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 );
return p_info->psz_value ? VLC_SUCCESS : VLC_ENOMEM;
}
-input_item_t *input_ItemGetById( playlist_t *p_playlist, int i_id )
-{
- int i;
- ARRAY_BSEARCH( p_playlist->input_items, ->i_id, int, i_id, i);
- if( i != -1 )
- return ARRAY_VAL( p_playlist->input_items, i);
- return NULL;
-}
-
-input_item_t *__input_ItemNewExt( vlc_object_t *p_obj, const char *psz_uri,
+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 )
{
- return input_ItemNewWithType( p_obj, psz_uri, psz_name,
+ return input_item_NewWithType( p_obj, psz_uri, psz_name,
i_options, ppsz_options,
i_duration, ITEM_TYPE_UNKNOWN );
}
-input_item_t *input_ItemNewWithType( vlc_object_t *p_obj, const char *psz_uri,
+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 )
{
- 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 );
+ input_item_Init( p_obj, p_input );
+ vlc_gc_init( p_input, input_item_Destroy );
- 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;
+ 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 );
p_input->psz_uri = NULL;
p_input->i_type = i_type;
- p_input->b_prefers_tree = VLC_FALSE;
+ p_input->b_prefers_tree = 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 )
? 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] );
+ input_item_AddOption( p_input, ppsz_options[i] );
return p_input;
}
{ 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,
projects / vlc / blobdiff