X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_input.h;h=bb2a2639a18e2b79895e9de3cd4a279f8cf6d36e;hb=b6a59e00612767ad4af7e6c677a2b38c03a1daa1;hp=63debca1f06544234842a27b8cb80ab2686bc091;hpb=1b025556e3277cc727d1e70c7c55a2a0192b4d1a;p=vlc diff --git a/include/vlc_input.h b/include/vlc_input.h index 63debca1f0..bb2a2639a1 100644 --- a/include/vlc_input.h +++ b/include/vlc_input.h @@ -186,9 +186,6 @@ VLC_EXPORT(int, input_item_AddInfo, ( input_item_t *p_i, const char *psz_cat, co VLC_EXPORT( input_item_t *, __input_item_NewExt, (vlc_object_t *, const char *, const char*, int, const char *const *, mtime_t i_duration ) ); VLC_EXPORT( input_item_t *, input_item_NewWithType, ( vlc_object_t *, const char *, const char *e, int, const char *const *, mtime_t i_duration, int ) ); -#define input_item_GetById(a,b) __input_item_GetById( VLC_OBJECT(a),b ) -VLC_EXPORT( input_item_t *, __input_item_GetById, (vlc_object_t *, int ) ); - /***************************************************************************** * Meta data helpers *****************************************************************************/ @@ -421,6 +418,7 @@ typedef enum input_state_e #define INPUT_UPDATE_TITLE 0x0010 #define INPUT_UPDATE_SEEKPOINT 0x0020 #define INPUT_UPDATE_META 0x0040 +#define INPUT_UPDATE_SIGNAL 0x0080 /* Input control XXX: internal */ #define INPUT_CONTROL_FIFO_SIZE 100 @@ -439,8 +437,9 @@ struct input_thread_t { VLC_COMMON_MEMBERS; - bool b_eof; + bool b_eof; bool b_preparsing; + bool b_dead; int i_state; bool b_can_pace_control; @@ -543,7 +542,9 @@ static inline input_state_e input_GetState( input_thread_t * p_input ) input_Control( p_input, INPUT_GET_STATE, &state ); return state; } -VLC_EXPORT( decoder_t *, input_DecoderNew, ( input_thread_t *, es_format_t *, sout_instance_t * ) ); + +typedef struct input_clock_t input_clock_t; +VLC_EXPORT( decoder_t *, input_DecoderNew, ( input_thread_t *, es_format_t *, input_clock_t *, sout_instance_t * ) ); VLC_EXPORT( void, input_DecoderDelete, ( decoder_t * ) ); VLC_EXPORT( void, input_DecoderDecode,( decoder_t *, block_t * ) );