aout: report volume from aout plugin to core

[vlc] / src / audio_output / common.c

diff --git a/src/audio_output/common.c b/src/audio_output/common.c
index 60d7744571765f0e14cdffc0bc9e927cd67b9818..190b7fb732721365d10e3a5d146d8b6fbdca9567 100644 (file)
--- a/src/audio_output/common.c
+++ b/src/audio_output/common.c
@@ -57,14 +57,12 @@ audio_output_t *aout_New( vlc_object_t * p_parent )
 
     aout_owner_t *owner = aout_owner (aout);
 
+    vlc_mutex_init (&owner->lock);
     owner->module = NULL;
     owner->input = NULL;
     vlc_mutex_init (&owner->volume.lock);
     owner->volume.multiplier = 1.0;
     owner->volume.mixer = NULL;
-    owner->b_starving = true;
-
-    vlc_mutex_init (&aout->lock);
 
     aout_VolumeNoneInit (aout);
     vlc_object_set_destructor (aout, aout_Destructor);
@@ -82,7 +80,7 @@ static void aout_Destructor (vlc_object_t *obj)
     aout_owner_t *owner = aout_owner (aout);
 
     vlc_mutex_destroy (&owner->volume.lock);
-    vlc_mutex_destroy (&aout->lock);
+    vlc_mutex_destroy (&owner->lock);
 }
 
 #ifdef AOUT_DEBUG
@@ -398,24 +396,6 @@ void aout_FifoMoveDates( aout_fifo_t *fifo, mtime_t difference )
         block->i_pts += difference;
 }
 
-/*****************************************************************************
- * aout_FifoNextStart : return the current end_date
- *****************************************************************************/
-mtime_t aout_FifoNextStart( const aout_fifo_t *p_fifo )
-{
-    return date_Get( &p_fifo->end_date );
-}
-
-/*****************************************************************************
- * aout_FifoFirstDate : return the playing date of the first buffer in the
- * FIFO
- *****************************************************************************/
-mtime_t aout_FifoFirstDate( const aout_fifo_t *fifo )
-{
-    block_t *first = fifo->p_first;
-    return (first != NULL) ? first->i_pts : VLC_TS_INVALID;
-}
-
 /*****************************************************************************
  * aout_FifoPop : get the next buffer out of the FIFO
  *****************************************************************************/