* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#include <vlc/vlc.h>
-#include <vlc/input.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#include <assert.h>
+
+#include <vlc_common.h>
#include "vlc_playlist.h"
#include "vlc_interface.h"
+#include "input_internal.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 )
+{
+ 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
+ */
+input_item_t *input_GetItem( input_thread_t *p_input )
+{
+ assert( p_input && p_input->p );
+ return p_input->p->input.p_item;
+}
+
/**
* Get a info item from a given category in a given input item.
*
* empty string otherwise. The caller should free the returned
* pointer.
*/
-char *vlc_input_item_GetInfo( input_item_t *p_i,
+char *input_ItemGetInfo( input_item_t *p_i,
const char *psz_cat,
const char *psz_name )
{
return strdup( "" );
}
-static void vlc_input_item_Destroy ( gc_object_t *p_this )
+static void input_ItemDestroy ( gc_object_t *p_this )
{
vlc_object_t *p_obj = (vlc_object_t *)p_this->p_destructor_arg;
- int i, i_top, i_bottom;
+ 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 = (playlist_t *)vlc_object_find( p_obj,
- VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
+ input_ItemClean( p_input );
- fprintf( stderr, "Destroying item %s\n", p_input->psz_name );
+ 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( priv->input_items, i);
- vlc_input_item_Clean( p_input );
+ vlc_object_unlock( p_obj->p_libvlc );
- if( p_playlist )
- {
- i_bottom = 0; i_top = p_playlist->i_input_items - 1;
- i = i_top / 2;
- while( p_playlist->pp_input_items[i]->i_id != p_input->i_id &&
- i_top > i_bottom )
- {
- if( p_playlist->pp_input_items[i]->i_id < p_input->i_id )
- i_bottom = i + 1;
- else
- i_top = i -1;
+ free( p_input );
+}
- i = i_bottom + ( i_top - i_bottom ) / 2;
+int input_ItemAddOpt( input_item_t *p_input, const char *psz_option,
+ unsigned flags )
+{
+ int err = VLC_SUCCESS;
- }
- if( p_playlist->pp_input_items[i]->i_id == p_input->i_id )
- {
- REMOVE_ELEM( p_playlist->pp_input_items,
- p_playlist->i_input_items, i );
- }
- vlc_object_release( p_playlist );
+ if( psz_option == NULL )
+ return VLC_EGENERIC;
+
+ vlc_mutex_lock( &p_input->lock );
+ if (flags & VLC_INPUT_OPTION_UNIQUE)
+ {
+ for (int i = 0 ; i < p_input->i_options; i++)
+ if( !strcmp( p_input->ppsz_options[i], psz_option ) )
+ goto out;
}
- free( p_input );
+
+ 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 vlc_input_item_AddInfo( input_item_t *p_i,
+int input_ItemAddInfo( input_item_t *p_i,
const char *psz_cat,
const char *psz_name,
const char *psz_format, ... )
if( !(p_cat = (info_category_t *)malloc( sizeof(info_category_t) )) )
{
vlc_mutex_unlock( &p_i->lock );
- return VLC_EGENERIC;
+ return VLC_ENOMEM;
}
p_cat->psz_name = strdup( psz_cat );
p_cat->i_infos = 0;
if( ( p_info = (info_t *)malloc( sizeof( info_t ) ) ) == NULL )
{
vlc_mutex_unlock( &p_i->lock );
- return VLC_EGENERIC;
+ return VLC_ENOMEM;
}
INSERT_ELEM( p_cat->pp_infos, p_cat->i_infos, p_cat->i_infos, p_info );
p_info->psz_name = strdup( psz_name );
}
else
{
- if( p_info->psz_value ) free( p_info->psz_value );
+ free( p_info->psz_value );
}
va_start( args, psz_format );
- 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 );
- return VLC_SUCCESS;
+ return p_info->psz_value ? VLC_SUCCESS : VLC_ENOMEM;
}
-void vlc_input_item_AddOption( input_item_t *p_input,
- const char *psz_option )
+input_item_t *__input_ItemGetById( vlc_object_t *p_obj, int i_id )
{
- 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 );
-};
+ libvlc_priv_t *priv = libvlc_priv (p_obj->p_libvlc);
+ input_item_t * p_ret = NULL;
+ int i;
+ vlc_object_lock( p_obj->p_libvlc );
-input_item_t *input_ItemGetById( playlist_t *p_playlist, int i_id )
-{
- int i, i_top, i_bottom;
- i_bottom = 0; i_top = p_playlist->i_input_items -1;
- i = i_top /2 ;
- while( p_playlist->pp_input_items[i]->i_id != i_id &&
- i_top > i_bottom )
- {
- if( p_playlist->pp_input_items[i]->i_id < i_id )
- i_bottom = i + 1;
- else
- i_top = i - 1;
- i = i_bottom + ( i_top - i_bottom ) / 2;
- }
- if( p_playlist->pp_input_items[i]->i_id == i_id )
- {
- return p_playlist->pp_input_items[i];
- }
- return NULL;
+ ARRAY_BSEARCH( priv->input_items, ->i_id, int, i_id, i);
+ if( i != -1 )
+ 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,
- const char *psz_name, int i_options,
- const char **ppsz_options, int i_duration )
+ 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,
i_options, ppsz_options,
input_item_t *input_ItemNewWithType( vlc_object_t *p_obj, const char *psz_uri,
- const char *psz_name, int i_options,
- const char **ppsz_options, int i_duration,
+ const char *psz_name,
+ int i_options,
+ const char *const *ppsz_options,
+ mtime_t i_duration,
int i_type )
{
- /* FIXME DON'T SEARCH PLAYLIST */
- /* FIXME SHOULD LOCK */
- input_item_t *p_input = (input_item_t *)malloc( sizeof( input_item_t ) );
- playlist_t *p_playlist = (playlist_t *) vlc_object_find( p_obj,
- VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
+ libvlc_priv_t *priv = libvlc_priv (p_obj->p_libvlc);
- vlc_input_item_Init( p_obj, p_input );
- vlc_gc_init( p_input, vlc_input_item_Destroy, (void *)p_obj );
+ DECMALLOC_NULL( p_input, input_item_t );
- p_input->i_id = ++p_playlist->i_last_input_id;
+ input_ItemInit( p_obj, p_input );
+ vlc_gc_init( p_input, input_ItemDestroy, (void *)p_obj->p_libvlc );
- INSERT_ELEM( p_playlist->pp_input_items, p_playlist->i_input_items,
- p_playlist->i_input_items, p_input );
- vlc_object_release( p_playlist );
+ 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 );
else
p_input->psz_uri = NULL;
- if( psz_name != NULL )
- p_input->psz_name = strdup( psz_name );
- else
- p_input->psz_name = strdup ( p_input->psz_uri );
-
p_input->i_type = i_type;
if( p_input->i_type == ITEM_TYPE_UNKNOWN )
GuessType( p_input );
- p_input->i_duration = i_duration;
- p_input->ppsz_options = NULL;
-
- for( p_input->i_options = 0; p_input->i_options < i_options;
- p_input->i_options++ )
+ 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( !p_input->i_options )
- {
- p_input->ppsz_options = malloc( i_options * sizeof(char *) );
- if( !p_input->ppsz_options ) break;
- }
- p_input->ppsz_options[p_input->i_options] =
- strdup( ppsz_options[p_input->i_options] );
+ 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;
+
+ p_input->i_duration = i_duration;
+
+ for( int i = 0; i < i_options; i++ )
+ input_ItemAddOption( p_input, ppsz_options[i] );
return p_input;
}
static void GuessType( input_item_t *p_item)
{
int i;
- static struct { char *psz_search; int i_type; } types_array[] =
+ static struct { const char *psz_search; int i_type; } types_array[] =
{
{ "http", ITEM_TYPE_NET },
{ "dvd", ITEM_TYPE_DISC },
{ NULL, 0 }
};
-#if 0 /* Unused */
- static struct { char *psz_search; int i_type; } exts_array[] =
+ if( !p_item->psz_uri )
{
- { "mp3", ITEM_TYPE_AFILE },
- { NULL, 0 }
- };
-#endif
+ p_item->i_type = ITEM_TYPE_FILE;
+ return;
+ }
for( i = 0; types_array[i].psz_search != NULL; i++ )
{
return;
}
}
- p_item->i_type = ITEM_TYPE_VFILE;
+ p_item->i_type = ITEM_TYPE_FILE;
}
projects / vlc / blobdiff