contrib: add two macros to simplify patching and unpacking

[vlc] / include / vlc_aout.h

diff --git a/include/vlc_aout.h b/include/vlc_aout.h
index 6fcb809e05f9915f42e9983c608522f15586c91a..b7dc31434d015f77fc871163cf47c2e813532c6d 100644 (file)
--- a/include/vlc_aout.h
+++ b/include/vlc_aout.h
@@ -134,12 +134,6 @@ typedef int32_t vlc_fixed_t;
 /* Max input rate factor (1/4 -> 4) */
 #define AOUT_MAX_INPUT_RATE (4)
 
-/** allocation of memory in the audio output */
-typedef struct aout_alloc_t
-{
-    bool                    b_alloc;
-} aout_alloc_t;
-
 /** audio output buffer FIFO */
 struct aout_fifo_t
 {
@@ -201,12 +195,10 @@ struct aout_instance_t
     vlc_mutex_t             volume_vars_lock;
 
     /* Input streams & pre-filters */
-    aout_input_t *          pp_inputs[1];
-    int                     i_nb_inputs;
+    aout_input_t *          p_input;
 
     /* Mixer */
     audio_sample_format_t   mixer_format;
-    aout_alloc_t            mixer_allocation;
     float                   mixer_multiplier;
     struct aout_mixer_t    *p_mixer;
 
@@ -278,8 +270,8 @@ VLC_API void aout_FormatPrepare( audio_sample_format_t * p_format );
 VLC_API void aout_FormatPrint( aout_instance_t * p_aout, const char * psz_text, const audio_sample_format_t * p_format );
 VLC_API const char * aout_FormatPrintChannels( const audio_sample_format_t * ) VLC_USED;
 
-VLC_API mtime_t aout_FifoFirstDate( aout_instance_t *, aout_fifo_t * ) VLC_USED;
-VLC_API aout_buffer_t * aout_FifoPop( aout_instance_t * p_aout, aout_fifo_t * p_fifo ) VLC_USED;
+VLC_API mtime_t aout_FifoFirstDate( const aout_fifo_t * ) VLC_USED;
+VLC_API aout_buffer_t *aout_FifoPop( aout_fifo_t * p_fifo ) VLC_USED;
 
 /* From intf.c : */
 VLC_API void aout_VolumeSoftInit( aout_instance_t * );