* ./src/misc/modules_plugin.h: if symbol foo isn't found in the

[vlc] / include / audio_output.h

diff --git a/include/audio_output.h b/include/audio_output.h
index 23f1e18679fba8392ccfb54348e74c16340123e4..be1f5bf2f3f207775a6276a673647056dd1d8276 100644 (file)
--- a/include/audio_output.h
+++ b/include/audio_output.h
@@ -2,9 +2,10 @@
  * audio_output.h : audio output thread interface
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: audio_output.h,v 1.38 2001/07/12 20:31:33 reno Exp $
+ * $Id: audio_output.h,v 1.41 2002/01/14 12:15:10 asmax Exp $
  *
  * Authors: Michel Kaempf <maxx@via.ecp.fr>
+ *          Cyril Deguet <asmax@via.ecp.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -36,7 +37,11 @@ typedef struct aout_bank_s
 
 } aout_bank_t;
 
+#ifndef PLUGIN
 extern aout_bank_t *p_aout_bank;
+#else
+#   define p_aout_bank (p_symbols->p_aout_bank)
+#endif
 
 /*****************************************************************************
  * aout_increment_t
@@ -115,11 +120,9 @@ typedef struct aout_fifo_s
   ( ((((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
+#define AOUT_ADEC_MONO_FIFO     1
+#define AOUT_ADEC_STEREO_FIFO   2
+#define AOUT_ADEC_SPDIF_FIFO    3
 
 /*****************************************************************************
  * aout_thread_t : audio output thread descriptor
@@ -204,13 +207,19 @@ typedef struct aout_thread_s
 /*****************************************************************************
  * Prototypes
  *****************************************************************************/
+#ifndef PLUGIN
 void            aout_InitBank           ( void );
 void            aout_EndBank            ( void );
 
-aout_thread_t * aout_CreateThread       ( int *pi_status );
+aout_thread_t * aout_CreateThread       ( int *pi_status, int i_channels, 
+    long l_rate );
 void            aout_DestroyThread      ( aout_thread_t *, int * );
 
 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 );
+#else
+#   define aout_CreateFifo p_symbols->aout_CreateFifo
+#   define aout_DestroyFifo p_symbols->aout_DestroyFifo
+#endif