X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_input.h;h=266a0ce066b8549100e9836552c8632afc8652e7;hb=16567ae5c71c4d003a658bcde1782deae4ee5207;hp=2650e8ea58dc6003eff9519491c56434ed08413e;hpb=211f72ff01d9f6fcfefc6801503b01b3a4e935a4;p=vlc

diff --git a/include/vlc_input.h b/include/vlc_input.h
index 2650e8ea58..266a0ce066 100644
--- a/include/vlc_input.h
+++ b/include/vlc_input.h
@@ -160,7 +160,7 @@ static inline void vlc_input_title_Delete( input_title_t *t )
     free( t );
 }
 
-static inline input_title_t *vlc_input_title_Duplicate( input_title_t *t )
+static inline input_title_t *vlc_input_title_Duplicate( const input_title_t *t )
 {
     input_title_t *dup = vlc_input_title_New( );
     int i;
@@ -310,7 +310,7 @@ struct input_thread_t
  *
  * The read-write variables are:
  *  - state (\see input_state_e)
- *  - rate, rate-slower, rate-faster
+ *  - rate
  *  - position, position-offset
  *  - time, time-offset
  *  - title, next-title, prev-title
@@ -512,7 +512,7 @@ enum input_query_e
     /* Input ressources
      * XXX You must call vlc_object_release as soon as possible */
     INPUT_GET_AOUT,         /* arg1=aout_instance_t **              res=can fail */
-    INPUT_GET_VOUTS,        /* arg1=vout_thread_t ***, int *        res=can fail */
+    INPUT_GET_VOUTS,        /* arg1=vout_thread_t ***, size_t *        res=can fail */
     INPUT_GET_ES_OBJECTS,   /* arg1=int id, vlc_object_t **dec, vout_thread_t **, aout_instance_t ** */
 
     /* External clock managments */
@@ -526,22 +526,26 @@ enum input_query_e
  * Prototypes
  *****************************************************************************/
 
-VLC_EXPORT( input_thread_t *, input_Create, ( vlc_object_t *p_parent, input_item_t *, const char *psz_log, input_resource_t * ) );
+VLC_API input_thread_t * input_Create( vlc_object_t *p_parent, input_item_t *, const char *psz_log, input_resource_t * ) VLC_USED;
 #define input_Create(a,b,c,d) input_Create(VLC_OBJECT(a),b,c,d)
 
-VLC_EXPORT( input_thread_t *, input_CreateAndStart, ( vlc_object_t *p_parent, input_item_t *, const char *psz_log ) );
+VLC_API input_thread_t * input_CreateAndStart( vlc_object_t *p_parent, input_item_t *, const char *psz_log ) VLC_USED;
 #define input_CreateAndStart(a,b,c) input_CreateAndStart(VLC_OBJECT(a),b,c)
 
-VLC_EXPORT( int,  input_Start, ( input_thread_t * ) );
+VLC_API int input_Start( input_thread_t * );
 
-VLC_EXPORT( void, input_Stop, ( input_thread_t *, bool b_abort ) );
+VLC_API void input_Stop( input_thread_t *, bool b_abort );
 
-VLC_EXPORT( int, input_Read, ( vlc_object_t *, input_item_t * ) );
+VLC_API int input_Read( vlc_object_t *, input_item_t * );
 #define input_Read(a,b) input_Read(VLC_OBJECT(a),b)
 
-VLC_EXPORT( int, input_vaControl,( input_thread_t *, int i_query, va_list  ) );
+VLC_API int input_vaControl( input_thread_t *, int i_query, va_list  );
 
-VLC_EXPORT( int, input_Control,  ( input_thread_t *, int i_query, ...  ) );
+VLC_API int input_Control( input_thread_t *, int i_query, ...  );
+
+VLC_API void input_Close( input_thread_t * );
+void input_Join( input_thread_t * );
+void input_Release( input_thread_t * );
 
 /**
  * Get the input item for an input thread
@@ -549,7 +553,7 @@ VLC_EXPORT( int, input_Control,  ( input_thread_t *, int i_query, ...  ) );
  * You have to keep a reference to the input or to the input_item_t until
  * you do not need it anymore.
  */
-VLC_EXPORT( input_item_t*, input_GetItem, ( input_thread_t * ) );
+VLC_API input_item_t* input_GetItem( input_thread_t * ) VLC_USED;
 
 /**
  * It will return the current state of the input.
@@ -635,10 +639,9 @@ static inline int input_ModifyPcrSystem( input_thread_t *p_input, bool b_absolut
 }
 
 /* */
-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 *, bool b_do_pace ) );
+VLC_API decoder_t * input_DecoderCreate( vlc_object_t *, es_format_t *, input_resource_t * ) VLC_USED;
+VLC_API void input_DecoderDelete( decoder_t * );
+VLC_API void input_DecoderDecode( decoder_t *, block_t *, bool b_do_pace );
 
 /**
  * This function allows to split a MRL into access, demux and path part.
@@ -647,12 +650,12 @@ VLC_EXPORT( void, input_DecoderDecode,( decoder_t *, block_t *, bool b_do_pace )
  * the provided buffer.
  *  The buffer provided by psz_dup will be modified.
  */
-VLC_EXPORT( void, input_SplitMRL, ( const char **ppsz_access, const char **ppsz_demux, char **ppsz_path, char *psz_dup ) );
+VLC_API void input_SplitMRL( const char **ppsz_access, const char **ppsz_demux, char **ppsz_path, char *psz_dup );
 
 /**
  * This function creates a sane filename path.
  */
-VLC_EXPORT( char *, input_CreateFilename, ( vlc_object_t *, const char *psz_path, const char *psz_prefix, const char *psz_extension ) );
+VLC_API char * input_CreateFilename( vlc_object_t *, const char *psz_path, const char *psz_prefix, const char *psz_extension ) VLC_USED;
 
 /**
  * It creates an empty input resource handler.
@@ -660,11 +663,21 @@ VLC_EXPORT( char *, input_CreateFilename, ( vlc_object_t *, const char *psz_path
  * The given object MUST stay alive as long as the input_resource_t is
  * not deleted.
  */
-VLC_EXPORT( input_resource_t *, input_resource_New, ( vlc_object_t * ) );
+VLC_API input_resource_t * input_resource_New( vlc_object_t * ) VLC_USED;
+
+/**
+ * It releases an input resource.
+ */
+VLC_API void input_resource_Release( input_resource_t * );
+
+/**
+ * Forcefully destroys the video output (e.g. when the playlist is stopped).
+ */
+VLC_API void input_resource_TerminateVout( input_resource_t * );
 
 /**
- * It deletes an input resource.
+ * This function releases all resources (object).
  */
-VLC_EXPORT(void, input_resource_Delete, ( input_resource_t * ) );
+VLC_API void input_resource_Terminate( input_resource_t * );
 
 #endif