# 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_common.h>
#include <vlc_plugin.h>
-#include <vlc_charset.h>
+#include <vlc_fs.h>
#include <vlc_aout.h>
text.psz_string = _("A/52 over S/PDIF");
var_Change( p_aout, "audio-device",
VLC_VAR_ADDCHOICE, &val, &text );
- if( config_GetInt( p_aout, "spdif" ) )
+ if( var_InheritBool( p_aout, "spdif" ) )
var_Set( p_aout, "audio-device", val );
}
- else if( config_GetInt( p_aout, "spdif" ) )
+ else if( var_InheritBool( p_aout, "spdif" ) )
{
msg_Warn( p_aout, "S/PDIF not supported by card" );
}
return VLC_ENOMEM;
/* Get device name */
- if( (psz_device = config_GetPsz( p_aout, "oss-audio-device" )) == NULL )
+ if( (psz_device = var_InheritString( p_aout, "oss-audio-device" )) == NULL )
{
msg_Err( p_aout, "no audio device specified (maybe /dev/dsp?)" );
free( p_sys );
* wait forever until the device is available. Since this breaks the
* OSS spec, we immediately put it back to blocking mode if the
* operation was successful. */
- p_sys->i_fd = utf8_open( psz_device, O_WRONLY | O_NDELAY );
+ p_sys->i_fd = vlc_open( psz_device, O_WRONLY | O_NDELAY );
if( p_sys->i_fd < 0 )
{
msg_Err( p_aout, "cannot open audio device (%s)", psz_device );
else
{
/* This should not happen ! */
- msg_Err( p_aout, "internal: can't find audio-device (%i)", val.i_int );
+ msg_Err( p_aout, "internal: can't find audio-device (%"PRId64")",
+ val.i_int );
close( p_sys->i_fd );
free( p_sys );
return VLC_EGENERIC;
}
p_aout->output.p_sys->b_workaround_buggy_driver =
- config_GetInt( p_aout, "oss-buggy" );
+ var_InheritBool( p_aout, "oss-buggy" );
/* Create OSS thread and wait for its readiness. */
if( vlc_thread_create( p_aout, "aout", OSSThread,