use vlc_socket()

[vlc] / src / audio_output / output.c

diff --git a/src/audio_output/output.c b/src/audio_output/output.c
index bb80e0116b716735fec8f7ab5701f259e1897891..8abdf7daf1fd0578b8f7e31f7519b5261e24fd0d 100644 (file)
--- a/src/audio_output/output.c
+++ b/src/audio_output/output.c
@@ -43,7 +43,7 @@ int aout_OutputNew( aout_instance_t * p_aout,
                     audio_sample_format_t * p_format )
 {
     /* Retrieve user defaults. */
-    int i_rate = config_GetInt( p_aout, "aout-rate" );
+    int i_rate = var_InheritInteger( p_aout, "aout-rate" );
     vlc_value_t val, text;
     /* kludge to avoid a fpu error when rate is 0... */
     if( i_rate == 0 ) i_rate = -1;
@@ -342,8 +342,6 @@ aout_buffer_t * aout_OutputNextBuffer( aout_instance_t * p_aout,
         p_aout->output.fifo.pp_last = &p_aout->output.fifo.p_first;
     }
 
-    aout_unlock_output_fifo( p_aout );
-
     if ( !b_can_sleek &&
           ( (p_buffer->i_pts - start_date > AOUT_PTS_TOLERANCE)
              || (start_date - p_buffer->i_pts > AOUT_PTS_TOLERANCE) ) )
@@ -354,6 +352,9 @@ aout_buffer_t * aout_OutputNextBuffer( aout_instance_t * p_aout,
         msg_Warn( p_aout, "output date isn't PTS date, requesting "
                   "resampling (%"PRId64")", difference );
 
+        aout_FifoMoveDates( p_aout, &p_aout->output.fifo, difference );
+        aout_unlock_output_fifo( p_aout );
+
         aout_lock_input_fifos( p_aout );
         for ( i = 0; i < p_aout->i_nb_inputs; i++ )
         {
@@ -361,10 +362,10 @@ aout_buffer_t * aout_OutputNextBuffer( aout_instance_t * p_aout,
 
             aout_FifoMoveDates( p_aout, p_fifo, difference );
         }
-
-        aout_FifoMoveDates( p_aout, &p_aout->output.fifo, difference );
         aout_unlock_input_fifos( p_aout );
     }
+    else
+        aout_unlock_output_fifo( p_aout );
 
     return p_buffer;
 }