X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faudio_output%2Fesd.c;h=5fca9c9dfab7403ab1ff4776bb88643340e8fcdd;hb=552e595131c5f1d66eba8e3c22c2b1c509be5153;hp=b4b10e25d2e345c68558ff84c5e5557fb9b1720b;hpb=9f6cfbe91b1b6d5de23536b76210541b17380210;p=vlc

diff --git a/modules/audio_output/esd.c b/modules/audio_output/esd.c
index b4b10e25d2..5fca9c9dfa 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.20 2004/01/25 17:32:29 murray Exp $
+ * Copyright (C) 2000, 2001 the VideoLAN team
+ * $Id$
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -18,24 +18,23 @@
  *
  * 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 <errno.h>                                                 /* ENOMEM */
-#include <fcntl.h>                                       /* open(), O_WRONLY */
-#include <string.h>                                            /* strerror() */
 #include <unistd.h>                                      /* write(), close() */
-#include <stdlib.h>                            /* calloc(), malloc(), free() */
 
 #include <vlc/vlc.h>
-#include <vlc/aout.h>
-#include "aout_internal.h"
+#include <vlc_aout.h>
 
 #include <sys/socket.h>
 
+#include <sys/time.h>
+#include <time.h>
+
 #include <esd.h>
 
 /*****************************************************************************
@@ -63,8 +62,12 @@ static void Play         ( aout_instance_t * );
  * Module descriptor
  *****************************************************************************/
 vlc_module_begin();
-    set_description( _("EsounD Audio Output") );
+    set_description( _("EsounD audio output") );
+    set_shortname( "EsounD" );
     set_capability( "audio output", 50 );
+    add_string( "esdserver", "", NULL, N_("Esound server"), NULL, VLC_FALSE );
+    set_category( CAT_AUDIO );
+    set_subcategory( SUBCAT_AUDIO_AOUT );
     set_callbacks( Open, Close );
     add_shortcut( "esound" );
 vlc_module_end();
@@ -76,8 +79,9 @@ 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 fl;
+    int i_newfd;
 
     /* Allocate structure */
     p_sys = malloc( sizeof( aout_sys_t ) );
@@ -118,11 +122,24 @@ static int Open( vlc_object_t *p_this )
 
     /* 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
+    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)",
@@ -131,19 +148,37 @@ static int Open( vlc_object_t *p_this )
         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;
 
+    close( i_newfd );
     return VLC_SUCCESS;
 }
 
@@ -160,16 +195,16 @@ static void Play( aout_instance_t *p_aout )
 
     if ( p_buffer != NULL )
     {
-        int pos;
-        char *data = p_buffer->p_buffer;
+        unsigned int pos;
+        unsigned char *data = p_buffer->p_buffer;
 
-        for( pos = 0; pos + ESD_BUF_SIZE <= p_buffer->i_nb_bytes; 
+        for( pos = 0; pos + ESD_BUF_SIZE <= p_buffer->i_nb_bytes;
              pos += ESD_BUF_SIZE )
         {
             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) );
+                msg_Err( p_aout, "write failed (%m)" );
             }
         }
         aout_BufferFree( p_buffer );