X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faudio_output%2Fesd.c;h=b56b99cb9890facf6927a0e228a3700306096683;hb=fa61862474c332412e0341d98f1cf82c067d277a;hp=272cd558d87a2d02ecdf4d5b60f70992baf8a335;hpb=096fc22a2f74b26cb6c8fbcea90351dffed59232;p=vlc diff --git a/modules/audio_output/esd.c b/modules/audio_output/esd.c index 272cd558d8..b56b99cb98 100644 --- a/modules/audio_output/esd.c +++ b/modules/audio_output/esd.c @@ -1,8 +1,8 @@ /***************************************************************************** * esd.c : EsounD module ***************************************************************************** - * Copyright (C) 2000, 2001 VideoLAN - * $Id: esd.c,v 1.17 2003/01/28 22:52:30 sam Exp $ + * Copyright (C) 2000, 2001 the VideoLAN team + * $Id$ * * Authors: Samuel Hocevar * @@ -18,21 +18,27 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ #include /* ENOMEM */ -#include /* open(), O_WRONLY */ -#include /* strerror() */ #include /* write(), close() */ -#include /* calloc(), malloc(), free() */ -#include -#include -#include "aout_internal.h" +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include +#include + +#include + +#include +#include #include @@ -61,8 +67,12 @@ static void Play ( aout_instance_t * ); * Module descriptor *****************************************************************************/ vlc_module_begin(); - set_description( _("EsounD audio module") ); + set_description( N_("EsounD audio output") ); + set_shortname( "EsounD" ); set_capability( "audio output", 50 ); + add_string( "esdserver", "", NULL, N_("Esound server"), NULL, false ); + set_category( CAT_AUDIO ); + set_subcategory( SUBCAT_AUDIO_AOUT ); set_callbacks( Open, Close ); add_shortcut( "esound" ); vlc_module_end(); @@ -74,15 +84,14 @@ static int Open( vlc_object_t *p_this ) { aout_instance_t *p_aout = (aout_instance_t *)p_this; struct aout_sys_t * p_sys; + char * psz_server; int i_nb_channels; + int i_newfd; /* Allocate structure */ p_sys = malloc( sizeof( aout_sys_t ) ); if( p_sys == NULL ) - { - msg_Err( p_aout, "out of memory" ); return VLC_ENOMEM; - } p_aout->output.p_sys = p_sys; @@ -113,31 +122,67 @@ static int Open( vlc_object_t *p_this ) break; } - /* open a socket for playing a stream + /* Force the rate, otherwise the sound is very noisy */ + p_aout->output.output.i_rate = ESD_DEFAULT_RATE; + p_aout->output.i_nb_samples = ESD_BUF_SIZE * 2; + + /* 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, - p_aout->output.output.i_rate, NULL, "vlc" ); + psz_server = config_GetPsz( p_aout, "esdserver" ); + if( psz_server && *psz_server ) + { + p_sys->i_fd = esd_play_stream_fallback( p_sys->esd_format, + p_aout->output.output.i_rate, + psz_server, "vlc" ); + } + else + { + p_sys->i_fd = esd_play_stream_fallback( p_sys->esd_format, + p_aout->output.output.i_rate, + NULL, "vlc" ); + } + if( p_sys->i_fd < 0 ) { msg_Err( p_aout, "cannot open esound socket (format 0x%08x at %d Hz)", p_sys->esd_format, p_aout->output.output.i_rate ); + free( psz_server ); free( p_sys ); return VLC_EGENERIC; } - p_aout->output.i_nb_samples = ESD_BUF_SIZE * 2; + if( psz_server && *psz_server ) + { + struct timeval start, stop; + esd_server_info_t * p_info; + + gettimeofday( &start, NULL ); + p_info = esd_get_server_info( p_sys->i_fd ); + gettimeofday( &stop, NULL ); + + p_sys->latency = (mtime_t)( stop.tv_sec - start.tv_sec ) + * (mtime_t)1000000; + p_sys->latency += stop.tv_usec - start.tv_usec; + } + else + { + p_sys->latency = 0; + } /* ESD latency is calculated for 44100 Hz. We don't have any way to get the * number of buffered samples, so I assume ESD_BUF_SIZE/2 */ - p_sys->latency = - (mtime_t)( esd_get_latency( esd_open_sound(NULL) ) + ESD_BUF_SIZE/2 - * p_aout->output.output.i_bytes_per_frame - * p_aout->output.output.i_rate - / ESD_DEFAULT_RATE ) + p_sys->latency += + (mtime_t)( esd_get_latency( i_newfd = esd_open_sound(NULL) ) + + ESD_BUF_SIZE / 2 + * p_aout->output.output.i_bytes_per_frame + * p_aout->output.output.i_rate + / ESD_DEFAULT_RATE ) * (mtime_t)1000000 / p_aout->output.output.i_bytes_per_frame / p_aout->output.output.i_rate; + free( psz_server ); + close( i_newfd ); return VLC_SUCCESS; } @@ -154,13 +199,18 @@ static void Play( aout_instance_t *p_aout ) if ( p_buffer != NULL ) { - i_tmp = write( p_sys->i_fd, p_buffer->p_buffer, p_buffer->i_nb_bytes ); + unsigned int pos; + unsigned 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 (%m)" ); + } } - aout_BufferFree( p_buffer ); } } @@ -183,7 +233,7 @@ static void Close( vlc_object_t *p_this ) ***************************************************************************** * This function writes a buffer of i_length bytes in the socket *****************************************************************************/ -static void Play( aout_thread_t *p_aout, byte_t *buffer, int i_size ) +static void Play( aout_thread_t *p_aout, uint8_t *buffer, int i_size ) { int i_amount;