#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_codec.h>
-#include <vlc_aout.h>
#include <stream_decoder.h>
#include <stream_encoder.h>
* Input/Output properties
*/
block_t *p_block;
- aout_buffer_t *p_aout_buffer;
- date_t end_date;
+ block_t *p_aout_buffer;
+ date_t end_date;
/*
* FLAC properties
static int OpenEncoder ( vlc_object_t * );
static void CloseEncoder ( vlc_object_t * );
-static aout_buffer_t *DecodeBlock( decoder_t *, block_t ** );
+static block_t *DecodeBlock( decoder_t *, block_t ** );
/*****************************************************************************
* Module descriptor
/****************************************************************************
* DecodeBlock: the whole thing
****************************************************************************/
-static aout_buffer_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
+static block_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
{
decoder_sys_t *p_sys = p_dec->p_sys;
int i_headers;
int i_samples_delay;
- int i_channels;
FLAC__int32 *p_buffer;
unsigned int i_buffer;
#define STREAMINFO_SIZE 38
-static block_t *Encode( encoder_t *, aout_buffer_t * );
+static block_t *Encode( encoder_t *, block_t * );
/*****************************************************************************
* EncoderWriteCallback: called by libflac to output encoded samples
****************************************************************************
* This function spits out ogg packets.
****************************************************************************/
-static block_t *Encode( encoder_t *p_enc, aout_buffer_t *p_aout_buf )
+static block_t *Encode( encoder_t *p_enc, block_t *p_aout_buf )
{
encoder_sys_t *p_sys = p_enc->p_sys;
block_t *p_chain;