*****************************************************************************/
#include <errno.h> /* ENOMEM */
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
#ifdef HAVE_ALLOCA_H
# include <alloca.h>
int i_card;
int i_device;
- byte_t * p_silent_buffer;
+ uint8_t * p_silent_buffer;
};
#define DEFAULT_FRAME_SIZE 2048
/*****************************************************************************
* Local prototypes
*****************************************************************************/
-int E_(OpenAudio) ( vlc_object_t *p_this );
-void E_(CloseAudio) ( vlc_object_t *p_this );
+int OpenAudio ( vlc_object_t *p_this );
+void CloseAudio ( vlc_object_t *p_this );
static int GetBufInfo ( aout_instance_t * );
static void Play ( aout_instance_t * );
static int QNXaoutThread ( aout_instance_t * );
*****************************************************************************
* This function opens an alsa device, through the alsa API
*****************************************************************************/
-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;
int i_ret;
PLUGIN_DISABLE_MMAP ) ) < 0 )
{
msg_Err( p_aout, "unable to disable mmap (%s)", snd_strerror(i_ret) );
- E_(CloseAudio)( p_this );
+ CloseAudio( p_this );
free( p_aout->output.p_sys );
return -1;
}
{
msg_Err( p_aout, "unable to get plugin info (%s)",
snd_strerror( i_ret ) );
- E_(CloseAudio)( p_this );
+ CloseAudio( p_this );
free( p_aout->output.p_sys );
return -1;
}
&pp ) ) < 0 )
{
msg_Err( p_aout, "unable to set parameters (%s)", snd_strerror(i_ret) );
- E_(CloseAudio)( p_this );
+ CloseAudio( p_this );
free( p_aout->output.p_sys );
return -1;
}
{
msg_Err( p_aout, "unable to prepare channel (%s)",
snd_strerror( i_ret ) );
- E_(CloseAudio)( p_this );
+ CloseAudio( p_this );
free( p_aout->output.p_sys );
return -1;
}
/* Create audio thread and wait for its readiness. */
if( vlc_thread_create( p_aout, "aout", QNXaoutThread,
- VLC_THREAD_PRIORITY_OUTPUT, VLC_FALSE ) )
+ VLC_THREAD_PRIORITY_OUTPUT, false ) )
{
msg_Err( p_aout, "cannot create QNX audio thread (%m)" );
- E_(CloseAudio)( p_this );
+ CloseAudio( p_this );
free( p_aout->output.p_sys );
return -1;
}
/*****************************************************************************
* CloseAudio: close the audio device
*****************************************************************************/
-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;
int i_ret;
{
aout_buffer_t * p_buffer;
int i_tmp, i_size;
- byte_t * p_bytes;
+ uint8_t * p_bytes;
if ( p_aout->output.output.i_format != VLC_FOURCC('s','p','d','i') )
{
* p_aout->output.output.i_frame_length;
next_date += mdate();
- p_buffer = aout_OutputNextBuffer( p_aout, next_date, VLC_FALSE );
+ p_buffer = aout_OutputNextBuffer( p_aout, next_date, false );
}
else
{
- p_buffer = aout_OutputNextBuffer( p_aout, 0, VLC_TRUE );
+ p_buffer = aout_OutputNextBuffer( p_aout, 0, true );
}
if ( p_buffer != NULL )