/*****************************************************************************
* Preamble
*****************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <errno.h> /* ENOMEM */
#include <fcntl.h> /* open(), O_WRONLY */
#include <sys/ioctl.h> /* ioctl() */
#include <unistd.h> /* write(), close() */
-#include <vlc/vlc.h>
+#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 );
add_file( "dspdev", "/dev/dsp", aout_FindAndRestart,
- N_("OSS DSP device"), NULL, VLC_FALSE );
- change_safe(); /* if we specify a normal file it won't be overwritten */
- add_bool( "oss-buggy", 0, NULL, BUGGY_TEXT, BUGGY_LONGTEXT, VLC_TRUE );
- change_safe();
+ N_("OSS DSP device"), NULL, false );
+ add_bool( "oss-buggy", 0, NULL, BUGGY_TEXT, BUGGY_LONGTEXT, true );
set_capability( "audio output", 100 );
add_shortcut( "oss" );
/* 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;
}
return VLC_EGENERIC;
}
- val.b_bool = VLC_TRUE;
+ val.b_bool = true;
var_Set( p_aout, "intf-change", val );
/* Reset the DSP device */
/* Create OSS thread and wait for its readiness. */
if( vlc_thread_create( p_aout, "aout", OSSThread,
- VLC_THREAD_PRIORITY_OUTPUT, VLC_FALSE ) )
+ VLC_THREAD_PRIORITY_OUTPUT, false ) )
{
msg_Err( p_aout, "cannot create OSS thread (%m)" );
close( p_sys->i_fd );
*****************************************************************************/
static void Play( aout_instance_t *p_aout )
{
+ VLC_UNUSED(p_aout);
}
/*****************************************************************************
vlc_object_kill( p_aout );
vlc_thread_join( p_aout );
- p_aout->b_die = VLC_FALSE;
+ p_aout->b_die = false;
ioctl( p_sys->i_fd, SNDCTL_DSP_RESET, NULL );
close( p_sys->i_fd );
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;
- byte_t * p_bytes;
+ uint8_t * p_bytes;
if ( p_aout->output.output.i_format != VLC_FOURCC('s','p','d','i') )
{
/* Next buffer will be played at mdate() + buffered */
p_buffer = aout_OutputNextBuffer( p_aout, mdate() + buffered,
- VLC_FALSE );
+ false );
if( p_buffer == NULL &&
buffered > ( p_aout->output.p_sys->max_buffer_duration
}
}
- while( !p_aout->b_die && ! ( p_buffer =
- aout_OutputNextBuffer( p_aout, next_date, VLC_TRUE ) ) )
+ while( vlc_object_alive (p_aout) && ! ( p_buffer =
+ aout_OutputNextBuffer( p_aout, next_date, true ) ) )
{
msleep( 1000 );
next_date = mdate();