/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdio.h>
-#include <stdlib.h> /* malloc(), free() */
#include <malloc.h>
-#include <string.h>
#include <SoundPlayer.h>
#include <media/MediaDefs.h>
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
#include <vlc_aout.h>
extern "C"
{
/*****************************************************************************
* OpenAudio
*****************************************************************************/
-int E_(OpenAudio) ( vlc_object_t * p_this )
+int OpenAudio ( vlc_object_t * p_this )
{
aout_instance_t * p_aout = (aout_instance_t*) p_this;
p_aout->output.p_sys = (aout_sys_t*) malloc( sizeof( aout_sys_t ) );
if( p_aout->output.p_sys == NULL )
- {
- msg_Err( p_aout, "out of memory" );
return -1;
- }
aout_sys_t * p_sys = p_aout->output.p_sys;
aout_VolumeSoftInit( p_aout );
#endif
p_format->buffer_size = 8192;
- p_aout->output.output.i_format = VLC_FOURCC('f','l','3','2');
+ p_aout->output.output.i_format = VLC_CODEC_FL32;
p_aout->output.i_nb_samples = 2048 / i_nb_channels;
p_aout->output.pf_play = DoNothing;
/*****************************************************************************
* CloseAudio
*****************************************************************************/
-void E_(CloseAudio) ( vlc_object_t * p_this )
+void CloseAudio ( vlc_object_t * p_this )
{
aout_instance_t * p_aout = (aout_instance_t *) p_this;
aout_sys_t * p_sys = (aout_sys_t *) p_aout->output.p_sys;
p_aout_buffer = aout_OutputNextBuffer( p_aout,
mdate() + p_sys->latency,
- VLC_FALSE );
+ false );
if( p_aout_buffer != NULL )
{
- p_aout->p_libvlc->pf_memcpy( p_buffer, p_aout_buffer->p_buffer,
- MIN( i_size, p_aout_buffer->i_nb_bytes ) );
+ vlc_memcpy( p_buffer, p_aout_buffer->p_buffer,
+ MIN( i_size, p_aout_buffer->i_nb_bytes ) );
if( p_aout_buffer->i_nb_bytes < i_size )
{
- p_aout->p_libvlc->pf_memset( p_buffer + p_aout_buffer->i_nb_bytes,
- 0, i_size - p_aout_buffer->i_nb_bytes );
+ vlc_memset( p_buffer + p_aout_buffer->i_nb_bytes,
+ 0, i_size - p_aout_buffer->i_nb_bytes );
}
aout_BufferFree( p_aout_buffer );
}
else
{
- p_aout->p_libvlc->pf_memset( p_buffer, 0, i_size );
+ vlc_memset( p_buffer, 0, i_size );
}
}