Win32: always use mingw's snprintf

[vlc] / include / vlc_input.h

diff --git a/include/vlc_input.h b/include/vlc_input.h
index 266a0ce066b8549100e9836552c8632afc8652e7..ba33d8f469cfdb1dfac8c425fdc433eab6481e27 100644 (file)
--- 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;
 }
@@ -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_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 **, aout_instance_t ** */
+    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 */
@@ -603,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;
 }
 
@@ -617,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 );
@@ -643,15 +641,6 @@ VLC_API decoder_t * input_DecoderCreate( vlc_object_t *, es_format_t *, input_re
 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.
- *
- *  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.
- */
-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.
  */