* modules/access/vcd/*, modules/access/cdda.c: changed ioctl_ReadSector() into ioctl_...

[vlc] / include / aout_internal.h

diff --git a/include/aout_internal.h b/include/aout_internal.h
index f0cb59ebc5fdd60e140f25e82d2fb096d86392e2..48c7d7503767bdc3a0958aaf4dcfee952eeeb10b 100644 (file)
--- a/include/aout_internal.h
+++ b/include/aout_internal.h
@@ -2,7 +2,7 @@
  * aout_internal.h : internal defines for audio output
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: aout_internal.h,v 1.35 2002/12/06 10:10:40 sam Exp $
+ * $Id: aout_internal.h,v 1.40 2003/03/06 23:10:11 gbazin Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -112,7 +112,7 @@ typedef struct aout_filter_t
                                          struct aout_buffer_t *,
                                          struct aout_buffer_t * );
     vlc_bool_t              b_in_place;
-    vlc_bool_t              b_reinit;
+    vlc_bool_t              b_continuity;
 } aout_filter_t;
 
 /*****************************************************************************
@@ -128,7 +128,7 @@ typedef struct aout_mixer_t
     void                 (* pf_do_work)( struct aout_instance_t *,
                                          struct aout_buffer_t * );
 
-    /* If b_error == 1, there is no mixer nor audio output pipeline. */
+    /* If b_error == 1, there is no mixer. */
     vlc_bool_t              b_error;
     /* Multiplier used to raise or lower the volume of the sound in
      * software. Beware, this creates sound distortion and should be avoided
@@ -200,6 +200,9 @@ typedef struct aout_output_t
     /* Current volume for the output - it's just a placeholder, the plug-in
      * may or may not use it. */
     audio_volume_t          i_volume;
+
+    /* If b_error == 1, there is no audio output pipeline. */
+    vlc_bool_t              b_error;
 } aout_output_t;
 
 /*****************************************************************************
@@ -233,6 +236,8 @@ struct aout_instance_t
 
     /* Output plug-in */
     aout_output_t           output;
+
+    int                     i_pts_delay;                 /* internal caching */
 };
 
 /*****************************************************************************
@@ -262,7 +267,7 @@ void aout_FiltersPlay( aout_instance_t * p_aout,
 
 /* From mixer.c : */
 int aout_MixerNew( aout_instance_t * p_aout );
-int aout_MixerDelete( aout_instance_t * p_aout );
+void aout_MixerDelete( aout_instance_t * p_aout );
 void aout_MixerRun( aout_instance_t * p_aout );
 int aout_MixerMultiplierSet( aout_instance_t * p_aout, float f_multiplier );
 int aout_MixerMultiplierGet( aout_instance_t * p_aout, float * pf_multiplier );