# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_aout.h>
#include <vlc_codec.h>
static aout_buffer_t *DecodeBlock( decoder_t *, block_t ** );
-vlc_module_begin();
- set_description( _("ADPCM audio decoder") );
- set_capability( "decoder", 50 );
- set_category( CAT_INPUT );
- set_subcategory( SUBCAT_INPUT_ACODEC );
- set_callbacks( OpenDecoder, CloseDecoder );
-vlc_module_end();
+vlc_module_begin ()
+ set_description( N_("ADPCM audio decoder") )
+ set_capability( "decoder", 50 )
+ set_category( CAT_INPUT )
+ set_subcategory( SUBCAT_INPUT_ACODEC )
+ set_callbacks( OpenDecoder, CloseDecoder )
+vlc_module_end ()
/*****************************************************************************
* Local prototypes
{
p_sys->i_block = (p_sys->codec == ADPCM_IMA_QT) ?
34 * p_dec->fmt_in.audio.i_channels : 1024;
- msg_Warn( p_dec, "block size undefined, using %d", p_sys->i_block );
+ msg_Warn( p_dec, "block size undefined, using %zu", p_sys->i_block );
}
else
{
}
msg_Dbg( p_dec, "format: samplerate:%d Hz channels:%d bits/sample:%d "
- "blockalign:%d samplesperblock:%d",
+ "blockalign:%zu samplesperblock:%zu",
p_dec->fmt_in.audio.i_rate, p_dec->fmt_in.audio.i_channels,
p_dec->fmt_in.audio.i_bitspersample, p_sys->i_block,
p_sys->i_samplesperblock );
- p_dec->fmt_out.i_codec = AOUT_FMT_S16_NE;
+ p_dec->fmt_out.i_cat = AUDIO_ES;
+ p_dec->fmt_out.i_codec = VLC_CODEC_S16N;
p_dec->fmt_out.audio.i_rate = p_dec->fmt_in.audio.i_rate;
p_dec->fmt_out.audio.i_channels = p_dec->fmt_in.audio.i_channels;
p_dec->fmt_out.audio.i_physical_channels =
{
aout_buffer_t *p_out;
- p_out = p_dec->pf_aout_buffer_new( p_dec, p_sys->i_samplesperblock );
+ p_out = decoder_NewAudioBuffer( p_dec, p_sys->i_samplesperblock );
if( p_out == NULL )
{
block_Release( p_block );