* Fixed the BeOS compile typo.

[vlc] / include / input.h

diff --git a/include/input.h b/include/input.h
index 48fc829a2ed9d003352f7f8cb02d9deab5105943..4e4a97a2c7f06066b78f7161fb1b779d1ce9290c 100644 (file)
--- a/include/input.h
+++ b/include/input.h
@@ -2,7 +2,7 @@
  * input.h: structures of the input not exported to other modules
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: input.h,v 1.27 2001/02/08 13:52:34 massiot Exp $
+ * $Id: input.h,v 1.37 2001/05/30 17:03:11 sam Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -34,19 +34,17 @@
                                  * of data loss (this should be < 188).      */
 #define PADDING_PACKET_NUMBER 10 /* Number of padding packets top insert to
                                   * escape a decoder.                        */
+#define NO_SEEK             -1
 
 /*****************************************************************************
  * Prototypes from input_ext-dec.c
  *****************************************************************************/
-void InitBitstream  ( struct bit_stream_s *, struct decoder_fifo_s * );
+void InitBitstream  ( struct bit_stream_s *, struct decoder_fifo_s *,
+                      void (* pf_bitstream_callback)( struct bit_stream_s *,
+                                                      boolean_t ),
+                      void * p_callback_arg );
 void NextDataPacket ( struct bit_stream_s * );
 
-/*****************************************************************************
- * Prototypes from input.c to open files
- *****************************************************************************/
-void input_FileOpen ( struct input_thread_s * );
-void input_FileClose( struct input_thread_s * );
-
 /*****************************************************************************
  * Prototypes from input_programs.c
  *****************************************************************************/
@@ -56,13 +54,15 @@ struct pgrm_descriptor_s * input_FindProgram( struct input_thread_s *, u16 );
 struct pgrm_descriptor_s * input_AddProgram ( struct input_thread_s *,
                                               u16, size_t );
 void input_DelProgram( struct input_thread_s *, struct pgrm_descriptor_s * );
-void input_DumpStream( struct input_thread_s * );
+struct input_area_s * input_AddArea( struct input_thread_s * );
+void input_DelArea   ( struct input_thread_s *, struct input_area_s * );
 struct es_descriptor_s * input_FindES( struct input_thread_s *, u16 );
 struct es_descriptor_s * input_AddES ( struct input_thread_s *,
                                        struct pgrm_descriptor_s *, u16,
                                        size_t );
 void input_DelES     ( struct input_thread_s *, struct es_descriptor_s * );
 int  input_SelectES  ( struct input_thread_s *, struct es_descriptor_s * );
+int  input_UnselectES( struct input_thread_s *, struct es_descriptor_s * );
 
 /*****************************************************************************
  * Prototypes from input_dec.c
@@ -109,7 +109,7 @@ static __inline__ void input_NullPacket( input_thread_t * p_input,
 
     if( p_pes != NULL )
     {
-        p_pes->b_messed_up = 1;
+        p_pes->b_discontinuity = 1;
         p_es->p_last->p_next = p_pad_data;
         p_es->p_last = p_pad_data;
     }
@@ -124,10 +124,8 @@ static __inline__ void input_NullPacket( input_thread_t * p_input,
 
         p_pes->i_rate = p_input->stream.control.i_rate;
         p_pes->p_first = p_pad_data;
-        p_pes->b_messed_up = p_pes->b_discontinuity = 1;
+        p_pes->b_discontinuity = 1;
         input_DecodePES( p_es->p_decoder_fifo, p_pes );
     }
-
-    p_es->b_discontinuity = 0;
 }