#include <vlc_plugin.h>
#include <vlc_access.h>
#include <vlc_demux.h>
-#include <vlc_input.h>
+#include <vlc_fs.h>
-#include <ctype.h>
#include <fcntl.h>
#include <unistd.h>
#include <sys/ioctl.h>
p_demux->p_sys = p_sys = calloc( 1, sizeof( demux_sys_t ) );
if( p_sys == NULL ) return VLC_ENOMEM;
- p_sys->i_sample_rate = var_CreateGetInteger( p_demux, CFG_PREFIX "samplerate" );
- p_sys->b_stereo = var_CreateGetBool( p_demux, CFG_PREFIX "stereo" );
- p_sys->i_cache = var_CreateGetInteger( p_demux, CFG_PREFIX "caching" );
+ p_sys->i_sample_rate = var_InheritInteger( p_demux, CFG_PREFIX "samplerate" );
+ p_sys->b_stereo = var_InheritBool( p_demux, CFG_PREFIX "stereo" );
+ p_sys->i_cache = var_InheritInteger( p_demux, CFG_PREFIX "caching" );
p_sys->i_fd = -1;
p_sys->p_es = NULL;
p_sys->p_block = NULL;
p_sys->i_next_demux_date = -1;
- if( p_demux->psz_path && *p_demux->psz_path )
- p_sys->psz_device = p_demux->psz_path;
+ if( p_demux->psz_location && *p_demux->psz_location )
+ p_sys->psz_device = p_demux->psz_location;
else
p_sys->psz_device = OSS_DEFAULT;
/* Special for access_demux */
case DEMUX_CAN_PAUSE:
case DEMUX_CAN_SEEK:
- case DEMUX_SET_PAUSE_STATE:
case DEMUX_CAN_CONTROL_PACE:
pb = (bool*)va_arg( args, bool * );
*pb = false;
}
/* Wait for data */
- if( poll( &fd, 1, 500 ) ) /* Timeout after 0.5 seconds since I don't know if pf_demux can be blocking. */
+ if( poll( &fd, 1, 10 ) ) /* Timeout after 0.01 seconds. Bigger delays are an issue when used with/as an input-slave since all the inputs run in the same thread. */
{
if( fd.revents & (POLLIN|POLLPRI) )
{
int i_fd;
int i_format;
- i_fd = open( p_demux->p_sys->psz_device, O_RDONLY | O_NONBLOCK );
+ i_fd = vlc_open( p_demux->p_sys->psz_device, O_RDONLY | O_NONBLOCK );
if( i_fd < 0 )
{
static bool ProbeAudioDevOss( demux_t *p_demux, const char *psz_device )
{
int i_caps;
- int i_fd = open( psz_device, O_RDONLY | O_NONBLOCK );
+ int i_fd = vlc_open( psz_device, O_RDONLY | O_NONBLOCK );
if( i_fd < 0 )
{