#endif
#include <assert.h>
-#include <vlc/vlc.h>
+#include <vlc_common.h>
#include "vlc_playlist.h"
#include "vlc_interface.h"
-#include "input_internal.h"
+#include "item.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_ItemInit( vlc_object_t *p_o, input_item_t *p_i )
+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 );
p_i->p_meta = NULL;
vlc_mutex_init( &p_i->lock );
- vlc_event_manager_init( &p_i->event_manager, p_i, p_o );
- vlc_event_manager_register_event_type( &p_i->event_manager,
- vlc_InputItemMetaChanged );
- vlc_event_manager_register_event_type( &p_i->event_manager,
- vlc_InputItemSubItemAdded );
- vlc_event_manager_register_event_type( &p_i->event_manager,
- vlc_InputItemDurationChanged );
- vlc_event_manager_register_event_type( &p_i->event_manager,
- vlc_InputItemPreparsedChanged );
+ 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 )
+static inline void input_item_Clean( input_item_t *p_i )
{
int i;
vlc_mutex_destroy( &p_i->lock );
}
+void input_item_SetErrorWhenReading( input_item_t *p_i, bool b_error )
+{
+ bool b_changed;
+
+ vlc_mutex_lock( &p_i->lock );
+
+ b_changed = p_i->b_error_when_reading != b_error;
+ p_i->b_error_when_reading = b_error;
+
+ 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_SetPreparsed( input_item_t *p_i, bool b_preparsed )
+{
+ bool b_send_event = false;
+
+ vlc_mutex_lock( &p_i->lock );
+
+ if( !p_i->p_meta )
+ p_i->p_meta = vlc_meta_New();
+
+ int i_new_status;
+ if( b_preparsed )
+ i_new_status = p_i->p_meta->i_status | ITEM_PREPARSED;
+ else
+ i_new_status = p_i->p_meta->i_status & ~ITEM_PREPARSED;
+ if( p_i->p_meta->i_status != i_new_status )
+ {
+ p_i->p_meta->i_status = i_new_status;
+ b_send_event = true;
+ }
+
+ vlc_mutex_unlock( &p_i->lock );
+
+ if( b_send_event )
+ {
+ vlc_event_t event;
+ event.type = vlc_InputItemPreparsedChanged;
+ event.u.input_item_preparsed_changed.new_status = i_new_status;
+ vlc_event_send( &p_i->event_manager, &event );
+ }
+}
+void input_item_SetArtNotFound( input_item_t *p_i, bool b_not_found )
+{
+ vlc_mutex_lock( &p_i->lock );
+
+ if( !p_i->p_meta )
+ p_i->p_meta = vlc_meta_New();
+
+ if( b_not_found )
+ p_i->p_meta->i_status |= ITEM_ART_NOTFOUND;
+ else
+ p_i->p_meta->i_status &= ~ITEM_ART_NOTFOUND;
+
+ vlc_mutex_unlock( &p_i->lock );
+}
+void input_item_SetArtFetched( input_item_t *p_i, bool b_art_fetched )
+{
+ vlc_mutex_lock( &p_i->lock );
+
+ if( !p_i->p_meta )
+ p_i->p_meta = vlc_meta_New();
+
+ if( b_art_fetched )
+ p_i->p_meta->i_status |= ITEM_ART_FETCHED;
+ else
+ p_i->p_meta->i_status &= ~ITEM_ART_FETCHED;
+
+ 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 )
+/* FIXME GRRRRRRRRRR args should be in the reverse order to be
+ * consistant with (nearly?) all or copy funcs */
+void input_item_CopyOptions( input_item_t *p_parent,
+ input_item_t *p_child )
{
- assert( p_input && p_input->p );
- return p_input->p->input.p_item;
+ vlc_mutex_lock( &p_parent->lock );
+
+ for( int i = 0 ; i< p_parent->i_options; i++ )
+ {
+ if( !strcmp( p_parent->ppsz_options[i], "meta-file" ) )
+ continue;
+
+ input_item_AddOption( p_child,
+ p_parent->ppsz_options[i],
+ p_parent->optflagv[i] );
+ }
+
+ vlc_mutex_unlock( &p_parent->lock );
+}
+
+/* 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_mutex_lock( &p_parent->lock );
+
+ p_parent->i_type = ITEM_TYPE_PLAYLIST;
+
+ vlc_mutex_unlock( &p_parent->lock );
+
+ /* 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 );
+}
+
+bool input_item_HasErrorWhenReading( input_item_t *p_item )
+{
+ vlc_mutex_lock( &p_item->lock );
+
+ 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 )
+{
+ vlc_mutex_lock( &p_i->lock );
+
+ if( !p_i->p_meta )
+ {
+ vlc_mutex_unlock( &p_i->lock );
+ return false;
+ }
+ 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 b_ret;
+}
+
+char *input_item_GetMeta( input_item_t *p_i, vlc_meta_type_t meta_type )
+{
+ vlc_mutex_lock( &p_i->lock );
+
+ if( !p_i->p_meta )
+ {
+ vlc_mutex_unlock( &p_i->lock );
+ 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 ) );
+
+ vlc_mutex_unlock( &p_i->lock );
+ return psz;
+}
+
+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, const char *psz_uri )
+{
+ vlc_mutex_lock( &p_i->lock );
+
+ free( p_i->psz_uri );
+ p_i->psz_uri = strdup( psz_uri );
+
+ GuessType( p_i );
+
+ if( !p_i->psz_name && p_i->i_type == ITEM_TYPE_FILE )
+ {
+ const char *psz_filename = strrchr( p_i->psz_uri, DIR_SEP_CHAR );
+ if( psz_filename && *psz_filename == DIR_SEP_CHAR )
+ psz_filename++;
+ if( psz_filename && *psz_filename )
+ p_i->psz_name = strdup( psz_filename );
+ }
+
+ if( !p_i->psz_name )
+ p_i->psz_name = strdup( p_i->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 b_send_event = false;
+
+ vlc_mutex_lock( &p_i->lock );
+ if( p_i->i_duration != i_duration )
+ {
+ p_i->i_duration = i_duration;
+ b_send_event = true;
+ }
+ vlc_mutex_unlock( &p_i->lock );
+
+ 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 );
+ }
+}
+
+
+bool input_item_IsPreparsed( input_item_t *p_item )
+{
+ vlc_mutex_lock( &p_item->lock );
+ bool b_preparsed = p_item->p_meta ? ( p_item->p_meta->i_status & ITEM_PREPARSED ) != 0 : false;
+ vlc_mutex_unlock( &p_item->lock );
+
+ return b_preparsed;
+}
+
+bool input_item_IsArtFetched( input_item_t *p_item )
+{
+ vlc_mutex_lock( &p_item->lock );
+ bool b_fetched = p_item->p_meta ? ( p_item->p_meta->i_status & ITEM_ART_FETCHED ) != 0 : false;
+ vlc_mutex_unlock( &p_item->lock );
+
+ return b_fetched;
}
/**
* empty string otherwise. The caller should free the returned
* pointer.
*/
-char *input_ItemGetInfo( input_item_t *p_i,
- const char *psz_cat,
- const char *psz_name )
+char *input_item_GetInfo( input_item_t *p_i,
+ const char *psz_cat,
+ const char *psz_name )
{
- int i,j;
-
vlc_mutex_lock( &p_i->lock );
- for( i = 0 ; i< p_i->i_categories ; i++ )
+ for( int i = 0; i< p_i->i_categories; i++ )
{
- info_category_t *p_cat = p_i->pp_categories[i];
+ const info_category_t *p_cat = p_i->pp_categories[i];
if( !psz_cat || strcmp( p_cat->psz_name, psz_cat ) )
continue;
- for( j = 0; j < p_cat->i_infos ; j++ )
+ for( int j = 0; j < p_cat->i_infos; j++ )
{
if( !strcmp( p_cat->pp_infos[j]->psz_name, psz_name ) )
{
return strdup( "" );
}
-static void input_ItemDestroy ( gc_object_t *p_this )
+static void input_item_Destroy ( gc_object_t *p_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;
-
- input_ItemClean( p_input );
-
- vlc_mutex_lock( &p_obj->p_libvlc->object_lock );
+ input_item_t *p_item = vlc_priv( p_gc, input_item_t );
- ARRAY_BSEARCH( p_obj->p_libvlc->input_items,->i_id, int, p_input->i_id, i);
- if( i != -1 )
- ARRAY_REMOVE( p_obj->p_libvlc->input_items, i);
-
- vlc_mutex_unlock( &p_obj->p_libvlc->object_lock );
-
- free( p_input );
+ input_item_Clean( p_item );
+ free( p_item );
}
-int input_ItemAddOpt( 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_ItemAddInfo( input_item_t *p_i,
- const char *psz_cat,
- const char *psz_name,
- const char *psz_format, ... )
+int input_item_AddInfo( input_item_t *p_i,
+ const char *psz_cat,
+ const char *psz_name,
+ const char *psz_format, ... )
{
va_list args;
int 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 );
vlc_mutex_unlock( &p_i->lock );
+ if( p_info->psz_value )
+ {
+ 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;
}
-
-input_item_t *__input_ItemGetById( vlc_object_t *p_obj, int i_id )
+int input_item_DelInfo( input_item_t *p_i,
+ const char *psz_cat,
+ const char *psz_name )
{
- input_item_t * p_ret = NULL;
+ info_category_t *p_cat = NULL;
+ int i_cat;
int i;
- vlc_mutex_lock( &p_obj->p_libvlc->object_lock );
+ vlc_mutex_lock( &p_i->lock );
+ for( i_cat = 0; i_cat < p_i->i_categories; i_cat++ )
+ {
+ if( !strcmp( p_i->pp_categories[i_cat]->psz_name,
+ psz_cat ) )
+ {
+ p_cat = p_i->pp_categories[i_cat];
+ break;
+ }
+ }
+ if( p_cat == NULL )
+ {
+ vlc_mutex_unlock( &p_i->lock );
+ return VLC_EGENERIC;
+ }
+
+ if( psz_name )
+ {
+ /* Remove a specific info */
+ for( i = 0; i < p_cat->i_infos; i++ )
+ {
+ if( !strcmp( p_cat->pp_infos[i]->psz_name, psz_name ) )
+ {
+ free( p_cat->pp_infos[i]->psz_name );
+ free( p_cat->pp_infos[i]->psz_value );
+ free( p_cat->pp_infos[i] );
+ REMOVE_ELEM( p_cat->pp_infos, p_cat->i_infos, i );
+ break;
+ }
+ }
+ if( i >= p_cat->i_infos )
+ {
+ vlc_mutex_unlock( &p_i->lock );
+ return VLC_EGENERIC;
+ }
+ }
+ else
+ {
+ /* Remove the complete categorie */
+ for( i = 0; i < p_cat->i_infos; i++ )
+ {
+ free( p_cat->pp_infos[i]->psz_name );
+ free( p_cat->pp_infos[i]->psz_value );
+ free( p_cat->pp_infos[i] );
+ }
+ free( p_cat->pp_infos );
+ REMOVE_ELEM( p_i->pp_categories, p_i->i_categories, i_cat );
+ }
+
+ // Free the category
+ free( p_cat->psz_name );
+ free( p_cat );
+ vlc_mutex_unlock( &p_i->lock );
- ARRAY_BSEARCH( p_obj->p_libvlc->input_items, ->i_id, int, i_id, i);
- if( i != -1 )
- p_ret = ARRAY_VAL( p_obj->p_libvlc->input_items, i);
- vlc_mutex_unlock( &p_obj->p_libvlc->object_lock );
+ vlc_event_t event;
+ event.type = vlc_InputItemInfoChanged;
+ vlc_event_send( &p_i->event_manager, &event );
- return p_ret;
+ return VLC_SUCCESS;
}
-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,
+ unsigned i_option_flags,
mtime_t i_duration )
{
- return input_ItemNewWithType( p_obj, psz_uri, psz_name,
- i_options, ppsz_options,
+ return input_item_NewWithType( p_obj, psz_uri, psz_name,
+ i_options, ppsz_options, i_option_flags,
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,
+ unsigned i_option_flags,
mtime_t i_duration,
int i_type )
{
- DECMALLOC_NULL( p_input, input_item_t );
+ libvlc_priv_t *priv = libvlc_priv (p_obj->p_libvlc);
- input_ItemInit( p_obj, p_input );
- vlc_gc_init( p_input, input_ItemDestroy, (void *)p_obj );
+ input_item_t* p_input = malloc( sizeof(input_item_t ) );
+ if( !p_input )
+ return NULL;
- vlc_mutex_lock( &p_obj->p_libvlc->object_lock );
- p_input->i_id = ++p_obj->p_libvlc->i_last_input_id;
- ARRAY_APPEND( p_obj->p_libvlc->input_items, p_input );
- vlc_mutex_unlock( &p_obj->p_libvlc->object_lock );
+ input_item_Init( p_obj, p_input );
+ vlc_gc_init( p_input, input_item_Destroy );
- p_input->b_fixed_name = false;
+ vlc_object_lock( p_obj->p_libvlc );
+ p_input->i_id = ++priv->i_last_input_id;
+ vlc_object_unlock( p_obj->p_libvlc );
- if( psz_uri )
- p_input->psz_uri = strdup( psz_uri );
- else
- p_input->psz_uri = NULL;
+ p_input->b_fixed_name = false;
p_input->i_type = i_type;
+ p_input->b_prefers_tree = false;
+
+ if( psz_uri )
+ input_item_SetURI( p_input, psz_uri );
- if( p_input->i_type == ITEM_TYPE_UNKNOWN )
- GuessType( p_input );
+ if( i_type != ITEM_TYPE_UNKNOWN )
+ p_input->i_type = i_type;
- if( psz_name != NULL )
- p_input->psz_name = strdup( psz_name );
- 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_name = strdup( psz_filename && *psz_filename
- ? psz_filename : p_input->psz_uri );
- }
- else
- p_input->psz_name = p_input->psz_uri ? strdup( p_input->psz_uri ) : NULL;
+ if( psz_name )
+ input_item_SetName( p_input, psz_name );
p_input->i_duration = i_duration;
for( int i = 0; i < i_options; i++ )
- input_ItemAddOption( p_input, ppsz_options[i] );
+ input_item_AddOption( p_input, ppsz_options[i], i_option_flags );
return p_input;
}
projects / vlc / blobdiff