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 bc82617208a14640e9643e6f574ff7d7aeab52ae..190b7fb732721365d10e3a5d146d8b6fbdca9567 100644 (file)
--- a/src/audio_output/common.c
+++ b/src/audio_output/common.c
@@ -49,40 +49,38 @@ static void aout_Destructor( vlc_object_t * p_this );
  *****************************************************************************/
 audio_output_t *aout_New( vlc_object_t * p_parent )
 {
-    audio_output_t * p_aout;
-
-    /* Allocate descriptor. */
-    p_aout = vlc_custom_create( p_parent, sizeof( *p_aout ), "audio output" );
-    if( p_aout == NULL )
-    {
+    audio_output_t *aout = vlc_custom_create (p_parent,
+                                              sizeof (aout_instance_t),
+                                              "audio output");
+    if (unlikely(aout == NULL))
         return NULL;
-    }
 
-    /* Initialize members. */
-    vlc_mutex_init( &p_aout->volume_lock );
-    vlc_mutex_init( &p_aout->lock );
-    p_aout->p_input = NULL;
-    p_aout->mixer_multiplier = 1.0;
-    p_aout->p_mixer = NULL;
-    p_aout->b_starving = true;
-    p_aout->module = NULL;
-    aout_VolumeNoneInit( p_aout );
+    aout_owner_t *owner = aout_owner (aout);
 
-    var_Create( p_aout, "intf-change", VLC_VAR_VOID );
+    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;
 
-    vlc_object_set_destructor( p_aout, aout_Destructor );
+    aout_VolumeNoneInit (aout);
+    vlc_object_set_destructor (aout, aout_Destructor);
+    var_Create (aout, "intf-change", VLC_VAR_VOID);
 
-    return p_aout;
+    return aout;
 }
 
 /*****************************************************************************
  * aout_Destructor: destroy aout structure
  *****************************************************************************/
-static void aout_Destructor( vlc_object_t * p_this )
+static void aout_Destructor (vlc_object_t *obj)
 {
-    audio_output_t * p_aout = (audio_output_t *)p_this;
-    vlc_mutex_destroy( &p_aout->volume_lock );
-    vlc_mutex_destroy( &p_aout->lock );
+    audio_output_t *aout = (audio_output_t *)obj;
+    aout_owner_t *owner = aout_owner (aout);
+
+    vlc_mutex_destroy (&owner->volume.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
  *****************************************************************************/