X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_aout.h;h=30f144ef43ff5a2d7cdfe6a822a3b53ce8e0e7e8;hb=7686840e5c2b384eab661455a5e532a97c669e96;hp=5a7d5f3866cdf57efd99d0e487726bbca56c7fa1;hpb=449fd28aaf007c6411251dae9d0dbfdc65b135d1;p=vlc diff --git a/include/vlc_aout.h b/include/vlc_aout.h index 5a7d5f3866..30f144ef43 100644 --- a/include/vlc_aout.h +++ b/include/vlc_aout.h @@ -21,10 +21,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -#if !defined( __LIBVLC__ ) - #error You are not libvlc or one of its plugins. You cannot include this file -#endif - #ifndef _VLC_AOUT_H #define _VLC_AOUT_H 1 @@ -137,7 +133,7 @@ typedef int32_t vlc_fixed_t; /** audio output buffer */ struct aout_buffer_t { - byte_t * p_buffer; + uint8_t * p_buffer; int i_alloc_type; /* i_size is the real size of the buffer (used for debug ONLY), i_nb_bytes * is the number of significative bytes in it. */ @@ -259,6 +255,8 @@ struct aout_input_t aout_filter_t * pp_filters[AOUT_MAX_FILTERS]; int i_nb_filters; + aout_filter_t * p_playback_rate_filter; + /* resamplers */ aout_filter_t * pp_resamplers[AOUT_MAX_FILTERS]; int i_nb_resamplers; @@ -269,7 +267,7 @@ struct aout_input_t aout_fifo_t fifo; /* Mixer information */ - byte_t * p_first_byte_to_mix; + uint8_t * p_first_byte_to_mix; audio_replay_gain_t replay_gain; float f_multiplier; @@ -369,6 +367,7 @@ VLC_EXPORT( int, aout_CheckChannelReorder, ( const uint32_t *, const uint32_t *, VLC_EXPORT( void, aout_ChannelReorder, ( uint8_t *, int, int, const int *, int ) ); VLC_EXPORT( unsigned int, aout_FormatNbChannels, ( const audio_sample_format_t * p_format ) ); +VLC_EXPORT( unsigned int, aout_BitsPerSample, ( vlc_fourcc_t i_format ) ); VLC_EXPORT( void, aout_FormatPrepare, ( audio_sample_format_t * p_format ) ); VLC_EXPORT( void, aout_FormatPrint, ( aout_instance_t * p_aout, const char * psz_text, const audio_sample_format_t * p_format ) ); VLC_EXPORT( const char *, aout_FormatPrintChannels, ( const audio_sample_format_t * ) );