control: move CONSOLE_INTRO_MSG to a private header

[vlc] / include / vlc_aout.h

diff --git a/include/vlc_aout.h b/include/vlc_aout.h
index 3bc68c7e287134e43a314c6134ab6e3d5c12dd75..032157fbd5f76cd96591b166d1caa111a8a9aa47 100644 (file)
--- a/include/vlc_aout.h
+++ b/include/vlc_aout.h
@@ -76,16 +76,7 @@
        || ((p_format)->i_format == VLC_CODEC_A52)       \
        || ((p_format)->i_format == VLC_CODEC_DTS) )
 
-/* Values used for the audio-device and audio-channels object variables */
-#define AOUT_VAR_MONO               1
-#define AOUT_VAR_STEREO             2
-#define AOUT_VAR_2F2R               4
-#define AOUT_VAR_3F2R               5
-#define AOUT_VAR_5_1                6
-#define AOUT_VAR_6_1                7
-#define AOUT_VAR_7_1                8
-#define AOUT_VAR_SPDIF              10
-
+/* Values used for the audio-channels object variable */
 #define AOUT_VAR_CHAN_UNSET         0 /* must be zero */
 #define AOUT_VAR_CHAN_STEREO        1
 #define AOUT_VAR_CHAN_RSTEREO       2
@@ -202,15 +193,16 @@ static const uint32_t pi_vlc_chan_order_wg4[] =
  */
 VLC_API unsigned aout_CheckChannelReorder( const uint32_t *, const uint32_t *,
                                            uint32_t mask, uint8_t *table );
-VLC_API void aout_ChannelReorder(void *, size_t, unsigned, const uint8_t *, vlc_fourcc_t);
+VLC_API void aout_ChannelReorder(void *, size_t, uint8_t, const uint8_t *, vlc_fourcc_t);
 
-VLC_API void aout_Interleave(void *dst, const void *src, unsigned samples,
-                             unsigned channels, vlc_fourcc_t fourcc);
+VLC_API void aout_Interleave(void *dst, const void *const *planes,
+                             unsigned samples, unsigned channels,
+                             vlc_fourcc_t fourcc);
 VLC_API void aout_Deinterleave(void *dst, const void *src, unsigned samples,
                              unsigned channels, vlc_fourcc_t fourcc);
 
 /**
- * This fonction will compute the extraction parameter into pi_selection to go
+ * This function will compute the extraction parameter into pi_selection to go
  * from i_channels with their type given by pi_order_src[] into the order
  * describe by pi_order_dst.
  * It will also set :
@@ -326,8 +318,22 @@ static inline int aout_ChannelsRestart (vlc_object_t *obj, const char *varname,
     return 0;
 }
 
+/* Audio output filters */
+typedef struct aout_filters aout_filters_t;
+typedef struct aout_request_vout aout_request_vout_t;
+
+VLC_API aout_filters_t *aout_FiltersNew(vlc_object_t *,
+                                        const audio_sample_format_t *,
+                                        const audio_sample_format_t *,
+                                        const aout_request_vout_t *) VLC_USED;
+#define aout_FiltersNew(o,inf,outf,rv) \
+        aout_FiltersNew(VLC_OBJECT(o),inf,outf,rv)
+VLC_API void aout_FiltersDelete(vlc_object_t *, aout_filters_t *);
+#define aout_FiltersDelete(o,f) \
+        aout_FiltersDelete(VLC_OBJECT(o),f)
+VLC_API bool aout_FiltersAdjustResampling(aout_filters_t *, int);
+VLC_API block_t *aout_FiltersPlay(aout_filters_t *, block_t *, int rate);
 
-/* */
 VLC_API vout_thread_t * aout_filter_RequestVout( filter_t *, vout_thread_t *p_vout, video_format_t *p_fmt );
 
 #endif /* VLC_AOUT_H */