* all: these didn't get along in my last commit

include/input_ext-intf.h

@@ -4,7 +4,7 @@
  * control the pace of reading. 
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: input_ext-intf.h,v 1.70 2002/07/20 18:01:41 sam Exp $
+ * $Id: input_ext-intf.h,v 1.71 2002/07/21 19:26:13 sigmunau Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -160,7 +160,31 @@ struct input_area_t
 };
 
 /*****************************************************************************
- * stream_descriptor_t
+ * input_info_t
+ *****************************************************************************
+ * Composes a linked list of name/value pairs intended to inform the
+ * user about the current stream
+ *****************************************************************************/
+struct input_info_t {
+  char *         psz_name;
+  char *         psz_value;
+  input_info_t * p_next;
+};
+
+/*****************************************************************************
+ * input_info_category_t
+ *****************************************************************************
+ * Composes a linked list of categories in which to place info about
+ * the stream.
+ *****************************************************************************/
+struct input_info_category_t {
+  char *                  psz_name;
+  input_info_t *          p_info;
+  input_info_category_t * p_next;
+};
+
+/*****************************************************************************
+* stream_descriptor_t
  *****************************************************************************
  * Describes a stream and list its associated programs. Build upon
  * the information carried in program association sections (for instance)
@@ -217,6 +241,9 @@ struct stream_descriptor_t
     /* Stream control */
     stream_ctrl_t           control;
 
+    /* Input info */
+    input_info_category_t * p_info;
+    
     /* Statistics */
     count_t                 c_packets_read;                  /* packets read */
     count_t                 c_packets_trashed;            /* trashed packets */

include/input_ext-plugins.h

@@ -3,7 +3,7 @@
  *                      but exported to plug-ins
  *****************************************************************************
  * Copyright (C) 1999-2002 VideoLAN
- * $Id: input_ext-plugins.h,v 1.31 2002/07/20 18:01:41 sam Exp $
+ * $Id: input_ext-plugins.h,v 1.32 2002/07/21 19:26:13 sigmunau Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -70,6 +70,12 @@ VLC_EXPORT( int,  input_ClockManageControl, ( input_thread_t *, pgrm_descriptor_
 VLC_EXPORT( void, input_ClockManageRef, ( input_thread_t *, pgrm_descriptor_t *, mtime_t ) );
 VLC_EXPORT( mtime_t, input_ClockGetTS, ( input_thread_t *, pgrm_descriptor_t *, mtime_t ) );
 
+/*****************************************************************************
+ * Prototypes from input_info.c
+ *****************************************************************************/
+VLC_EXPORT( input_info_category_t *, input_InfoCategory, ( input_thread_t *, char * ) );
+VLC_EXPORT( int, input_AddInfo, ( input_info_category_t *, char *, char *, ... ) );
+int input_DelInfo( input_thread_t * p_input ); /* no need to export this */
 /*****************************************************************************
  * Prototypes from input_ext-plugins.h (buffers management)
  *****************************************************************************/

include/vlc_common.h

@@ -3,7 +3,7 @@
  * Collection of useful common types and macros definitions
  *****************************************************************************
  * Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: vlc_common.h,v 1.10 2002/07/20 18:01:42 sam Exp $
+ * $Id: vlc_common.h,v 1.11 2002/07/21 19:26:13 sigmunau Exp $
  *
  * Authors: Samuel Hocevar <sam@via.ecp.fr>
  *          Vincent Seguin <seguin@via.ecp.fr>
@@ -187,6 +187,8 @@ VLC_DECLARE_STRUCT(pes_packet_t)
 VLC_DECLARE_STRUCT(bit_stream_t)
 VLC_DECLARE_STRUCT(network_socket_t)
 VLC_DECLARE_STRUCT(iso639_lang_t)
+VLC_DECLARE_STRUCT(input_info_t)
+VLC_DECLARE_STRUCT(input_info_category_t)
 
 /*****************************************************************************
  * Plug-in stuff

include/vlc_symbols.h

@@ -19,6 +19,7 @@ struct module_symbols_t
     es_descriptor_t * (* input_ParsePS_inner) ( input_thread_t *, data_packet_t * ) ;
     float (* __config_GetFloat_inner) (vlc_object_t *, const char *) ;
     input_area_t * (* input_AddArea_inner) ( input_thread_t * ) ;
+    input_info_category_t * (* input_InfoCategory_inner) ( input_thread_t *, char * ) ;
     int (* __config_GetInt_inner) (vlc_object_t *, const char *) ;
     int (* __config_LoadCmdLine_inner) ( vlc_object_t *, int *, char *[], vlc_bool_t ) ;
     int (* __config_LoadConfigFile_inner) ( vlc_object_t *, const char * ) ;
@@ -34,6 +35,7 @@ struct module_symbols_t
     int (* __vlc_threads_end_inner) ( vlc_object_t * ) ;
     int (* __vlc_threads_init_inner) ( vlc_object_t * ) ;
     int (* input_AccessInit_inner) ( input_thread_t * ) ;
+    int (* input_AddInfo_inner) ( input_info_category_t *, char *, char *, ... ) ;
     int (* input_ChangeArea_inner) ( input_thread_t *, input_area_t * ) ;
     int (* input_ChangeES_inner) ( input_thread_t *, es_descriptor_t *, u8 ) ;
     int (* input_ChangeProgram_inner) ( input_thread_t *, u16 ) ;
@@ -207,6 +209,7 @@ struct module_symbols_t
 #   define input_AccessReinit p_symbols->input_AccessReinit_inner
 #   define input_AddArea p_symbols->input_AddArea_inner
 #   define input_AddES p_symbols->input_AddES_inner
+#   define input_AddInfo p_symbols->input_AddInfo_inner
 #   define input_AddProgram p_symbols->input_AddProgram_inner
 #   define input_BuffersEnd p_symbols->input_BuffersEnd_inner
 #   define input_ChangeArea p_symbols->input_ChangeArea_inner
@@ -234,6 +237,7 @@ struct module_symbols_t
 #   define input_FindES p_symbols->input_FindES_inner
 #   define input_FindProgram p_symbols->input_FindProgram_inner
 #   define input_GatherPES p_symbols->input_GatherPES_inner
+#   define input_InfoCategory p_symbols->input_InfoCategory_inner
 #   define input_InitStream p_symbols->input_InitStream_inner
 #   define input_NewBuffer p_symbols->input_NewBuffer_inner
 #   define input_NewPES p_symbols->input_NewPES_inner