*****************************************************************************/
extern "C"
{
-#include <string.h>
-#include <stdlib.h>
#include <errno.h>
-#include <vlc/vlc.h>
-#include <vlc/aout.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_aout.h>
#include "aout_internal.h"
}
p_aout->output.p_sys = 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 VLC_EGENERIC;
- }
+ return VLC_ENOMEM;
/* New PCMAudioPlayer */
p_sys->pPlayer = pPlayer = new PCMAudioPlayer();
if( p_sys->pPlayer == NULL )
{
- msg_Err( p_aout, "out of memory" );
free( p_sys );
- return VLC_EGENERIC;
+ return VLC_ENOMEM;
}
/* Get Buffer Requirements */
delete pPlayer;
free( p_sys );
return VLC_EGENERIC;
- }
+ }
p_sys->nBuffers = __MIN( p_sys->nBuffers, 4 );
p_sys->ppBuffers = (void **)malloc( p_sys->nBuffers * sizeof( void * ) );
if( p_sys->ppBuffers == NULL )
{
- msg_Err( p_aout, "out of memory" );
delete pPlayer;
free( p_sys );
- return VLC_EGENERIC;
+ return VLC_ENOMEM;
}
/* Open PCMAudioPlayer */
/* Create thread and wait for its readiness. */
if( vlc_thread_create( p_aout, "aout", Thread,
- VLC_THREAD_PRIORITY_OUTPUT, VLC_FALSE ) )
+ VLC_THREAD_PRIORITY_OUTPUT, false ) )
{
- msg_Err( p_aout, "cannot create OSS thread (%s)", strerror(errno) );
+ msg_Err( p_aout, "cannot create OSS thread (%m)" );
pPlayer->Close();
delete pPlayer;
free( p_sys->ppBuffers );
aout_instance_t * p_aout = (aout_instance_t *)p_this;
struct aout_sys_t * p_sys = p_aout->output.p_sys;
- p_aout->b_die = VLC_TRUE;
+ vlc_object_kill( p_aout );
vlc_thread_join( p_aout );
- p_aout->b_die = VLC_FALSE;
+ p_aout->b_die = false;
do
{
struct aout_sys_t * p_sys = p_aout->output.p_sys;
PCMAudioPlayer * pPlayer = p_sys->pPlayer;
- while( !p_aout->b_die )
+ while( vlc_object_alive (p_aout) )
{
pPlayer->WaitForBuffer();
#define i p_sys->nNextBufferIndex
if( p_buffer == NULL )
{
- p_aout->p_libvlc->pf_memset( p_sys->ppBuffers[ i ], 0,
- p_sys->nBufferSize );
+ vlc_memset( p_aout, p_sys->ppBuffers[ i ], 0,
+ p_sys->nBufferSize );
}
else
{
p_sys->nBufferSize / 2 ) )
{
msg_Err( p_aout, "QueueBuffer failed" );
- }
+ }
i = (i + 1) % p_sys->nBuffers;
#undef i