Commit 1d97c50b authored by Johan Bilien's avatar Johan Bilien

* plugins/dsp/aout_dsp.c: Added O_NONBLOCK flag to the open command,

    so that if /dev/dsp is used, vlc tries with other plugins (like esd).
parent 53047220
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* aout_dsp.c : dsp functions library * aout_dsp.c : dsp functions library
***************************************************************************** *****************************************************************************
* Copyright (C) 1999-2001 VideoLAN * Copyright (C) 1999-2001 VideoLAN
* $Id: aout_dsp.c,v 1.27 2002/04/23 14:16:20 sam Exp $ * $Id: aout_dsp.c,v 1.27.2.1 2002/10/28 22:48:45 jobi Exp $
* *
* Authors: Michel Kaempf <maxx@via.ecp.fr> * Authors: Michel Kaempf <maxx@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org> * Samuel Hocevar <sam@zoy.org>
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
...@@ -119,8 +119,8 @@ static int aout_Open( aout_thread_t *p_aout ) ...@@ -119,8 +119,8 @@ static int aout_Open( aout_thread_t *p_aout )
} }
/* Open the sound device */ /* Open the sound device */
if( (p_aout->p_sys->i_fd = open( p_aout->p_sys->psz_device, O_WRONLY )) if( (p_aout->p_sys->i_fd = open( p_aout->p_sys->psz_device,
< 0 ) O_WRONLY | O_NONBLOCK )) < 0 )
{ {
intf_ErrMsg( "aout error: can't open audio device (%s)", intf_ErrMsg( "aout error: can't open audio device (%s)",
p_aout->p_sys->psz_device ); p_aout->p_sys->psz_device );
......
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