[vlc-commits] Cosmetic change: aout_InputIsEmpty -> aout_DecIsEmpty

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Jun  9 18:06:11 2011 +0300| [0ba7d3d9069866b3d4aeb547ab679973b4af6eec] | committer: Rémi Denis-Courmont

Cosmetic change: aout_InputIsEmpty -> aout_DecIsEmpty

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0ba7d3d9069866b3d4aeb547ab679973b4af6eec
---

 src/audio_output/aout_internal.h |    2 +-
 src/audio_output/dec.c           |    9 +++++++++
 src/audio_output/input.c         |    8 --------
 src/input/decoder.c              |    2 +-
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/audio_output/aout_internal.h b/src/audio_output/aout_internal.h
index 5d56d9b..5018054 100644
--- a/src/audio_output/aout_internal.h
+++ b/src/audio_output/aout_internal.h
@@ -100,7 +100,6 @@ int aout_InputDelete( aout_instance_t * p_aout, aout_input_t * p_input );
 int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input,
                     aout_buffer_t * p_buffer, int i_input_rate );
 void aout_InputCheckAndRestart( aout_instance_t * p_aout, aout_input_t * p_input );
-bool aout_InputIsEmpty( aout_instance_t * p_aout, aout_input_t * p_input );
 
 /* From filters.c : */
 int aout_FiltersCreatePipeline( aout_instance_t *, filter_t **, int *,
@@ -145,6 +144,7 @@ int aout_DecPlay( aout_instance_t *, aout_input_t *, aout_buffer_t *, int i_inpu
 int aout_DecGetResetLost( aout_instance_t *, aout_input_t * );
 void aout_DecChangePause( aout_instance_t *, aout_input_t *, bool b_paused, mtime_t i_date );
 void aout_DecFlush( aout_instance_t *, aout_input_t * );
+bool aout_DecIsEmpty( aout_instance_t * p_aout, aout_input_t * p_input );
 
 /* Audio output locking */
 
diff --git a/src/audio_output/dec.c b/src/audio_output/dec.c
index 87962f1..8bf692e 100644
--- a/src/audio_output/dec.c
+++ b/src/audio_output/dec.c
@@ -287,3 +287,12 @@ void aout_DecFlush( aout_instance_t *p_aout, aout_input_t *p_input )
     aout_unlock_input_fifos( p_aout );
 }
 
+bool aout_DecIsEmpty( aout_instance_t * p_aout, aout_input_t * p_input )
+{
+    mtime_t end_date;
+
+    aout_lock_input_fifos( p_aout );
+    end_date = aout_FifoNextStart( &p_input->mixer.fifo );
+    aout_unlock_input_fifos( p_aout );
+    return end_date <= mdate();
+}
diff --git a/src/audio_output/input.c b/src/audio_output/input.c
index 2e02b1b..a171779 100644
--- a/src/audio_output/input.c
+++ b/src/audio_output/input.c
@@ -721,14 +721,6 @@ int aout_InputPlay( aout_instance_t * p_aout, aout_input_t * p_input,
     return 0;
 }
 
-bool aout_InputIsEmpty( aout_instance_t * p_aout, aout_input_t * p_input )
-{
-    aout_lock_input_fifos( p_aout );
-    bool is_empty = date_Get( &p_input->mixer.fifo.end_date ) <= mdate();
-    aout_unlock_input_fifos( p_aout );
-    return is_empty;
-}
-
 /*****************************************************************************
  * static functions
  *****************************************************************************/
diff --git a/src/input/decoder.c b/src/input/decoder.c
index d02593a..4ae7d33 100644
--- a/src/input/decoder.c
+++ b/src/input/decoder.c
@@ -428,7 +428,7 @@ bool input_DecoderIsEmpty( decoder_t * p_dec )
         if( p_dec->fmt_out.i_cat == VIDEO_ES && p_owner->p_vout )
             b_empty = vout_IsEmpty( p_owner->p_vout );
         else if( p_dec->fmt_out.i_cat == AUDIO_ES && p_owner->p_aout )
-            b_empty = aout_InputIsEmpty( p_owner->p_aout, p_owner->p_aout_input );
+            b_empty = aout_DecIsEmpty( p_owner->p_aout, p_owner->p_aout_input );
         vlc_mutex_unlock( &p_owner->lock );
     }
     return b_empty;