Commit 645ef26b authored by Christophe Massiot's avatar Christophe Massiot

* Removed O_NONBLCK in aout_Play because we don't use it and some drivers

(e.g. have problems with this) ;
* Added warning messages.
parent c4b4857b
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* aout_dsp.c : dsp functions library * aout_dsp.c : dsp functions library
***************************************************************************** *****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN * Copyright (C) 1999, 2000 VideoLAN
* $Id: aout_dsp.c,v 1.14 2001/07/12 20:44:52 reno Exp $ * $Id: aout_dsp.c,v 1.15 2001/08/24 16:28:49 massiot 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>
...@@ -159,7 +159,7 @@ static int aout_Open( aout_thread_t *p_aout ) ...@@ -159,7 +159,7 @@ static int aout_Open( aout_thread_t *p_aout )
AOUT_RATE_DEFAULT ); AOUT_RATE_DEFAULT );
/* Open the sound device */ /* Open the sound device */
if( (p_aout->i_fd = open( p_aout->psz_device, O_WRONLY|O_NONBLOCK )) < 0 ) if( (p_aout->i_fd = open( p_aout->psz_device, O_WRONLY )) < 0 )
{ {
intf_ErrMsg( "aout error: can't open audio device (%s)", intf_ErrMsg( "aout error: can't open audio device (%s)",
p_aout->psz_device ); p_aout->psz_device );
...@@ -202,7 +202,7 @@ static int aout_SetFormat( aout_thread_t *p_aout ) ...@@ -202,7 +202,7 @@ static int aout_SetFormat( aout_thread_t *p_aout )
if( i_format != p_aout->i_format ) if( i_format != p_aout->i_format )
{ {
intf_DbgMsg( "aout debug: audio output format not supported (%i)", intf_WarnMsg( 2, "aout warning: audio output format not supported (%i)",
p_aout->i_format ); p_aout->i_format );
p_aout->i_format = i_format; p_aout->i_format = i_format;
} }
...@@ -217,7 +217,7 @@ static int aout_SetFormat( aout_thread_t *p_aout ) ...@@ -217,7 +217,7 @@ static int aout_SetFormat( aout_thread_t *p_aout )
if( b_stereo != p_aout->b_stereo ) if( b_stereo != p_aout->b_stereo )
{ {
intf_DbgMsg( "aout debug: number of audio channels not supported (%i)", intf_WarnMsg( 2, "aout warning: number of audio channels not supported (%i)",
p_aout->i_channels ); p_aout->i_channels );
p_aout->b_stereo = b_stereo; p_aout->b_stereo = b_stereo;
p_aout->i_channels = 1 + b_stereo; p_aout->i_channels = 1 + b_stereo;
...@@ -234,7 +234,7 @@ static int aout_SetFormat( aout_thread_t *p_aout ) ...@@ -234,7 +234,7 @@ static int aout_SetFormat( aout_thread_t *p_aout )
if( l_rate != p_aout->l_rate ) if( l_rate != p_aout->l_rate )
{ {
intf_DbgMsg( "aout debug: audio output rate not supported (%li)", intf_WarnMsg( 1, "aout warning: audio output rate not supported (%li)",
p_aout->l_rate ); p_aout->l_rate );
p_aout->l_rate = l_rate; p_aout->l_rate = l_rate;
} }
......
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