*****************************************************************************/
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 );
+ 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 );
+ vlc_mutex_init (&aout->lock);
- return p_aout;
+ aout_VolumeNoneInit (aout);
+ vlc_object_set_destructor (aout, aout_Destructor);
+ var_Create (aout, "intf-change", VLC_VAR_VOID);
+
+ 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 (&aout->lock);
}
#ifdef AOUT_DEBUG
p_fifo->p_first = NULL;
p_fifo->pp_last = &p_fifo->p_first;
date_Init( &p_fifo->end_date, i_rate, 1 );
+ date_Set( &p_fifo->end_date, VLC_TS_INVALID );
}
/*****************************************************************************
p_fifo->pp_last = &p_buffer->p_next;
*p_fifo->pp_last = NULL;
/* Enforce the continuity of the stream. */
- if ( date_Get( &p_fifo->end_date ) )
+ if( date_Get( &p_fifo->end_date ) != VLC_TS_INVALID )
{
p_buffer->i_pts = date_Get( &p_fifo->end_date );
p_buffer->i_length = date_Increment( &p_fifo->end_date,
{
aout_buffer_t * p_buffer;
- date_Set( &p_fifo->end_date, 0 );
+ date_Set( &p_fifo->end_date, VLC_TS_INVALID );
p_buffer = p_fifo->p_first;
while ( p_buffer != NULL )
{
/*****************************************************************************
* aout_FifoMoveDates : Move forwards or backwards all dates in the FIFO
*****************************************************************************/
-void aout_FifoMoveDates( aout_fifo_t * p_fifo, mtime_t difference )
+void aout_FifoMoveDates( aout_fifo_t *fifo, mtime_t difference )
{
- aout_buffer_t * p_buffer;
-
- date_Move( &p_fifo->end_date, difference );
- p_buffer = p_fifo->p_first;
- while ( p_buffer != NULL )
+ if( date_Get( &fifo->end_date ) == VLC_TS_INVALID )
{
- p_buffer->i_pts += difference;
- p_buffer = p_buffer->p_next;
+ assert( fifo->p_first == NULL );
+ return;
}
-}
-/*****************************************************************************
- * 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 *p_fifo )
-{
- return (p_fifo->p_first != NULL) ? p_fifo->p_first->i_pts : 0;
+ date_Move( &fifo->end_date, difference );
+ for( block_t *block = fifo->p_first; block != NULL; block = block->p_next )
+ block->i_pts += difference;
}
/*****************************************************************************