* esd.c : EsounD module
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
- * $Id: esd.c,v 1.17 2003/01/28 22:52:30 sam Exp $
+ * $Id: esd.c,v 1.19 2003/06/25 21:17:21 asmax Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
#include <vlc/aout.h>
#include "aout_internal.h"
+#include <sys/socket.h>
+
#include <esd.h>
/*****************************************************************************
* Module descriptor
*****************************************************************************/
vlc_module_begin();
- set_description( _("EsounD audio module") );
+ set_description( _("EsounD audio output") );
set_capability( "audio output", 50 );
set_callbacks( Open, Close );
add_shortcut( "esound" );
aout_instance_t *p_aout = (aout_instance_t *)p_this;
struct aout_sys_t * p_sys;
int i_nb_channels;
+ int fl;
/* Allocate structure */
p_sys = malloc( sizeof( aout_sys_t ) );
break;
}
+ /* Force the rate, otherwise the sound is very noisy */
+ p_aout->output.output.i_rate = ESD_DEFAULT_RATE;
+
/* open a socket for playing a stream
* and try to open /dev/dsp if there's no EsounD */
p_sys->i_fd = esd_play_stream_fallback( p_sys->esd_format,
if ( p_buffer != NULL )
{
- i_tmp = write( p_sys->i_fd, p_buffer->p_buffer, p_buffer->i_nb_bytes );
+ int pos;
+ char *data = p_buffer->p_buffer;
- if( i_tmp < 0 )
+ for( pos = 0; pos + ESD_BUF_SIZE <= p_buffer->i_nb_bytes;
+ pos += ESD_BUF_SIZE )
{
- msg_Err( p_aout, "write failed (%s)", strerror(errno) );
+ i_tmp = write( p_sys->i_fd, data + pos, ESD_BUF_SIZE );
+ if( i_tmp < 0 )
+ {
+ msg_Err( p_aout, "write failed (%s)", strerror(errno) );
+ }
}
-
aout_BufferFree( p_buffer );
}
}