# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <vlc_aout.h>
#include "aout_internal.h"
*****************************************************************************/
vlc_module_begin();
set_shortname( "Roku HD1000" );
- set_description( _("Roku HD1000 audio output") );
+ set_description( N_("Roku HD1000 audio output") );
set_capability( "audio output", 100 );
set_category( CAT_AUDIO );
set_subcategory( SUBCAT_AUDIO_AOUT );
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 */
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 */
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();