X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_input.h;h=ba33d8f469cfdb1dfac8c425fdc433eab6481e27;hb=554f76adfa055ffac630de9d06bb7caae6c4c146;hp=ac90b1092ed7c5ff2fb351819a1ebe578ff2d60b;hpb=552367122ca16f4d5f5296beddc44bcec945348f;p=vlc

diff --git a/include/vlc_input.h b/include/vlc_input.h
index ac90b1092e..ba33d8f469 100644
--- a/include/vlc_input.h
+++ b/include/vlc_input.h
@@ -83,7 +83,6 @@ struct seekpoint_t
     int64_t i_byte_offset;
     int64_t i_time_offset;
     char    *psz_name;
-    int     i_level;
 };
 
 static inline seekpoint_t *vlc_seekpoint_New( void )
@@ -91,7 +90,6 @@ static inline seekpoint_t *vlc_seekpoint_New( void )
     seekpoint_t *point = (seekpoint_t*)malloc( sizeof( seekpoint_t ) );
     point->i_byte_offset =
     point->i_time_offset = -1;
-    point->i_level = 0;
     point->psz_name = NULL;
     return point;
 }
@@ -160,7 +158,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 +308,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
@@ -434,7 +432,7 @@ typedef enum input_event_type_e
     /* cache" has changed */
     INPUT_EVENT_CACHE,
 
-    /* A aout_instance_t object has been created/deleted by *the input* */
+    /* A audio_output_t object has been created/deleted by *the input* */
     INPUT_EVENT_AOUT,
     /* A vout_thread_t object has been created/deleted by *the input* */
     INPUT_EVENT_VOUT,
@@ -479,9 +477,6 @@ enum input_query_e
     INPUT_DEL_INFO,   /* arg1= char* arg2= char*              res=can fail */
     INPUT_SET_NAME,   /* arg1= char* res=can fail    */
 
-    /* Input config options */
-    INPUT_ADD_OPTION,      /* arg1= char * arg2= char *  res=can fail*/
-
     /* Input properties */
     INPUT_GET_VIDEO_FPS,         /* arg1= double *        res=can fail */
 
@@ -494,6 +489,9 @@ enum input_query_e
     INPUT_DEL_BOOKMARK,    /* arg1= seekpoint_t *  res=can fail   */
     INPUT_SET_BOOKMARK,    /* arg1= int  res=can fail    */
 
+    /* titles */
+    INPUT_GET_TITLE_INFO,     /* arg1=input_title_t** arg2= 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 */
@@ -511,9 +509,9 @@ 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_ES_OBJECTS,   /* arg1=int id, vlc_object_t **dec, vout_thread_t **, aout_instance_t ** */
+    INPUT_GET_AOUT,         /* arg1=audio_output_t **              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 **, audio_output_t ** */
 
     /* External clock managments */
     INPUT_GET_PCR_SYSTEM,   /* arg1=mtime_t *, arg2=mtime_t *       res=can fail */
@@ -526,22 +524,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_API int input_Control( input_thread_t *, int i_query, ...  );
 
-VLC_EXPORT( 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 +551,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.
@@ -599,9 +601,9 @@ static inline vout_thread_t *input_GetVout( input_thread_t *p_input )
  * @return NULL on error, or the audio output (which needs to be
  * released with vlc_object_release()).
  */
-static inline aout_instance_t *input_GetAout( input_thread_t *p_input )
+static inline audio_output_t *input_GetAout( input_thread_t *p_input )
 {
-     aout_instance_t *p_aout;
+     audio_output_t *p_aout;
      return input_Control( p_input, INPUT_GET_AOUT, &p_aout ) ? NULL : p_aout;
 }
 
@@ -613,7 +615,7 @@ static inline aout_instance_t *input_GetAout( input_thread_t *p_input )
  */
 static inline int input_GetEsObjects( input_thread_t *p_input, int i_id,
                                       vlc_object_t **pp_decoder,
-                                      vout_thread_t **pp_vout, aout_instance_t **pp_aout )
+                                      vout_thread_t **pp_vout, audio_output_t **pp_aout )
 {
     return input_Control( p_input, INPUT_GET_ES_OBJECTS, i_id,
                           pp_decoder, pp_vout, pp_aout );
@@ -635,37 +637,36 @@ 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.
+ * This function creates a sane filename path.
+ */
+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.
  *
- *  You should not write into access and demux string as they may not point into
- * the provided buffer.
- *  The buffer provided by psz_dup will be modified.
+ * The given object MUST stay alive as long as the input_resource_t is
+ * not deleted.
  */
-VLC_EXPORT( void, input_SplitMRL, ( const char **ppsz_access, const char **ppsz_demux, char **ppsz_path, char *psz_dup ) );
+VLC_API input_resource_t * input_resource_New( vlc_object_t * ) VLC_USED;
 
 /**
- * This function creates a sane filename path.
+ * It releases an input resource.
  */
-VLC_EXPORT( char *, input_CreateFilename, ( vlc_object_t *, const char *psz_path, const char *psz_prefix, const char *psz_extension ) );
+VLC_API void input_resource_Release( input_resource_t * );
 
 /**
- * This function detaches resources from a dead input.
- *
- * It MUST be called on a dead input (p_input->b_dead true) otherwise
- * it will assert.
- * It does not support concurrent calls.
+ * Forcefully destroys the video output (e.g. when the playlist is stopped).
  */
-VLC_EXPORT(input_resource_t *, input_DetachResource, ( input_thread_t * ) );
+VLC_API void input_resource_TerminateVout( input_resource_t * );
 
 /**
- * This function releases the 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