From: Rémi Denis-Courmont <remi@remlab.net>
Date: Sat, 21 Mar 2015 19:56:50 +0000 (+0200)
Subject: aout: add wait parameter to aout_DecFlush()
X-Git-Url: https://git.sesse.net/?p=vlc;a=commitdiff_plain;h=90a41800049ec54a0191613fdfb37c3338d9d297

aout: add wait parameter to aout_DecFlush()
---

diff --git a/src/audio_output/aout_internal.h b/src/audio_output/aout_internal.h
index 10c790b383..9f6a4534fd 100644
--- a/src/audio_output/aout_internal.h
+++ b/src/audio_output/aout_internal.h
@@ -139,7 +139,7 @@ void aout_DecDelete(audio_output_t *);
 int aout_DecPlay(audio_output_t *, block_t *, int i_input_rate);
 int aout_DecGetResetLost(audio_output_t *);
 void aout_DecChangePause(audio_output_t *, bool b_paused, mtime_t i_date);
-void aout_DecFlush(audio_output_t *);
+void aout_DecFlush(audio_output_t *, bool wait);
 bool aout_DecIsEmpty(audio_output_t *);
 void aout_RequestRestart (audio_output_t *, unsigned);
 
diff --git a/src/audio_output/dec.c b/src/audio_output/dec.c
index 2dfcff013b..7444072895 100644
--- a/src/audio_output/dec.c
+++ b/src/audio_output/dec.c
@@ -411,14 +411,14 @@ void aout_DecChangePause (audio_output_t *aout, bool paused, mtime_t date)
     aout_OutputUnlock (aout);
 }
 
-void aout_DecFlush (audio_output_t *aout)
+void aout_DecFlush (audio_output_t *aout, bool wait)
 {
     aout_owner_t *owner = aout_owner (aout);
 
     aout_OutputLock (aout);
     owner->sync.end = VLC_TS_INVALID;
     if (owner->mixer_format.i_format)
-        aout_OutputFlush (aout, false);
+        aout_OutputFlush (aout, wait);
     aout_OutputUnlock (aout);
 }
 
diff --git a/src/input/decoder.c b/src/input/decoder.c
index 452f3f87b7..57d185320f 100644
--- a/src/input/decoder.c
+++ b/src/input/decoder.c
@@ -1152,7 +1152,7 @@ static void DecoderDecodeAudio( decoder_t *p_dec, block_t *p_block )
         {
             msg_Dbg( p_dec, "End of audio preroll" );
             if( p_owner->p_aout )
-                aout_DecFlush( p_owner->p_aout );
+                aout_DecFlush( p_owner->p_aout, false );
             /* */
             p_owner->i_preroll_end = VLC_TS_INVALID;
         }
@@ -1218,7 +1218,7 @@ static void DecoderProcessAudio( decoder_t *p_dec, block_t *p_block, bool b_flus
     }
 
     if( b_flush && p_owner->p_aout )
-        aout_DecFlush( p_owner->p_aout );
+        aout_DecFlush( p_owner->p_aout, false );
 }
 
 static void DecoderPlaySpu( decoder_t *p_dec, subpicture_t *p_subpic )
@@ -1642,7 +1642,7 @@ static void DeleteDecoder( decoder_t * p_dec )
     if( p_owner->p_aout )
     {
         /* TODO: REVISIT gap-less audio */
-        aout_DecFlush( p_owner->p_aout );
+        aout_DecFlush( p_owner->p_aout, false );
         aout_DecDelete( p_owner->p_aout );
         input_resource_PutAout( p_owner->p_resource, p_owner->p_aout );
         if( p_owner->p_input != NULL )