/*****************************************************************************
* vlc_input.h: Core input structures
*****************************************************************************
- * Copyright (C) 1999-2004 the VideoLAN team
+ * Copyright (C) 1999-2006 the VideoLAN team
* $Id$
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
mtime_t i_duration; /**< Duration in milliseconds*/
uint8_t i_type; /**< Type (file, disc, ...) */
+ vlc_bool_t b_prefers_tree; /**< Do we prefer being displayed as tree*/
int i_categories; /**< Number of info categories */
info_category_t **pp_categories; /**< Pointer to the first info category */
#define ITEM_TYPE_NET 7
#define ITEM_TYPE_PLAYLIST 8
#define ITEM_TYPE_NODE 9
+#define ITEM_TYPE_NUMBER 10
-static inline void vlc_input_item_Init( vlc_object_t *p_o, input_item_t *p_i )
+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 = 0;
p_i->i_type = ITEM_TYPE_UNKNOWN;
p_i->b_fixed_name = VLC_TRUE;
- p_i->p_stats = (input_stats_t*) malloc( sizeof( input_stats_t ) );
+ p_i->p_stats = NULL;
p_i->p_meta = NULL;
- vlc_mutex_init( p_o, &p_i->p_stats->lock );
vlc_mutex_init( p_o, &p_i->lock );
}
-static inline void vlc_input_item_CopyOptions( input_item_t *p_parent,
- input_item_t *p_child )
+static inline void input_ItemCopyOptions( input_item_t *p_parent,
+ input_item_t *p_child )
{
int i;
for( i = 0 ; i< p_parent->i_options; i++ )
}
}
-VLC_EXPORT( void, vlc_input_item_AddOption, ( input_item_t *p_input, const char *psz_option ) );
+VLC_EXPORT( void, input_ItemAddOption,( input_item_t *, const char * ) );
+VLC_EXPORT( void, input_ItemAddOptionNoDup,( input_item_t *, const char * ) );
-static inline void vlc_input_item_Clean( input_item_t *p_i )
+static inline void input_ItemClean( input_item_t *p_i )
{
- if( p_i->psz_name ) free( p_i->psz_name );
- if( p_i->psz_uri ) free( p_i->psz_uri );
- if( p_i->p_stats ) free( p_i->p_stats );
- p_i->psz_name = 0;
- p_i->psz_uri = 0;
+ 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 );
vlc_mutex_destroy( &p_i->lock );
}
-VLC_EXPORT( char *, vlc_input_item_GetInfo, ( input_item_t *p_i, const char *psz_cat,const char *psz_name ) );
-VLC_EXPORT(int, vlc_input_item_AddInfo, ( input_item_t *p_i, const char *psz_cat, const char *psz_name, const char *psz_format, ... ) );
+VLC_EXPORT( char *, input_ItemGetInfo, ( input_item_t *p_i, const char *psz_cat,const char *psz_name ) );
+VLC_EXPORT(int, input_ItemAddInfo, ( input_item_t *p_i, const char *psz_cat, const char *psz_name, const char *psz_format, ... ) );
#define input_ItemNew( a,b,c ) input_ItemNewExt( a, b, c, 0, NULL, -1 )
#define input_ItemNewExt(a,b,c,d,e,f) __input_ItemNewExt( VLC_OBJECT(a),b,c,d,e,f)
} input_title_t;
-static inline input_title_t *vlc_input_title_New( )
+static inline input_title_t *vlc_input_title_New(void)
{
input_title_t *t = (input_title_t*)malloc( sizeof( input_title_t ) );
enum input_state_e
{
INIT_S,
+ OPENING_S,
+ BUFFERING_S,
PLAYING_S,
PAUSE_S,
- END_S
+ END_S,
+ ERROR_S
};
/* "rate" default, min/max
vlc_bool_t b_eof;
vlc_bool_t b_can_pace_control;
vlc_bool_t b_can_pause;
+ vlc_bool_t b_preparsing;
/* Global state */
int i_state;
int i_slave;
input_source_t **slave;
+ /* Stats counters */
+ struct {
+ counter_t *p_read_packets;
+ counter_t *p_read_bytes;
+ counter_t *p_input_bitrate;
+ counter_t *p_demux_read;
+ counter_t *p_demux_bitrate;
+ counter_t *p_decoded_audio;
+ counter_t *p_decoded_video;
+ counter_t *p_decoded_sub;
+ counter_t *p_sout_sent_packets;
+ counter_t *p_sout_sent_bytes;
+ counter_t *p_sout_send_bitrate;
+ counter_t *p_played_abuffers;
+ counter_t *p_lost_abuffers;
+ counter_t *p_displayed_pictures;
+ counter_t *p_lost_pictures;
+ vlc_mutex_t counters_lock;
+ } counters;
+
/* Buffer of pending actions */
vlc_mutex_t lock_control;
int i_control;
VLC_EXPORT( void, input_StopThread, ( input_thread_t * ) );
VLC_EXPORT( void, input_DestroyThread, ( input_thread_t * ) );
+typedef struct playlist_album_t
+{
+ char *psz_artist;
+ char *psz_album;
+ vlc_bool_t b_found;
+} playlist_album_t;
+
+int input_MetaFetch ( playlist_t *, input_item_t * );
+int input_ArtFind ( playlist_t *, input_item_t * );
+vlc_bool_t input_MetaSatisfied ( playlist_t*, input_item_t*,
+ uint32_t*, uint32_t* );
+int input_DownloadAndCacheArt ( playlist_t *, input_item_t * );
+
enum input_query_e
{
/* input variable "position" */
VLC_EXPORT( void, input_DecoderDelete, ( decoder_t * ) );
VLC_EXPORT( void, input_DecoderDecode,( decoder_t *, block_t * ) );
+VLC_EXPORT( vlc_bool_t, input_AddSubtitles, ( input_thread_t *, char *, vlc_bool_t ) );
+
+
+
#endif