Commit 7f6e0fd0 authored by Jean-Paul Saman's avatar Jean-Paul Saman

oss audio: do not use blocking read (workaround for Neuros OSD 2, linux-2.6.23-davinici1)

This is a workaround for the Neuros OSD 2 linux kernel 2.6.23. Since vlc does a poll before a read it is guaranteed that there is data, thus using O_NONBLOCK does not really add any advantage here.
parent 32b1ecb5
...@@ -343,7 +343,7 @@ static int OpenAudioDevOss( demux_t *p_demux ) ...@@ -343,7 +343,7 @@ static int OpenAudioDevOss( demux_t *p_demux )
int i_fd; int i_fd;
int i_format; int i_format;
i_fd = open( p_demux->p_sys->psz_device, O_RDONLY | O_NONBLOCK ); i_fd = open( p_demux->p_sys->psz_device, O_RDONLY /*| O_NONBLOCK*/ );
if( i_fd < 0 ) if( i_fd < 0 )
{ {
...@@ -419,7 +419,7 @@ static int OpenAudioDev( demux_t *p_demux ) ...@@ -419,7 +419,7 @@ static int OpenAudioDev( demux_t *p_demux )
static bool ProbeAudioDevOss( demux_t *p_demux, const char *psz_device ) static bool ProbeAudioDevOss( demux_t *p_demux, const char *psz_device )
{ {
int i_caps; int i_caps;
int i_fd = open( psz_device, O_RDONLY | O_NONBLOCK ); int i_fd = open( psz_device, O_RDONLY /*| O_NONBLOCK*/ );
if( i_fd < 0 ) if( i_fd < 0 )
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment