* modules/control/http.c: portability fix.

[vlc] / src / audio_output / output.c

diff --git a/src/audio_output/output.c b/src/audio_output/output.c
index 3fcf77695b10c6ced6292b64275f9397668f8a8a..98d788d06483dc2abb990cb48c9bddd6173d7b28 100644 (file)
--- a/src/audio_output/output.c
+++ b/src/audio_output/output.c
@@ -1,8 +1,8 @@
 /*****************************************************************************
  * output.c : internal management of output streams for the audio output
  *****************************************************************************
- * Copyright (C) 2002 VideoLAN
- * $Id: output.c,v 1.40 2003/05/11 01:00:26 massiot Exp $
+ * Copyright (C) 2002-2004 VideoLAN
+ * $Id$
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -41,7 +41,6 @@ int aout_OutputNew( aout_instance_t * p_aout,
                     audio_sample_format_t * p_format )
 {
     /* Retrieve user defaults. */
-    char * psz_name = config_GetPsz( p_aout, "aout" );
     int i_rate = config_GetInt( p_aout, "aout-rate" );
     vlc_value_t val, text;
     /* kludge to avoid a fpu error when rate is 0... */
@@ -55,8 +54,7 @@ int aout_OutputNew( aout_instance_t * p_aout,
     vlc_mutex_lock( &p_aout->output_fifo_lock );
 
     /* Find the best output plug-in. */
-    p_aout->output.p_module = module_Need( p_aout, "audio output", psz_name );
-    if ( psz_name != NULL ) free( psz_name );
+    p_aout->output.p_module = module_Need( p_aout, "audio output", "$aout", 0);
     if ( p_aout->output.p_module == NULL )
     {
         msg_Err( p_aout, "no suitable aout module" );
@@ -101,7 +99,7 @@ int aout_OutputNew( aout_instance_t * p_aout,
         /* Mono - create the audio-channels variable. */
         var_Create( p_aout, "audio-channels",
                     VLC_VAR_INTEGER | VLC_VAR_HASCHOICE );
-        text.psz_string = _("Audio channels");
+        text.psz_string = _("Audio Channels");
         var_Change( p_aout, "audio-channels", VLC_VAR_SETTEXT, &text, NULL );
 
         val.i_int = AOUT_VAR_CHAN_STEREO; text.psz_string = _("Stereo");
@@ -128,7 +126,7 @@ int aout_OutputNew( aout_instance_t * p_aout,
         /* Stereo - create the audio-channels variable. */
         var_Create( p_aout, "audio-channels",
                     VLC_VAR_INTEGER | VLC_VAR_HASCHOICE );
-        text.psz_string = _("Audio channels");
+        text.psz_string = _("Audio Channels");
         var_Change( p_aout, "audio-channels", VLC_VAR_SETTEXT, &text, NULL );
 
         if ( p_aout->output.output.i_original_channels & AOUT_CHAN_DOLBYSTEREO )
@@ -248,6 +246,12 @@ void aout_OutputPlay( aout_instance_t * p_aout, aout_buffer_t * p_buffer )
                       p_aout->output.i_nb_filters,
                       &p_buffer );
 
+    if( p_buffer->i_nb_bytes == 0 )
+    {
+        aout_BufferFree( p_buffer );
+        return;
+    }
+
     vlc_mutex_lock( &p_aout->output_fifo_lock );
     aout_FifoPush( p_aout, &p_aout->output.fifo, p_buffer );
     p_aout->output.pf_play( p_aout );
@@ -304,8 +308,13 @@ aout_buffer_t * aout_OutputNextBuffer( aout_instance_t * p_aout,
     /* Here we suppose that all buffers have the same duration - this is
      * generally true, and anyway if it's wrong it won't be a disaster. */
     if ( p_buffer->start_date > start_date
-                         + (p_buffer->end_date - p_buffer->start_date)
-                         + AOUT_PTS_TOLERANCE )
+                         + (p_buffer->end_date - p_buffer->start_date) )
+    /*
+     *                   + AOUT_PTS_TOLERANCE )
+     * There is no reason to want that, it just worsen the scheduling of
+     * an audio sample after an output starvation (ie. on start or on resume)
+     * --Gibalou
+     */
     {
         vlc_mutex_unlock( &p_aout->output_fifo_lock );
         if ( !p_aout->output.b_starving )