X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Faudio_output.h;h=b7301c1007d9317dababdcb0ca183330d96b61cf;hb=a70f8bb371466209770c4c3bcdb7137b94acef66;hp=0576f2415a95fe490b34e918c6e72c88f976c7ae;hpb=7f1f24b3aa593a6c426a86e9b707b162372a1b9f;p=vlc

diff --git a/include/audio_output.h b/include/audio_output.h
index 0576f2415a..b7301c1007 100644
--- a/include/audio_output.h
+++ b/include/audio_output.h
@@ -2,7 +2,7 @@
  * audio_output.h : audio output thread interface
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: audio_output.h,v 1.32 2001/04/29 02:48:51 stef Exp $
+ * $Id: audio_output.h,v 1.33 2001/05/01 04:18:17 sam Exp $
  *
  * Authors: Michel Kaempf <maxx@via.ecp.fr>
  *
@@ -21,27 +21,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
-/*****************************************************************************
- * Required headers:
- * - "common.h"                                                   ( boolean_t )
- * - "mtime.h"                                                      ( mtime_t )
- * - "threads.h"                                               ( vlc_thread_t )
- *****************************************************************************/
-
-/* TODO :
- *
- * - Créer un flag destroy dans les fifos audio pour indiquer au thread audio
- *   qu'il peut libérer la mémoire occupée par le buffer de la fifo lorsqu'il
- *   le désire (fin du son ou fin du thread)
- *
- */
-
-/*
- * Macros
- */
-#define AOUT_FIFO_ISEMPTY( fifo )       ( (fifo).l_end_frame == (fifo).l_start_frame )
-#define AOUT_FIFO_ISFULL( fifo )        ( ((((fifo).l_end_frame + 1) - (fifo).l_start_frame) & AOUT_FIFO_SIZE) == 0 )
-
 /*****************************************************************************
  * aout_increment_t
  *****************************************************************************
@@ -112,23 +91,22 @@ typedef struct aout_fifo_s
 
 } aout_fifo_t;
 
+#define AOUT_FIFO_ISEMPTY( fifo ) \
+  ( (fifo).l_end_frame == (fifo).l_start_frame )
+
+#define AOUT_FIFO_ISFULL( fifo ) \
+  ( ((((fifo).l_end_frame + 1) - (fifo).l_start_frame) & AOUT_FIFO_SIZE) == 0 )
+
 #define AOUT_EMPTY_FIFO         0
 #define AOUT_INTF_MONO_FIFO     1
 #define AOUT_INTF_STEREO_FIFO   2
 #define AOUT_ADEC_MONO_FIFO     3
 #define AOUT_ADEC_STEREO_FIFO   4
+#define AOUT_ADEC_SPDIF_FIFO    5
 
 /*****************************************************************************
  * aout_thread_t : audio output thread descriptor
  *****************************************************************************/
-typedef int  (aout_open_t)       ( p_aout_thread_t p_aout );
-typedef int  (aout_setformat_t)  ( p_aout_thread_t p_aout );
-typedef long (aout_getbufinfo_t) ( p_aout_thread_t p_aout,
-                                   long l_buffer_limit );
-typedef void (aout_play_t)       ( p_aout_thread_t p_aout,
-                                   byte_t *buffer, int i_size );
-typedef void (aout_close_t)      ( p_aout_thread_t p_aout );
-
 typedef struct aout_thread_s
 {
     vlc_thread_t        thread_id;
@@ -140,11 +118,11 @@ typedef struct aout_thread_s
 
     /* Plugin used and shortcuts to access its capabilities */
     struct module_s *   p_module;
-    aout_open_t *       pf_open;
-    aout_setformat_t *  pf_setformat;
-    aout_getbufinfo_t * pf_getbufinfo;
-    aout_play_t *       pf_play;
-    aout_close_t *      pf_close;
+    int              ( *pf_open )       ( p_aout_thread_t );
+    int              ( *pf_setformat )  ( p_aout_thread_t );
+    long             ( *pf_getbufinfo ) ( p_aout_thread_t, long );
+    void             ( *pf_play )       ( p_aout_thread_t, byte_t *, int );
+    void             ( *pf_close )      ( p_aout_thread_t );
 
     void *              buffer;
     /* The s32 buffer is used to mix all the audio fifos together before
@@ -164,6 +142,8 @@ typedef struct aout_thread_s
     char *              psz_device;
     int                 i_fd;
 
+    /* The current volume */
+    int                 i_vol;
     /* Format of the audio output samples */
     int                 i_format;
     /* Number of channels */
@@ -178,10 +158,6 @@ typedef struct aout_thread_s
      * for the OSS output */
     p_aout_sys_t        p_sys;
 
-
-    /* there is the current volume */
-    int                 vol;
-
 } aout_thread_t;
 
 /* Those are from <linux/soundcard.h> but are needed because of formats
@@ -205,11 +181,9 @@ typedef struct aout_thread_s
  * Prototypes
  *****************************************************************************/
 aout_thread_t * aout_CreateThread       ( int *pi_status );
-void            aout_DestroyThread      ( aout_thread_t *p_aout,
-                                          int *pi_status );
+void            aout_DestroyThread      ( aout_thread_t *, int * );
 
-aout_fifo_t *   aout_CreateFifo         ( aout_thread_t *p_aout,
-                                          aout_fifo_t *p_fifo );
+aout_fifo_t *   aout_CreateFifo         ( int, int, long, long, long, void * );
 void            aout_DestroyFifo        ( aout_fifo_t *p_fifo );
 void            aout_FreeFifo           ( aout_fifo_t *p_fifo );