X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_input.h;h=e185d4c40bd4f143bdc81cf0029a754303f35ff5;hb=6ee1e193fd896ab9a4729fde14f009d9ce629815;hp=64fc5b9a5c04b3f6eb2c8911d1718c12d9cee25f;hpb=e398a81bd261feaada934e7b402b5fed57646593;p=vlc diff --git a/include/vlc_input.h b/include/vlc_input.h index 64fc5b9a5c..e185d4c40b 100644 --- a/include/vlc_input.h +++ b/include/vlc_input.h @@ -22,12 +22,20 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +#if !defined( __LIBVLC__ ) + #error You are not libvlc or one of its plugins. You cannot include this file +#endif + /* __ is need because conflict with */ #ifndef _VLC__INPUT_H #define _VLC__INPUT_H 1 -#include +#include #include +#include +#include + +#include /* strcasestr() */ struct vlc_meta_t; @@ -75,40 +83,43 @@ struct input_item_t vlc_meta_t *p_meta; - vlc_mutex_t lock; /**< Lock for the item */ + vlc_event_manager_t event_manager; + + vlc_mutex_t lock; /**< Lock for the item */ }; #define ITEM_TYPE_UNKNOWN 0 -#define ITEM_TYPE_AFILE 1 -#define ITEM_TYPE_VFILE 2 -#define ITEM_TYPE_DIRECTORY 3 -#define ITEM_TYPE_DISC 4 -#define ITEM_TYPE_CDDA 5 -#define ITEM_TYPE_CARD 6 -#define ITEM_TYPE_NET 7 -#define ITEM_TYPE_PLAYLIST 8 -#define ITEM_TYPE_NODE 9 -#define ITEM_TYPE_NUMBER 10 +#define ITEM_TYPE_FILE 1 +#define ITEM_TYPE_DIRECTORY 2 +#define ITEM_TYPE_DISC 3 +#define ITEM_TYPE_CDDA 4 +#define ITEM_TYPE_CARD 5 +#define ITEM_TYPE_NET 6 +#define ITEM_TYPE_PLAYLIST 7 +#define ITEM_TYPE_NODE 8 +#define ITEM_TYPE_NUMBER 9 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->psz_uri = 0; - p_i->i_es = 0; - p_i->es = 0; - p_i->i_options = 0; - p_i->ppsz_options = 0; - p_i->i_categories = 0 ; - p_i->pp_categories = 0; + 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 ); + TAB_INIT( p_i->i_categories, p_i->pp_categories ); + 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 ); + 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 ); } static inline void input_ItemCopyOptions( input_item_t *p_parent, @@ -126,71 +137,335 @@ static inline void input_ItemCopyOptions( input_item_t *p_parent, } } +static inline void input_item_SetName( input_item_t *p_item, const char *psz_name ) +{ + if( p_item->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. */ +static inline void input_ItemAddSubItem( 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 ); +} + VLC_EXPORT( void, input_ItemAddOption,( input_item_t *, const char * ) ); VLC_EXPORT( void, input_ItemAddOptionNoDup,( input_item_t *, const char * ) ); 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; + int i; - if( p_i->p_meta ) vlc_meta_Delete( p_i->p_meta ); + vlc_event_manager_fini( &p_i->event_manager ); - while( p_i->i_options ) + free( p_i->psz_name ); + free( p_i->psz_uri ); + if( p_i->p_stats ) { - p_i->i_options--; - if( p_i->ppsz_options[p_i->i_options] ) - free( p_i->ppsz_options[p_i->i_options] ); - if( !p_i->i_options ) free( p_i->ppsz_options ); + vlc_mutex_destroy( &p_i->p_stats->lock ); + free( p_i->p_stats ); } - while( p_i->i_es ) + if( p_i->p_meta ) + vlc_meta_Delete( p_i->p_meta ); + + for( i = 0; i < p_i->i_options; i++ ) { - p_i->i_es--; - es_format_Clean( p_i->es[p_i->i_es] ); - if( !p_i->i_es ) free( p_i->es ); + if( p_i->ppsz_options[i] ) + free( p_i->ppsz_options[i] ); } + TAB_CLEAN( p_i->i_options, p_i->ppsz_options ); - while( p_i->i_categories ) + for( i = 0; i < p_i->i_es; i++ ) { - info_category_t *p_category = - p_i->pp_categories[--(p_i->i_categories)]; + es_format_Clean( p_i->es[i] ); + free( p_i->es[i] ); + } + TAB_CLEAN( p_i->i_es, p_i->es ); - while( p_category->i_infos ) - { - p_category->i_infos--; + for( i = 0; i < p_i->i_categories; i++ ) + { + info_category_t *p_category = p_i->pp_categories[i]; + int j; - if( p_category->pp_infos[p_category->i_infos]->psz_name ) - free( p_category->pp_infos[p_category->i_infos]->psz_name); - if( p_category->pp_infos[p_category->i_infos]->psz_value ) - free( p_category->pp_infos[p_category->i_infos]->psz_value ); - free( p_category->pp_infos[p_category->i_infos] ); + for( j = 0; j < p_category->i_infos; j++ ) + { + struct info_t *p_info = p_category->pp_infos[j]; - if( !p_category->i_infos ) free( p_category->pp_infos ); + if( p_info->psz_name ) + free( p_info->psz_name); + if( p_info->psz_value ) + free( p_info->psz_value ); + free( p_info ); } + TAB_CLEAN( p_category->i_infos, p_category->pp_infos ); if( p_category->psz_name ) free( p_category->psz_name ); free( p_category ); - - if( !p_i->i_categories ) free( p_i->pp_categories ); } + TAB_CLEAN( p_i->i_categories, p_i->pp_categories ); vlc_mutex_destroy( &p_i->lock ); } +static inline 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 ); +} + +static inline vlc_bool_t 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 VLC_FALSE; + } + const char * meta = vlc_meta_Get( p_i->p_meta, meta_type ); + vlc_bool_t ret = meta && strcasestr( meta, psz ); + vlc_mutex_unlock( &p_i->lock ); + + return ret; +} + +static inline 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; +} + +static inline 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; +} + +static inline 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; +} + +static inline void input_item_SetURI( input_item_t * p_i, char * psz_uri ) +{ + vlc_mutex_lock( &p_i->lock ); + if( p_i->psz_uri ) free( p_i->psz_uri ); + p_i->psz_uri = strdup( psz_uri ); + vlc_mutex_unlock( &p_i->lock ); +} + +static inline 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; +} + +static inline void input_item_SetDuration( input_item_t * p_i, mtime_t i_duration ) +{ + vlc_mutex_lock( &p_i->lock ); + p_i->i_duration = i_duration; + vlc_mutex_unlock( &p_i->lock ); + return; +} + +static inline void input_item_SetPreparsed( input_item_t *p_i, vlc_bool_t preparsed ) +{ + if( !p_i->p_meta ) + p_i->p_meta = vlc_meta_New(); + + if( preparsed ) + p_i->p_meta->i_status |= ITEM_PREPARSED; + else + p_i->p_meta->i_status &= ~ITEM_PREPARSED; +} + +static inline vlc_bool_t input_item_IsPreparsed( input_item_t *p_i ) +{ + return p_i->p_meta ? p_i->p_meta->i_status & ITEM_PREPARSED : VLC_FALSE ; +} + +static inline void input_item_SetMetaFetched( input_item_t *p_i, vlc_bool_t metafetched ) +{ + if( !p_i->p_meta ) + p_i->p_meta = vlc_meta_New(); + + if( metafetched ) + p_i->p_meta->i_status |= ITEM_META_FETCHED; + else + p_i->p_meta->i_status &= ~ITEM_META_FETCHED; +} + +static inline vlc_bool_t input_item_IsMetaFetched( input_item_t *p_i ) +{ + return p_i->p_meta ? p_i->p_meta->i_status & ITEM_META_FETCHED : VLC_FALSE ; +} + + +static inline void input_item_SetArtNotFound( input_item_t *p_i, vlc_bool_t notfound ) +{ + if( !p_i->p_meta ) + p_i->p_meta = vlc_meta_New(); + + if( notfound ) + p_i->p_meta->i_status |= ITEM_ART_NOTFOUND; + else + p_i->p_meta->i_status &= ~ITEM_ART_NOTFOUND; +} + +static inline void input_item_SetArtFetched( input_item_t *p_i, vlc_bool_t artfetched ) +{ + if( !p_i->p_meta ) + p_i->p_meta = vlc_meta_New(); + + if( artfetched ) + p_i->p_meta->i_status |= ITEM_ART_FETCHED; + else + p_i->p_meta->i_status &= ~ITEM_ART_FETCHED; +} + +static inline vlc_bool_t input_item_IsArtFetched( input_item_t *p_i ) +{ + return p_i->p_meta ? p_i->p_meta->i_status & ITEM_ART_FETCHED : VLC_FALSE ; +} + +static inline 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; +} + +static inline 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 ); +} + +#define input_item_SetTitle( item, b ) input_item_SetMeta( item, vlc_meta_Title, b ) +#define input_item_SetArtist( item, b ) input_item_SetMeta( item, vlc_meta_Artist, b ) +#define input_item_SetGenre( item, b ) input_item_SetMeta( item, vlc_meta_Genre, b ) +#define input_item_SetCopyright( item, b ) input_item_SetMeta( item, vlc_meta_Copyright, b ) +#define input_item_SetAlbum( item, b ) input_item_SetMeta( item, vlc_meta_Album, b ) +#define input_item_SetTrackNum( item, b ) input_item_SetMeta( item, vlc_meta_TrackNumber, b ) +#define input_item_SetDescription( item, b ) input_item_SetMeta( item, vlc_meta_Description, b ) +#define input_item_SetRating( item, b ) input_item_SetMeta( item, vlc_meta_Rating, b ) +#define input_item_SetDate( item, b ) input_item_SetMeta( item, vlc_meta_Date, b ) +#define input_item_SetSetting( item, b ) input_item_SetMeta( item, vlc_meta_Setting, b ) +#define input_item_SetURL( item, b ) input_item_SetMeta( item, vlc_meta_URL, b ) +#define input_item_SetLanguage( item, b ) input_item_SetMeta( item, vlc_meta_Language, b ) +#define input_item_SetNowPlaying( item, b ) input_item_SetMeta( item, vlc_meta_NowPlaying, b ) +#define input_item_SetPublisher( item, b ) input_item_SetMeta( item, vlc_meta_Publisher, b ) +#define input_item_SetEncodedBy( item, b ) input_item_SetMeta( item, vlc_meta_EncodedBy, b ) +#define input_item_SetArtURL( item, b ) input_item_SetMeta( item, vlc_meta_ArtworkURL, b ) +#define input_item_SetTrackID( item, b ) input_item_SetMeta( item, vlc_meta_TrackID, b ) + +#define input_item_GetTitle( item ) input_item_GetMeta( item, vlc_meta_Title ) +#define input_item_GetArtist( item ) input_item_GetMeta( item, vlc_meta_Artist ) +#define input_item_GetGenre( item ) input_item_GetMeta( item, vlc_meta_Genre ) +#define input_item_GetCopyright( item ) input_item_GetMeta( item, vlc_meta_Copyright ) +#define input_item_GetAlbum( item ) input_item_GetMeta( item, vlc_meta_Album ) +#define input_item_GetTrackNum( item ) input_item_GetMeta( item, vlc_meta_TrackNumber ) +#define input_item_GetDescription( item ) input_item_GetMeta( item, vlc_meta_Description ) +#define input_item_GetRating( item ) input_item_GetMeta( item, vlc_meta_Rating ) +#define input_item_GetDate( item ) input_item_GetMeta( item, vlc_meta_Date ) +#define input_item_GetGetting( item ) input_item_GetMeta( item, vlc_meta_Getting ) +#define input_item_GetURL( item ) input_item_GetMeta( item, vlc_meta_URL ) +#define input_item_GetLanguage( item ) input_item_GetMeta( item, vlc_meta_Language ) +#define input_item_GetNowPlaying( item ) input_item_GetMeta( item, vlc_meta_NowPlaying ) +#define input_item_GetPublisher( item ) input_item_GetMeta( item, vlc_meta_Publisher ) +#define input_item_GetEncodedBy( item ) input_item_GetMeta( item, vlc_meta_EncodedBy ) +#define input_item_GetArtURL( item ) input_item_GetMeta( item, vlc_meta_ArtworkURL ) +#define input_item_GetTrackID( item ) input_item_GetMeta( item, vlc_meta_TrackID ) +#define input_item_GetSetting( item ) input_item_GetMeta( item, vlc_meta_Setting ) + 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) -VLC_EXPORT( input_item_t *, __input_ItemNewExt, (vlc_object_t *, const char *, const char*, int, const char **, int) ); -VLC_EXPORT( input_item_t *, input_ItemNewWithType, ( vlc_object_t *, const char *, const char *e, int, const char **, int, int ) ); +VLC_EXPORT( input_item_t *, __input_ItemNewExt, (vlc_object_t *, const char *, const char*, int, const char *const *, mtime_t i_duration ) ); +VLC_EXPORT( input_item_t *, input_ItemNewWithType, ( vlc_object_t *, const char *, const char *e, int, const char *const *, mtime_t i_duration, int ) ); VLC_EXPORT( input_item_t *, input_ItemGetById, (playlist_t *, int ) ); +/***************************************************************************** + * Meta data helpers + *****************************************************************************/ +static inline void vlc_audio_replay_gain_MergeFromMeta( audio_replay_gain_t *p_dst, + const vlc_meta_t *p_meta ) +{ + char * psz_value; + + if( !p_meta ) + return; + + if( (psz_value = (char *)vlc_dictionary_value_for_key( &p_meta->extra_tags, "REPLAYGAIN_TRACK_GAIN" )) || + (psz_value = (char *)vlc_dictionary_value_for_key( &p_meta->extra_tags, "RG_RADIO" )) ) + { + p_dst->pb_gain[AUDIO_REPLAY_GAIN_TRACK] = VLC_TRUE; + p_dst->pf_gain[AUDIO_REPLAY_GAIN_TRACK] = atof( psz_value ); + } + else if( (psz_value = (char *)vlc_dictionary_value_for_key( &p_meta->extra_tags, "REPLAYGAIN_TRACK_PEAK" )) || + (psz_value = (char *)vlc_dictionary_value_for_key( &p_meta->extra_tags, "RG_PEAK" )) ) + { + p_dst->pb_peak[AUDIO_REPLAY_GAIN_TRACK] = VLC_TRUE; + p_dst->pf_peak[AUDIO_REPLAY_GAIN_TRACK] = atof( psz_value ); + } + else if( (psz_value = (char *)vlc_dictionary_value_for_key( &p_meta->extra_tags, "REPLAYGAIN_ALBUM_GAIN" )) || + (psz_value = (char *)vlc_dictionary_value_for_key( &p_meta->extra_tags, "RG_AUDIOPHILE" )) ) + { + p_dst->pb_gain[AUDIO_REPLAY_GAIN_ALBUM] = VLC_TRUE; + p_dst->pf_gain[AUDIO_REPLAY_GAIN_ALBUM] = atof( psz_value ); + } + else if( (psz_value = (char *)vlc_dictionary_value_for_key( &p_meta->extra_tags, "REPLAYGAIN_ALBUM_PEAK" )) ) + { + p_dst->pb_peak[AUDIO_REPLAY_GAIN_ALBUM] = VLC_TRUE; + p_dst->pf_peak[AUDIO_REPLAY_GAIN_ALBUM] = atof( psz_value ); + } +} /***************************************************************************** * Seek point: (generalisation of chapters) @@ -247,7 +522,7 @@ typedef struct } 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 ) ); @@ -300,7 +575,57 @@ static inline input_title_t *vlc_input_title_Duplicate( input_title_t *t ) return dup; } +/***************************************************************************** + * Attachments + *****************************************************************************/ +struct input_attachment_t +{ + char *psz_name; + char *psz_mime; + char *psz_description; + int i_data; + void *p_data; +}; +static inline input_attachment_t *vlc_input_attachment_New( const char *psz_name, + const char *psz_mime, + const char *psz_description, + const void *p_data, + int i_data ) +{ + input_attachment_t *a = + (input_attachment_t*)malloc( sizeof(input_attachment_t) ); + if( !a ) + return NULL; + a->psz_name = strdup( psz_name ? psz_name : "" ); + a->psz_mime = strdup( psz_mime ? psz_mime : "" ); + a->psz_description = strdup( psz_description ? psz_description : "" ); + a->i_data = i_data; + a->p_data = NULL; + if( i_data > 0 ) + { + a->p_data = malloc( i_data ); + if( a->p_data && p_data ) + memcpy( a->p_data, p_data, i_data ); + } + return a; +} +static inline input_attachment_t *vlc_input_attachment_Duplicate( const input_attachment_t *a ) +{ + return vlc_input_attachment_New( a->psz_name, a->psz_mime, a->psz_description, + a->p_data, a->i_data ); +} +static inline void vlc_input_attachment_Delete( input_attachment_t *a ) +{ + if( !a ) + return; + free( a->psz_name ); + free( a->psz_mime ); + free( a->psz_description ); + if( a->p_data ) + free( a->p_data ); + free( a ); +} /***************************************************************************** * input defines/constants. *****************************************************************************/ @@ -313,7 +638,8 @@ enum input_state_e BUFFERING_S, PLAYING_S, PAUSE_S, - END_S + END_S, + ERROR_S }; /* "rate" default, min/max @@ -322,41 +648,7 @@ enum input_state_e */ #define INPUT_RATE_DEFAULT 1000 #define INPUT_RATE_MIN 125 /* Up to 8/1 */ -#define INPUT_RATE_MAX 8000 /* Up to 1/8 */ - -/* input_source_t: gathers all information per input source */ -typedef struct -{ - /* Input item description */ - input_item_t *p_item; - - /* Access/Stream/Demux plugins */ - access_t *p_access; - stream_t *p_stream; - demux_t *p_demux; - - /* Title infos for that input */ - vlc_bool_t b_title_demux; /* Titles/Seekpoints provided by demux */ - int i_title; - input_title_t **title; - - int i_title_offset; - int i_seekpoint_offset; - - int i_title_start; - int i_title_end; - int i_seekpoint_start; - int i_seekpoint_end; - - /* Properties */ - vlc_bool_t b_can_pace_control; - vlc_bool_t b_can_pause; - vlc_bool_t b_eof; /* eof of demuxer */ - - /* Clock average variation */ - int i_cr_average; - -} input_source_t; +#define INPUT_RATE_MAX 32000 /* Up to 1/32 */ /* i_update field of access_t/demux_t */ #define INPUT_UPDATE_NONE 0x0000 @@ -368,94 +660,33 @@ typedef struct /* Input control XXX: internal */ #define INPUT_CONTROL_FIFO_SIZE 100 -/***************************************************************************** - * input_thread_t - ***************************************************************************** - * XXX: this strucrures is *PRIVATE* so nobody can touch it out of src/input. - * I plan to move it to src/input/input_internal.h anyway - * - * XXX: look at src/input/input.c:input_CreateThread for accessible variables - * YOU CANNOT HAVE ACCESS TO THE CONTENT OF input_thread_t except - * p_input->input.p_item (and it's only temporary). - * XXX: move the docs somewhere (better than src/input ) - *****************************************************************************/ +/** Get the input item for an input thread */ +VLC_EXPORT(input_item_t*, input_GetItem, (input_thread_t*)); + +typedef struct input_thread_private_t input_thread_private_t; + +/** + * Main structure representing an input thread. This structure is mostly + * private. The only public fields are READ-ONLY. You must use the helpers + * to modify them + */ struct input_thread_t { - VLC_COMMON_MEMBERS + VLC_COMMON_MEMBERS; - /* Global properties */ 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_rate; + vlc_bool_t b_preparsing; - /* */ - int64_t i_start; /* :start-time,0 by default */ + int i_state; + vlc_bool_t b_can_pace_control; int64_t i_time; /* Current time */ - int64_t i_stop; /* :stop-time, 0 if none */ - - /* Title infos FIXME multi-input (not easy) ? */ - int i_title; - input_title_t **title; - - int i_title_offset; - int i_seekpoint_offset; - - /* User bookmarks FIXME won't be easy with multiples input */ - int i_bookmark; - seekpoint_t **bookmark; - - /* Global meta datas FIXME move to input_item_t ? */ - vlc_meta_t *p_meta; - - /* Output */ - es_out_t *p_es_out; - sout_instance_t *p_sout; /* XXX Move it to es_out ? */ - vlc_bool_t b_out_pace_control; /* idem ? */ - - /* Internal caching common for all inputs */ - int64_t i_pts_delay; - - /* Main input properties */ - input_source_t input; - - /* Slave demuxers (subs, and others) */ - 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; - struct - { - /* XXX: val isn't duplicated so it won't works with string */ - int i_type; - vlc_value_t val; - } control[INPUT_CONTROL_FIFO_SIZE]; + + /* Internal caching common to all inputs */ + int i_pts_delay; + + /* All other data is input_thread is PRIVATE. You can't access it + * outside of src/input */ + input_thread_private_t *p; }; /***************************************************************************** @@ -463,8 +694,6 @@ struct input_thread_t *****************************************************************************/ #define input_CreateThread(a,b) __input_CreateThread(VLC_OBJECT(a),b) VLC_EXPORT( input_thread_t *, __input_CreateThread, ( vlc_object_t *, input_item_t * ) ); -#define input_CreateThread2(a,b,c) __input_CreateThread2(VLC_OBJECT(a),b,c) -VLC_EXPORT( input_thread_t *, __input_CreateThread2, ( vlc_object_t *, input_item_t *, char * ) ); #define input_Preparse(a,b) __input_Preparse(VLC_OBJECT(a),b) VLC_EXPORT( int, __input_Preparse, ( vlc_object_t *, input_item_t * ) ); @@ -473,10 +702,6 @@ VLC_EXPORT( int, __input_Read, ( vlc_object_t *, input_item_t *, vlc_bool_t ) ); VLC_EXPORT( void, input_StopThread, ( input_thread_t * ) ); VLC_EXPORT( void, input_DestroyThread, ( input_thread_t * ) ); - -#define input_MetaFetch(a,b) __input_MetaFetch(VLC_OBJECT(a),b) -VLC_EXPORT( int, __input_MetaFetch, ( vlc_object_t *, input_item_t * ) ); - enum input_query_e { /* input variable "position" */ @@ -525,6 +750,10 @@ enum input_query_e INPUT_DEL_BOOKMARK, /* arg1= seekpoint_t * res=can fail */ INPUT_SET_BOOKMARK, /* arg1= int res=can fail */ + /* Attachments */ + INPUT_GET_ATTACHMENTS, /* arg1=input_attachment_t***, arg2=int* res=can fail */ + INPUT_GET_ATTACHMENT, /* arg1=input_attachment_t**, arg2=char* res=can fail */ + /* On the fly input slave */ INPUT_ADD_SLAVE /* arg1= char * */ }; @@ -538,7 +767,4 @@ VLC_EXPORT( void, input_DecoderDecode,( decoder_t *, block_t * ) ); VLC_EXPORT( vlc_bool_t, input_AddSubtitles, ( input_thread_t *, char *, vlc_bool_t ) ); -VLC_EXPORT( int, input_DownloadAndCacheArt, ( vlc_object_t *p_parent, input_item_t *p_item ) ); - - #endif