/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <errno.h> /* ENOMEM */
-#include <fcntl.h> /* open(), O_WRONLY */
-#include <sys/ioctl.h> /* ioctl() */
-#include <unistd.h> /* write(), close() */
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <errno.h> /* ENOMEM */
+#include <fcntl.h> /* open(), O_WRONLY */
+#include <sys/ioctl.h> /* ioctl() */
+#include <unistd.h> /* write(), close() */
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#ifdef HAVE_ALLOCA_H
# include <alloca.h>
vlc_module_begin();
set_shortname( "OSS" );
- set_description( _("UNIX OSS audio output") );
+ set_description( N_("UNIX OSS audio output") );
set_category( CAT_AUDIO );
set_subcategory( SUBCAT_AUDIO_AOUT );
/* Allocate structure */
p_aout->output.p_sys = p_sys = malloc( sizeof( aout_sys_t ) );
if( p_sys == NULL )
- {
- msg_Err( p_aout, "out of memory" );
return VLC_ENOMEM;
- }
/* Get device name */
if( (psz_device = config_GetPsz( p_aout, "dspdev" )) == NULL )
if( p_sys->i_fd < 0 )
{
msg_Err( p_aout, "cannot open audio device (%s)", psz_device );
+ free( psz_device );
free( p_sys );
return VLC_EGENERIC;
}
struct aout_sys_t * p_sys = p_aout->output.p_sys;
mtime_t next_date = 0;
- while ( !p_aout->b_die )
+ while ( vlc_object_alive (p_aout) )
{
aout_buffer_t * p_buffer = NULL;
int i_tmp, i_size;
}
}
- while( !p_aout->b_die && ! ( p_buffer =
+ while( vlc_object_alive (p_aout) && ! ( p_buffer =
aout_OutputNextBuffer( p_aout, next_date, true ) ) )
{
msleep( 1000 );